Merge pull request #82 from jveverka/release-branch-2.5.1

Release branch 2.5.1
jveverka · Jan 30, 2021 · ca2debf · ca2debf
2 parents a014794 + f3a2a3a
commit ca2debf
Show file tree

Hide file tree

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

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,15 +1,15 @@
 version: '3'
 services:
   iam-service:
-    image: iam-service:2.5.0-RELEASE
+    image: iam-service:2.5.1-RELEASE
     build:
       context: iam-service
       dockerfile: Dockerfile
     network_mode: "host"
     ports:
       - "8080:8080"
   spring-method-security:
-    image: spring-method-security:2.5.0-RELEASE
+    image: spring-method-security:2.5.1-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.0-RELEASE
+    image: spring-resource-server:2.5.1-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.0-RELEASE
+    image: spring-webflux-secured:2.5.1-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.0-RELEASE.jar \
+  java -Xms32m -Xmx128m -jar iam-service-2.5.1-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.0-RELEASE \
+  docker run -d --name iam-service-2.5.1-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.0-RELEASE-amd64
+    -p 8080:8080 jurajveverka/iam-service:2.5.1-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.0-RELEASE /bin/sh
-  docker logs --follow iam-service-2.5.0-RELEASE
+  docker exec -ti iam-service-2.5.1-RELEASE /bin/sh
+  docker logs --follow iam-service-2.5.1-RELEASE
   ```
 * Verify Service state, check OpenAPI documentation.
   ```
@@ -48,9 +48,9 @@
   ```
 * Stop and cleanup Docker
   ```
-  docker stop iam-service-2.5.0-RELEASE
-  docker rm iam-service-2.5.0-RELEASE
-  docker image rm -f iam-service:2.5.0-RELEASE
+  docker stop iam-service-2.5.1-RELEASE
+  docker rm iam-service-2.5.1-RELEASE
+  docker image rm -f iam-service:2.5.1-RELEASE
   ```
 
 * [next step: Setup Persistence Layer](01b_setup-persitence-layer.md)

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

diff --git a/iam-common/iam-client-spring/build.gradle b/iam-common/iam-client-spring/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-client-spring"
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 
 sourceCompatibility = '11'
 
@@ -17,16 +17,16 @@ repositories {
 dependencies {
     implementation('org.slf4j:slf4j-api:1.7.30')
     implementation('org.apache.tomcat.embed:tomcat-embed-core:9.0.41')
-    implementation('org.springframework:spring-context:5.3.2')
-    implementation('org.springframework.boot:spring-boot:2.4.1')
-    implementation('org.springframework:spring-web:5.3.2')
+    implementation('org.springframework:spring-context:5.3.3')
+    implementation('org.springframework.boot:spring-boot:2.4.2')
+    implementation('org.springframework:spring-web:5.3.3')
     implementation('org.springframework.security:spring-security-core:5.4.2')
     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.3')
-    implementation('com.fasterxml.jackson.core:jackson-core:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-databind:2.11.3')
+    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.0')
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0')

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

diff --git a/iam-common/iam-client/build.gradle b/iam-common/iam-client/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-client"
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 
 sourceCompatibility = '11'
 
@@ -19,9 +19,9 @@ dependencies {
     implementation('io.jsonwebtoken:jjwt-api:0.11.2')
     implementation('io.jsonwebtoken:jjwt-impl:0.11.2')
     implementation('com.squareup.okhttp3:okhttp:4.9.0')
-    implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-core:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-databind:2.11.3')
+    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 'org.bouncycastle:bcpg-jdk15on:1.68'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.68'
 

diff --git a/iam-common/iam-model/build.gradle b/iam-common/iam-model/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-model"
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 
 sourceCompatibility = '11'
 
@@ -15,9 +15,9 @@ repositories {
 }
 
 dependencies {
-    implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-core:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-databind:2.11.3')
+    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.0')
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0')

diff --git a/iam-common/iam-service-client/README.md b/iam-common/iam-service-client/README.md
@@ -8,12 +8,12 @@ Java client library providing APIs for all iam-service management functions.
      <dependency>
        <groupId>one.microproject.iamservice</groupId>
        <artifactId>iam-service-client</artifactId>
-       <version>2.5.0-RELEASE</version>
+       <version>2.5.1-RELEASE</version>
      <dependency/>
      ```
    * gradle dependency
      ```
-     implementation 'one.microproject.iamservice:iam-service-client:2.5.0-RELEASE'
+     implementation 'one.microproject.iamservice:iam-service-client:2.5.1-RELEASE'
      ```
 2. Create client instance programmatically.
    ```

diff --git a/iam-common/iam-service-client/build.gradle b/iam-common/iam-service-client/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-service-client"
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 
 sourceCompatibility = '11'
 
@@ -19,9 +19,9 @@ dependencies {
     implementation('io.jsonwebtoken:jjwt-api:0.11.2')
     implementation('io.jsonwebtoken:jjwt-impl:0.11.2')
     implementation('com.squareup.okhttp3:okhttp:4.9.0')
-    implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-core:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-databind:2.11.3')
+    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 'org.bouncycastle:bcpg-jdk15on:1.68'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.68'
 

diff --git a/iam-core/build.gradle b/iam-core/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 group = 'one.microproject.iamservice'
 archivesBaseName = "iam-core"
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 sourceCompatibility = '11'
 
 repositories {
@@ -22,9 +22,9 @@ dependencies {
     }
     implementation('org.bouncycastle:bcpg-jdk15on:1.68')
     implementation('org.bouncycastle:bcpkix-jdk15on:1.68')
-    implementation('com.fasterxml.jackson.core:jackson-annotations:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-core:2.11.3')
-    implementation('com.fasterxml.jackson.core:jackson-databind:2.11.3')
+    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.slf4j:slf4j-simple:1.7.30')
     testImplementation('org.junit.jupiter:junit-jupiter:5.7.0')

diff --git a/iam-core/src/main/java/one/microproject/iamservice/core/utils/ModelUtils.java b/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.0-RELEASE";
+    public static final String MODEL_VERSION = "2.5.1-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-examples/integration-tests/build.gradle b/iam-examples/integration-tests/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'one.microproject.iamservice'
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 sourceCompatibility = '11'
 
 repositories {

diff --git a/iam-examples/spring-method-security/Dockerfile b/iam-examples/spring-method-security/Dockerfile
@@ -1,5 +1,5 @@
 FROM adoptopenjdk/openjdk11:alpine-jre
-COPY build/libs/spring-method-security-2.5.0-RELEASE.jar /spring-method-security-2.5.0-RELEASE.jar
+COPY build/libs/spring-method-security-2.5.1-RELEASE.jar /spring-method-security-2.5.1-RELEASE.jar
 COPY start-service.sh /start-service.sh
 RUN chmod +x /start-service.sh
 RUN apk --no-cache add curl

diff --git a/iam-examples/spring-method-security/README.md b/iam-examples/spring-method-security/README.md
@@ -36,14 +36,14 @@ JWT tokens issued by __iam-service__ are used to get access to resources hosted
 ## Build and Run
 ```
 gradle clean build
-java -jar build/libs/spring-method-security-2.5.0-RELEASE.jar
+java -jar build/libs/spring-method-security-2.5.1-RELEASE.jar
 ```
 
 ### Build Docker image 
 ```
-docker build . -t spring-method-security:2.5.0-RELEASE
+docker build . -t spring-method-security:2.5.1-RELEASE
 docker image list
-docker save --output="build/spring-method-security:2.5.0-RELEASE.tar" spring-method-security:2.5.0-RELEASE
+docker save --output="build/spring-method-security:2.5.1-RELEASE.tar" spring-method-security:2.5.1-RELEASE
 docker image rm -f <imageid>
-docker run -p 8082:8082 spring-method-security:2.5.0-RELEASE
+docker run -p 8082:8082 spring-method-security:2.5.1-RELEASE
 ```
diff --git a/iam-examples/spring-method-security/build.gradle b/iam-examples/spring-method-security/build.gradle
@@ -1,11 +1,11 @@
 plugins {
-	id 'org.springframework.boot' version '2.4.1'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '2.4.2'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
 }
 
 group = 'one.microproject.iamservice'
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 sourceCompatibility = '11'
 
 repositories {

diff --git a/iam-examples/spring-method-security/start-service.sh b/iam-examples/spring-method-security/start-service.sh
@@ -7,4 +7,4 @@ until $(curl --silent --output /dev/null -f http://127.0.0.1:8080/services/oauth
   sleep 1
 done
 
-java -Xms32m -Xmx128M -jar /spring-method-security-2.5.0-RELEASE.jar
+java -Xms32m -Xmx128M -jar /spring-method-security-2.5.1-RELEASE.jar
diff --git a/iam-examples/spring-resource-server/Dockerfile b/iam-examples/spring-resource-server/Dockerfile
@@ -1,5 +1,5 @@
 FROM adoptopenjdk/openjdk11:alpine-jre
-COPY build/libs/spring-resource-server-2.5.0-RELEASE.jar /spring-resource-server-2.5.0-RELEASE.jar
+COPY build/libs/spring-resource-server-2.5.1-RELEASE.jar /spring-resource-server-2.5.1-RELEASE.jar
 COPY start-service.sh /start-service.sh
 RUN chmod +x /start-service.sh
 RUN apk --no-cache add curl

diff --git a/iam-examples/spring-resource-server/README.md b/iam-examples/spring-resource-server/README.md
@@ -12,15 +12,15 @@ JWT tokens issues by __iam-service__ are used to get access to resources hosted
 ## Build and Run
 ```
 gradle clean build
-java -jar build/libs/spring-resource-server-2.5.0-RELEASE.jar
+java -jar build/libs/spring-resource-server-2.5.1-RELEASE.jar
 ```
 ### Build Docker image 
 ```
-docker build . -t spring-resource-server:2.5.0-RELEASE
+docker build . -t spring-resource-server:2.5.1-RELEASE
 docker image list
-docker save --output="build/spring-resource-server:2.5.0-RELEASE.tar" spring-resource-server:2.5.0-RELEASE
+docker save --output="build/spring-resource-server:2.5.1-RELEASE.tar" spring-resource-server:2.5.1-RELEASE
 docker image rm -f <imageid>
-docker run -p 8081:8081 spring-resource-server:2.5.0-RELEASE
+docker run -p 8081:8081 spring-resource-server:2.5.1-RELEASE
 ```
 
 ### Reference Documentation

diff --git a/iam-examples/spring-resource-server/build.gradle b/iam-examples/spring-resource-server/build.gradle
@@ -1,11 +1,11 @@
 plugins {
-	id 'org.springframework.boot' version '2.4.1'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '2.4.2'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
 }
 
 group = 'one.microproject.iamservice'
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 sourceCompatibility = '11'
 
 repositories {

diff --git a/iam-examples/spring-resource-server/start-service.sh b/iam-examples/spring-resource-server/start-service.sh
@@ -7,4 +7,4 @@ until $(curl --silent --output /dev/null -f http://127.0.0.1:8080/services/oauth
   sleep 1
 done
 
-java -Xms32m -Xmx128M -jar /spring-resource-server-2.5.0-RELEASE.jar
+java -Xms32m -Xmx128M -jar /spring-resource-server-2.5.1-RELEASE.jar
diff --git a/iam-examples/spring-webflux-secured/Dockerfile b/iam-examples/spring-webflux-secured/Dockerfile
@@ -1,5 +1,5 @@
 FROM adoptopenjdk/openjdk11:alpine-jre
-COPY build/libs/spring-webflux-secured-2.5.0-RELEASE.jar /spring-webflux-secured-2.5.0-RELEASE.jar
+COPY build/libs/spring-webflux-secured-2.5.1-RELEASE.jar /spring-webflux-secured-2.5.1-RELEASE.jar
 COPY start-service.sh /start-service.sh
 RUN chmod +x /start-service.sh
 RUN apk --no-cache add curl

diff --git a/iam-examples/spring-webflux-secured/build.gradle b/iam-examples/spring-webflux-secured/build.gradle
@@ -1,11 +1,11 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.1'
-    id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+    id 'org.springframework.boot' version '2.4.2'
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
 
 group = 'one.microproject.iamservice'
-version = '2.5.0-RELEASE'
+version = '2.5.1-RELEASE'
 sourceCompatibility = '11'
 
 repositories {

diff --git a/iam-examples/spring-webflux-secured/start-service.sh b/iam-examples/spring-webflux-secured/start-service.sh
@@ -7,4 +7,4 @@ until $(curl --silent --output /dev/null -f http://127.0.0.1:8080/services/oauth
   sleep 1
 done
 
-java -Xms32m -Xmx128M -jar /spring-webflux-secured-2.5.0-RELEASE.jar
+java -Xms32m -Xmx128M -jar /spring-webflux-secured-2.5.1-RELEASE.jar
-Original file line number
+Diff line change
@@ Expand Up @@
       sleep 1
     done
-    java -Xms32m -Xmx128M -jar /spring-method-security-2.5.0-RELEASE.jar
+    java -Xms32m -Xmx128M -jar /spring-method-security-2.5.1-RELEASE.jar