Skip to content

Commit

Permalink
2.5.5-RELEASE created
Browse files Browse the repository at this point in the history
  • Loading branch information
jveverka committed May 26, 2021
1 parent 69dff98 commit b5a258c
Show file tree
Hide file tree
Showing 44 changed files with 155 additions and 155 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ and [OAuth2](https://tools.ietf.org/html/rfc6749) and [other](https://github.com
* Please check [__User's Guide__](docs/IAM-user-manual/README.md) and [__Examples__](iam-examples) for more details.
* Check [__Docker Hub releases__](https://hub.docker.com/r/jurajveverka/iam-service).
```
docker run -d -p 8080:8080 jurajveverka/iam-service:2.5.4-RELEASE-amd64
docker run -d -p 8080:8080 jurajveverka/iam-service:2.5.5-RELEASE-amd64
curl 'http://localhost:8080/services/discovery'
curl 'http://localhost:8080/services/oauth2/iam-admins/iam-admins/.well-known/openid-configuration'
```
Expand Down
132 changes: 66 additions & 66 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ subprojects {

project(':iam-model') {
dependencies {
implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-core:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-databind:2.11.4')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-core:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.12.3')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
}
}

Expand All @@ -59,15 +59,15 @@ project(':iam-client') {
implementation('io.jsonwebtoken:jjwt-api:0.11.2')
implementation('io.jsonwebtoken:jjwt-impl:0.11.2')
implementation('com.squareup.okhttp3:okhttp:4.9.1')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-core:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-databind:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-core:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.12.3')
implementation 'org.bouncycastle:bcpg-jdk15on:1.68'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.68'

testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
}
}

Expand All @@ -77,20 +77,20 @@ project(':iam-client-spring') {
implementation project(':iam-client')

implementation('org.slf4j:slf4j-api:1.7.30')
implementation('org.apache.tomcat.embed:tomcat-embed-core:9.0.45')
implementation('org.springframework:spring-context:5.3.6')
implementation('org.springframework.boot:spring-boot:2.4.5')
implementation('org.springframework:spring-web:5.3.6')
implementation('org.springframework.security:spring-security-core:5.4.6')
implementation('org.apache.tomcat.embed:tomcat-embed-core:9.0.46')
implementation('org.springframework:spring-context:5.3.7')
implementation('org.springframework.boot:spring-boot:2.5.0')
implementation('org.springframework:spring-web:5.3.7')
implementation('org.springframework.security:spring-security-core:5.5.0')
implementation('io.jsonwebtoken:jjwt-api:0.11.2')
implementation('io.jsonwebtoken:jjwt-impl:0.11.2')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-core:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-databind:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-core:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.12.3')

testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
}
}

Expand All @@ -103,15 +103,15 @@ project(':iam-service-client') {
implementation('io.jsonwebtoken:jjwt-api:0.11.2')
implementation('io.jsonwebtoken:jjwt-impl:0.11.2')
implementation('com.squareup.okhttp3:okhttp:4.9.1')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-core:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-databind:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-core:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.12.3')
implementation 'org.bouncycastle:bcpg-jdk15on:1.68'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.68'

testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
}
}

Expand All @@ -128,14 +128,14 @@ project(':iam-core') {
}
implementation('org.bouncycastle:bcpg-jdk15on:1.68')
implementation('org.bouncycastle:bcpkix-jdk15on:1.68')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-core:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-databind:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-core:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.12.3')

testImplementation('org.slf4j:slf4j-simple:1.7.30')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
}
}

Expand All @@ -152,7 +152,7 @@ project(':iam-service') {

implementation 'org.bouncycastle:bcpg-jdk15on:1.68'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.68'
implementation 'org.springdoc:springdoc-openapi-ui:1.5.4'
implementation 'org.springdoc:springdoc-openapi-ui:1.5.9'
implementation 'io.jsonwebtoken:jjwt-api:0.11.2'

implementation 'org.mongodb:mongodb-driver-sync:4.2.3'
Expand All @@ -177,16 +177,16 @@ project(':iam-persistence-file-system') {
implementation project(':iam-core')

implementation('org.slf4j:slf4j-api:1.7.30')
implementation('com.fasterxml.jackson.core:jackson-core:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-databind:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-core:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.3')
implementation('org.bouncycastle:bcpg-jdk15on:1.68')
implementation('org.bouncycastle:bcpkix-jdk15on:1.68')

testImplementation('org.slf4j:slf4j-simple:1.7.30')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
}
}

Expand All @@ -196,10 +196,10 @@ project(':iam-persistence-mongo') {
implementation project(':iam-core')

implementation('org.slf4j:slf4j-api:1.7.30')
implementation('com.fasterxml.jackson.core:jackson-core:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-databind:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.4')
implementation('com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-core:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.3')
implementation('com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3')
implementation('org.bouncycastle:bcpg-jdk15on:1.68')
implementation('org.bouncycastle:bcpkix-jdk15on:1.68')

Expand All @@ -212,9 +212,9 @@ project(':iam-persistence-mongo') {
}

testImplementation('org.slf4j:slf4j-simple:1.7.30')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
testImplementation('org.testcontainers:junit-jupiter:1.15.2')
testImplementation('org.testcontainers:mongodb:1.15.2')
}
Expand All @@ -226,15 +226,15 @@ project(':iam-caches-redis') {
implementation project(':iam-core')

implementation('org.slf4j:slf4j-api:1.7.30')
implementation('com.fasterxml.jackson.core:jackson-core:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-databind:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.4')
implementation('com.fasterxml.jackson.core:jackson-core:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-databind:2.12.3')
implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.3')
implementation('redis.clients:jedis:3.6.0')

testImplementation('org.slf4j:slf4j-simple:1.7.30')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
testImplementation('org.testcontainers:junit-jupiter:1.15.2')
}
}
Expand All @@ -255,15 +255,15 @@ project(':performance-testing') {
implementation 'org.bouncycastle:bcpkix-jdk15on:1.68'
implementation 'org.slf4j:slf4j-api:1.7.30'
implementation 'one.microproject.testmeter:test-meter:0.0.1'
implementation('org.junit.jupiter:junit-jupiter-params:5.7.1')
implementation('org.junit.jupiter:junit-jupiter-params:5.7.2')

testImplementation('org.slf4j:slf4j-simple:1.7.30')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.platform:junit-platform-suite-api:1.7.1')
testImplementation('org.junit.platform:junit-platform-runner:1.7.1')
testImplementation('org.junit.vintage:junit-vintage-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
testImplementation('org.junit.platform:junit-platform-suite-api:1.7.2')
testImplementation('org.junit.platform:junit-platform-runner:1.7.2')
testImplementation('org.junit.vintage:junit-vintage-engine:5.7.2')
testImplementation('com.squareup.okhttp3:okhttp:4.9.1')
}
}
Expand All @@ -283,9 +283,9 @@ project(':integration-tests') {
implementation 'org.slf4j:slf4j-api:1.7.30'

testImplementation('org.slf4j:slf4j-simple:1.7.30')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.2')
testImplementation('com.squareup.okhttp3:okhttp:4.9.1')
}
}
Expand Down Expand Up @@ -316,7 +316,7 @@ project(':spring-method-security') {
implementation 'io.jsonwebtoken:jjwt-jackson:0.11.2'
implementation 'org.bouncycastle:bcpg-jdk15on:1.68'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.68'
implementation 'org.springdoc:springdoc-openapi-ui:1.5.4'
implementation 'org.springdoc:springdoc-openapi-ui:1.5.9'

testImplementation('com.squareup.okhttp3:okhttp:4.9.1')
}
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
version: '3'
services:
iam-service:
image: iam-service:2.5.4-RELEASE
image: iam-service:2.5.5-RELEASE
build:
context: iam-service
dockerfile: Dockerfile
network_mode: "host"
#ports:
# - "8080:8080"
spring-method-security:
image: spring-method-security:2.5.4-RELEASE
image: spring-method-security:2.5.5-RELEASE
build:
context: iam-examples/spring-method-security
dockerfile: Dockerfile
Expand All @@ -19,7 +19,7 @@ services:
depends_on:
- iam-service
spring-resource-server:
image: spring-resource-server:2.5.4-RELEASE
image: spring-resource-server:2.5.5-RELEASE
build:
context: iam-examples/spring-resource-server
dockerfile: Dockerfile
Expand All @@ -29,7 +29,7 @@ services:
depends_on:
- iam-service
spring-webflux-secured:
image: spring-webflux-secured:2.5.4-RELEASE
image: spring-webflux-secured:2.5.5-RELEASE
build:
context: iam-examples/spring-webflux-secured
dockerfile: Dockerfile
Expand Down
16 changes: 8 additions & 8 deletions docs/IAM-user-manual/01a-standalone-server-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
```
* Start __iam-service__ as standalone server. You can skip this step if you would like to use *iam-service* in docker container.
```
java -Xms32m -Xmx128m -jar iam-service-2.5.4-RELEASE.jar \
java -Xms32m -Xmx128m -jar iam-service-2.5.5-RELEASE.jar \
--spring.config.location=file:application.yml
```
* Build Docker Image locally and run, in case you prefer downloading image from dockerhub please skip this step.
Expand All @@ -23,19 +23,19 @@
```
* Use public docker dockerhub image [jurajveverka/iam-service](https://hub.docker.com/r/jurajveverka/iam-service)
```
docker run -d --name iam-service-2.5.4-RELEASE \
docker run -d --name iam-service-2.5.5-RELEASE \
--restart unless-stopped \
-e APP_CONFIG_PATH=/opt/data/application.yml \
-e XMX=128m \
-v '${IAM_DATA_DIR}':/opt/data \
-p 8080:8080 jurajveverka/iam-service:2.5.4-RELEASE-amd64
-p 8080:8080 jurajveverka/iam-service:2.5.5-RELEASE-amd64
```
``IAM_DATA_DIR`` points to directory where customized ``application.yml`` file is located.
* Check docker status and logs
```
docker ps -a
docker exec -ti iam-service-2.5.4-RELEASE /bin/sh
docker logs --follow iam-service-2.5.4-RELEASE
docker exec -ti iam-service-2.5.5-RELEASE /bin/sh
docker logs --follow iam-service-2.5.5-RELEASE
```
* Verify Service state, check OpenAPI documentation.
```
Expand All @@ -48,9 +48,9 @@
```
* Stop and cleanup Docker
```
docker stop iam-service-2.5.4-RELEASE
docker rm iam-service-2.5.4-RELEASE
docker image rm -f iam-service:2.5.4-RELEASE
docker stop iam-service-2.5.5-RELEASE
docker rm iam-service-2.5.5-RELEASE
docker image rm -f iam-service:2.5.5-RELEASE
```

* [next step: Setup Persistence Layer](01b_setup-persitence-layer.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/k8s-deployments/iam-service-deployment-amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: iam-service
image: jurajveverka/iam-service:2.5.4-RELEASE-amd64
image: jurajveverka/iam-service:2.5.5-RELEASE-amd64
ports:
- name: http
containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion docs/k8s-deployments/iam-service-deployment-arm64v8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: iam-service
image: jurajveverka/iam-service:2.5.4-RELEASE-arm64v8
image: jurajveverka/iam-service:2.5.5-RELEASE-arm64v8
ports:
- name: http
containerPort: 8080
Expand Down
4 changes: 2 additions & 2 deletions iam-commons/iam-client-spring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ This client library makes JWT verification easier for springboot micro-services
<dependency>
<groupId>one.microproject.iamservice</groupId>
<artifactId>iam-client-spring</artifactId>
<version>2.5.4-RELEASE</version>
<version>2.5.5-RELEASE</version>
<dependency/>
```
* gradle dependency
```
implementation 'one.microproject.iamservice:iam-client-spring:2.5.4-RELEASE'
implementation 'one.microproject.iamservice:iam-client-spring:2.5.5-RELEASE'
```
2. See [this spring-method-security example](../../iam-examples/spring-method-security)
* How to configure http security.
Expand Down
2 changes: 1 addition & 1 deletion iam-commons/iam-client-spring/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

group = 'one.microproject.iamservice'
archivesBaseName = "iam-client-spring"
version = '2.5.4-RELEASE'
version = '2.5.5-RELEASE'

sourceCompatibility = '11'

Expand Down
4 changes: 2 additions & 2 deletions iam-commons/iam-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ This client library makes JWT verification easier for clients and micro-services
<dependency>
<groupId>one.microproject.iamservice</groupId>
<artifactId>iam-client</artifactId>
<version>2.5.4-RELEASE</version>
<version>2.5.5-RELEASE</version>
<dependency/>
```
* gradle dependency
```
implementation 'one.microproject.iamservice:iam-client:2.5.4-RELEASE'
implementation 'one.microproject.iamservice:iam-client:2.5.5-RELEASE'
```
2. Create client instance programmatically.
```
Expand Down
2 changes: 1 addition & 1 deletion iam-commons/iam-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

group = 'one.microproject.iamservice'
archivesBaseName = "iam-client"
version = '2.5.4-RELEASE'
version = '2.5.5-RELEASE'

sourceCompatibility = '11'

Expand Down
Loading

0 comments on commit b5a258c

Please sign in to comment.