creating new relrease

jveverka · Jul 25, 2021 · 60e4df2 · 60e4df2
1 parent 2ab5c93
commit 60e4df2
Show file tree

Hide file tree

Showing 41 changed files with 139 additions and 139 deletions.
diff --git a/README.md b/README.md
@@ -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.7-RELEASE
+  docker run -d -p 8080:8080 jurajveverka/iam-service:2.5.8-RELEASE
   curl 'http://localhost:8080/services/discovery'
   curl 'http://localhost:8080/services/oauth2/iam-admins/iam-admins/.well-known/openid-configuration'
   ```

diff --git a/build.gradle b/build.gradle
@@ -41,9 +41,9 @@ subprojects {
 
 project(':iam-model') {
     dependencies {
-        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('com.fasterxml.jackson.core:jackson-annotations:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-core:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-databind:2.12.4')
         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')
@@ -55,13 +55,13 @@ project(':iam-client') {
         implementation project(':iam-model')
         testImplementation project(':iam-core')
 
-        implementation('org.slf4j:slf4j-api:1.7.31')
+        implementation('org.slf4j:slf4j-api:1.7.32')
         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.12.3')
-        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.4')
+        implementation('com.fasterxml.jackson.core:jackson-core:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-databind:2.12.4')
         implementation 'org.bouncycastle:bcpg-jdk15on:1.69'
         implementation 'org.bouncycastle:bcpkix-jdk15on:1.69'
 
@@ -76,17 +76,17 @@ project(':iam-client-spring') {
         implementation project(':iam-model')
         implementation project(':iam-client')
 
-        implementation('org.slf4j:slf4j-api:1.7.31')
-        implementation('org.apache.tomcat.embed:tomcat-embed-core:9.0.48')
-        implementation('org.springframework:spring-context:5.3.8')
-        implementation('org.springframework.boot:spring-boot:2.5.2')
-        implementation('org.springframework:spring-web:5.3.8')
+        implementation('org.slf4j:slf4j-api:1.7.32')
+        implementation('org.apache.tomcat.embed:tomcat-embed-core:9.0.50')
+        implementation('org.springframework:spring-context:5.3.9')
+        implementation('org.springframework.boot:spring-boot:2.5.3')
+        implementation('org.springframework:spring-web:5.3.9')
         implementation('org.springframework.security:spring-security-core:5.5.1')
         implementation('io.jsonwebtoken:jjwt-api:0.11.2')
         implementation('io.jsonwebtoken:jjwt-impl:0.11.2')
-        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('com.fasterxml.jackson.core:jackson-annotations:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-core:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-databind:2.12.4')
 
         testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
         testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
@@ -99,13 +99,13 @@ project(':iam-service-client') {
         implementation project(':iam-model')
         implementation project(':iam-core')
 
-        implementation('org.slf4j:slf4j-api:1.7.31')
+        implementation('org.slf4j:slf4j-api:1.7.32')
         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.12.3')
-        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.4')
+        implementation('com.fasterxml.jackson.core:jackson-core:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-databind:2.12.4')
         implementation 'org.bouncycastle:bcpg-jdk15on:1.69'
         implementation 'org.bouncycastle:bcpkix-jdk15on:1.69'
 
@@ -120,19 +120,19 @@ project(':iam-core') {
         implementation project(':iam-model')
         implementation project(':iam-client')
 
-        implementation('org.slf4j:slf4j-api:1.7.31')
+        implementation('org.slf4j:slf4j-api:1.7.32')
         implementation('io.jsonwebtoken:jjwt-api:0.11.2')
         implementation('io.jsonwebtoken:jjwt-impl:0.11.2')
         implementation('io.jsonwebtoken:jjwt-jackson:0.11.2') {
             exclude group: 'com.fasterxml.jackson.core'
         }
         implementation('org.bouncycastle:bcpg-jdk15on:1.69')
         implementation('org.bouncycastle:bcpkix-jdk15on:1.69')
-        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('com.fasterxml.jackson.core:jackson-annotations:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-core:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-databind:2.12.4')
 
-        testImplementation('org.slf4j:slf4j-simple:1.7.31')
+        testImplementation('org.slf4j:slf4j-simple:1.7.32')
         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')
@@ -164,7 +164,7 @@ project(':iam-service') {
             exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
         }
 
-        implementation('redis.clients:jedis:3.6.2')
+        implementation('redis.clients:jedis:3.6.3')
 
         testImplementation('org.springframework.boot:spring-boot-starter-test')
         testImplementation 'com.squareup.okhttp3:okhttp:4.9.1'
@@ -176,14 +176,14 @@ project(':iam-persistence-file-system') {
         implementation project(':iam-model')
         implementation project(':iam-core')
 
-        implementation('org.slf4j:slf4j-api:1.7.31')
-        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.slf4j:slf4j-api:1.7.32')
+        implementation('com.fasterxml.jackson.core:jackson-core:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-databind:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.4')
         implementation('org.bouncycastle:bcpg-jdk15on:1.69')
         implementation('org.bouncycastle:bcpkix-jdk15on:1.69')
 
-        testImplementation('org.slf4j:slf4j-simple:1.7.31')
+        testImplementation('org.slf4j:slf4j-simple:1.7.32')
         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')
@@ -195,11 +195,11 @@ project(':iam-persistence-mongo') {
         implementation project(':iam-model')
         implementation project(':iam-core')
 
-        implementation('org.slf4j:slf4j-api:1.7.31')
-        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.slf4j:slf4j-api:1.7.32')
+        implementation('com.fasterxml.jackson.core:jackson-core:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-databind:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.4')
+        implementation('com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.4')
         implementation('org.bouncycastle:bcpg-jdk15on:1.69')
         implementation('org.bouncycastle:bcpkix-jdk15on:1.69')
 
@@ -211,12 +211,12 @@ project(':iam-persistence-mongo') {
             exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jsr310'
         }
 
-        testImplementation('org.slf4j:slf4j-simple:1.7.31')
+        testImplementation('org.slf4j:slf4j-simple:1.7.32')
         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')
+        testImplementation('org.testcontainers:junit-jupiter:1.16.0')
+        testImplementation('org.testcontainers:mongodb:1.16.0')
     }
 }
 
@@ -225,17 +225,17 @@ project(':iam-caches-redis') {
         implementation project(':iam-model')
         implementation project(':iam-core')
 
-        implementation('org.slf4j:slf4j-api:1.7.31')
-        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.2')
+        implementation('org.slf4j:slf4j-api:1.7.32')
+        implementation('com.fasterxml.jackson.core:jackson-core:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-databind:2.12.4')
+        implementation('com.fasterxml.jackson.core:jackson-annotations:2.12.4')
+        implementation('redis.clients:jedis:3.6.3')
 
-        testImplementation('org.slf4j:slf4j-simple:1.7.31')
+        testImplementation('org.slf4j:slf4j-simple:1.7.32')
         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:junit-jupiter:1.16.0')
     }
 }
 
@@ -253,11 +253,11 @@ project(':performance-testing') {
         implementation 'io.jsonwebtoken:jjwt-jackson:0.11.2'
         implementation 'org.bouncycastle:bcpg-jdk15on:1.69'
         implementation 'org.bouncycastle:bcpkix-jdk15on:1.69'
-        implementation 'org.slf4j:slf4j-api:1.7.31'
+        implementation 'org.slf4j:slf4j-api:1.7.32'
         implementation 'one.microproject.testmeter:test-meter:0.0.1'
         implementation('org.junit.jupiter:junit-jupiter-params:5.7.2')
 
-        testImplementation('org.slf4j:slf4j-simple:1.7.31')
+        testImplementation('org.slf4j:slf4j-simple:1.7.32')
         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')
@@ -280,9 +280,9 @@ project(':integration-tests') {
         implementation 'io.jsonwebtoken:jjwt-jackson:0.11.2'
         implementation 'org.bouncycastle:bcpg-jdk15on:1.69'
         implementation 'org.bouncycastle:bcpkix-jdk15on:1.69'
-        implementation 'org.slf4j:slf4j-api:1.7.31'
+        implementation 'org.slf4j:slf4j-api:1.7.32'
 
-        testImplementation('org.slf4j:slf4j-simple:1.7.31')
+        testImplementation('org.slf4j:slf4j-simple:1.7.32')
         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')

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,15 +1,15 @@
 version: '3'
 services:
   iam-service:
-    image: iam-service:2.5.7-RELEASE
+    image: iam-service:2.5.8-RELEASE
     build:
       context: iam-service
       dockerfile: Dockerfile
     network_mode: "host"
     #ports:
     #  - "8080:8080"
   spring-method-security:
-    image: spring-method-security:2.5.7-RELEASE
+    image: spring-method-security:2.5.8-RELEASE
     build:
       context: iam-examples/spring-method-security
       dockerfile: Dockerfile
@@ -19,7 +19,7 @@ services:
     depends_on:
       - iam-service
   spring-resource-server:
-    image: spring-resource-server:2.5.7-RELEASE
+    image: spring-resource-server:2.5.8-RELEASE
     build:
       context: iam-examples/spring-resource-server
       dockerfile: Dockerfile
@@ -29,7 +29,7 @@ services:
     depends_on:
       - iam-service
   spring-webflux-secured:
-    image: spring-webflux-secured:2.5.7-RELEASE
+    image: spring-webflux-secured:2.5.8-RELEASE
     build:
       context: iam-examples/spring-webflux-secured
       dockerfile: Dockerfile

diff --git a/docs/IAM-user-manual/01a-standalone-server-config.md b/docs/IAM-user-manual/01a-standalone-server-config.md
@@ -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.7-RELEASE.jar \
+  java -Xms32m -Xmx128m -jar iam-service-2.5.8-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.
@@ -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.7-RELEASE \
+  docker run -d --name iam-service-2.5.8-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.7-RELEASE
+    -p 8080:8080 jurajveverka/iam-service:2.5.8-RELEASE
   ```
   ``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.7-RELEASE /bin/sh
-  docker logs --follow iam-service-2.5.7-RELEASE
+  docker exec -ti iam-service-2.5.8-RELEASE /bin/sh
+  docker logs --follow iam-service-2.5.8-RELEASE
   ```
 * Verify Service state, check OpenAPI documentation.
   ```
@@ -48,9 +48,9 @@
   ```
 * Stop and cleanup Docker
   ```
-  docker stop iam-service-2.5.7-RELEASE
-  docker rm iam-service-2.5.7-RELEASE
-  docker image rm -f iam-service:2.5.7-RELEASE
+  docker stop iam-service-2.5.8-RELEASE
+  docker rm iam-service-2.5.8-RELEASE
+  docker image rm -f iam-service:2.5.8-RELEASE
   ```
 
 * [next step: Setup Persistence Layer](01b_setup-persitence-layer.md)

diff --git a/docs/k8s-deployments/iam-service-deployment.yml b/docs/k8s-deployments/iam-service-deployment.yml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: iam-service
-          image: jurajveverka/iam-service:2.5.7-RELEASE
+          image: jurajveverka/iam-service:2.5.8-RELEASE
           ports:
             - name: http
               containerPort: 8080

diff --git a/iam-commons/iam-client-spring/README.md b/iam-commons/iam-client-spring/README.md
@@ -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.7-RELEASE</version>
+       <version>2.5.8-RELEASE</version>
      <dependency/>
      ```
    * gradle dependency
      ```
-     implementation 'one.microproject.iamservice:iam-client-spring:2.5.7-RELEASE'
+     implementation 'one.microproject.iamservice:iam-client-spring:2.5.8-RELEASE'
      ```
 2. See [this spring-method-security example](../../iam-examples/spring-method-security)
    * How to configure http security.

diff --git a/iam-commons/iam-client-spring/build.gradle b/iam-commons/iam-client-spring/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-client-spring"
-version = '2.5.7-RELEASE'
+version = '2.5.8-RELEASE'
 
 sourceCompatibility = '11'
 

diff --git a/iam-commons/iam-client/README.md b/iam-commons/iam-client/README.md
@@ -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.7-RELEASE</version>
+       <version>2.5.8-RELEASE</version>
      <dependency/>
      ```
    * gradle dependency
      ```
-     implementation 'one.microproject.iamservice:iam-client:2.5.7-RELEASE'
+     implementation 'one.microproject.iamservice:iam-client:2.5.8-RELEASE'
      ```
 2. Create client instance programmatically.
    ```

diff --git a/iam-commons/iam-client/build.gradle b/iam-commons/iam-client/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-client"
-version = '2.5.7-RELEASE'
+version = '2.5.8-RELEASE'
 
 sourceCompatibility = '11'
 

diff --git a/iam-commons/iam-core/build.gradle b/iam-commons/iam-core/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-core"
-version = '2.5.7-RELEASE'
+version = '2.5.8-RELEASE'
 sourceCompatibility = '11'
 
 repositories {

diff --git a/iam-commons/iam-core/src/main/java/one/microproject/iamservice/core/utils/ModelUtils.java b/iam-commons/iam-core/src/main/java/one/microproject/iamservice/core/utils/ModelUtils.java
@@ -56,7 +56,7 @@ public final class ModelUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(ModelUtils.class);
 
-    public static final String MODEL_VERSION = "2.5.7-RELEASE";
+    public static final String MODEL_VERSION = "2.5.8-RELEASE";
     public static final Model DEFAULT_MODEL = new ModelImpl(ModelId.from("default-model-001"), "Default Model");
     public static final String IAM_ADMINS_NAME = "iam-admins";
     public static final OrganizationId IAM_ADMINS_ORG = OrganizationId.from(IAM_ADMINS_NAME);

diff --git a/iam-commons/iam-model/build.gradle b/iam-commons/iam-model/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-model"
-version = '2.5.7-RELEASE'
+version = '2.5.8-RELEASE'
 
 sourceCompatibility = '11'