creating release 2.5.6

jveverka · Jun 19, 2021 · 2cd701b · 2cd701b
1 parent 7c83575
commit 2cd701b
Show file tree

Hide file tree

Showing 44 changed files with 130 additions and 94 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.5-RELEASE
+  docker run -d -p 8080:8080 jurajveverka/iam-service:2.5.6-RELEASE
   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.5-RELEASE
+    image: iam-service:2.5.6-RELEASE
     build:
       context: iam-service
       dockerfile: Dockerfile
     network_mode: "host"
     #ports:
     #  - "8080:8080"
   spring-method-security:
-    image: spring-method-security:2.5.5-RELEASE
+    image: spring-method-security:2.5.6-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.5-RELEASE
+    image: spring-resource-server:2.5.6-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.5-RELEASE
+    image: spring-webflux-secured:2.5.6-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.5-RELEASE.jar \
+  java -Xms32m -Xmx128m -jar iam-service-2.5.6-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.5-RELEASE \
+  docker run -d --name iam-service-2.5.6-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.5-RELEASE
+    -p 8080:8080 jurajveverka/iam-service:2.5.6-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.5-RELEASE /bin/sh
-  docker logs --follow iam-service-2.5.5-RELEASE
+  docker exec -ti iam-service-2.5.6-RELEASE /bin/sh
+  docker logs --follow iam-service-2.5.6-RELEASE
   ```
 * Verify Service state, check OpenAPI documentation.
   ```
@@ -48,9 +48,9 @@
   ```
 * Stop and cleanup Docker
   ```
-  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
+  docker stop iam-service-2.5.6-RELEASE
+  docker rm iam-service-2.5.6-RELEASE
+  docker image rm -f iam-service:2.5.6-RELEASE
   ```
 
 * [next step: Setup Persistence Layer](01b_setup-persitence-layer.md)

diff --git a/docs/IAM-user-manual/02c-manage-organization-and-projects.md b/docs/IAM-user-manual/02c-manage-organization-and-projects.md
@@ -27,8 +27,8 @@ All actions described below must be performed under project admin user identity.
   --data-raw '{
       "id": "client-002",
       "name": "Second Client",
-      "defaultAccessTokenDuration": 3600,
-      "defaultRefreshTokenDuration": 3600,
+      "defaultAccessTokenDuration": 3600000,
+      "defaultRefreshTokenDuration": 3600000,
       "secret": "s3cr3t",
       "properties":  {
           "redirectURL": "",
@@ -66,8 +66,8 @@ All actions described below must be performed under project admin user identity.
   --data-raw '{
       "id": "user-001",
       "name": "User Name",
-      "defaultAccessTokenDuration": 3600,
-      "defaultRefreshTokenDuration": 3600,
+      "defaultAccessTokenDuration": 3600000,
+      "defaultRefreshTokenDuration": 3600000,
       "email": "[email protected]",
       "password": "secret",
       "userProperties": {

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.5-RELEASE
+          image: jurajveverka/iam-service:2.5.6-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.5-RELEASE</version>
+       <version>2.5.6-RELEASE</version>
      <dependency/>
      ```
    * gradle dependency
      ```
-     implementation 'one.microproject.iamservice:iam-client-spring:2.5.5-RELEASE'
+     implementation 'one.microproject.iamservice:iam-client-spring:2.5.6-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.5-RELEASE'
+version = '2.5.6-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.5-RELEASE</version>
+       <version>2.5.6-RELEASE</version>
      <dependency/>
      ```
    * gradle dependency
      ```
-     implementation 'one.microproject.iamservice:iam-client:2.5.5-RELEASE'
+     implementation 'one.microproject.iamservice:iam-client:2.5.6-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.5-RELEASE'
+version = '2.5.6-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.5-RELEASE'
+version = '2.5.6-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.5-RELEASE";
+    public static final String MODEL_VERSION = "2.5.6-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.5-RELEASE'
+version = '2.5.6-RELEASE'
 
 sourceCompatibility = '11'
 

diff --git a/iam-commons/iam-model/src/main/java/one/microproject/iamservice/core/dto/BuildInfo.java b/iam-commons/iam-model/src/main/java/one/microproject/iamservice/core/dto/BuildInfo.java
@@ -10,26 +10,38 @@ public class BuildInfo {
     private final String artefact;
     private final String name;
     private final String version;
+    private final Long timestamp;
+    private final Long uptime;
+    private final String timezone;
 
     @JsonCreator
     public BuildInfo(@JsonProperty("id") String id,
                      @JsonProperty("group") String group,
                      @JsonProperty("artefact") String artefact,
                      @JsonProperty("name") String name,
-                     @JsonProperty("version") String version) {
+                     @JsonProperty("version") String version,
+                     @JsonProperty("timestamp") Long timestamp,
+                     @JsonProperty("uptime") Long uptime,
+                     @JsonProperty("timezone") String timezone) {
         this.id = id;
         this.group = group;
         this.artefact = artefact;
         this.name = name;
         this.version = version;
+        this.timestamp = timestamp;
+        this.uptime = uptime;
+        this.timezone = timezone;
     }
 
-    public BuildInfo(String id) {
+    public BuildInfo(String id, Long timestamp, Long uptime, String timezone) {
         this.id = id;
         this.group = null;
         this.artefact = null;
         this.name = null;
         this.version = null;
+        this.timestamp = timestamp;
+        this.uptime = uptime;
+        this.timezone = timezone;
     }
 
     public String getId() {
@@ -52,4 +64,15 @@ public String getVersion() {
         return version;
     }
 
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public Long getUptime() {
+        return uptime;
+    }
+
+    public String getTimezone() {
+        return timezone;
+    }
 }
diff --git a/iam-commons/iam-service-client/README.md b/iam-commons/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.5-RELEASE</version>
+       <version>2.5.6-RELEASE</version>
      <dependency/>
      ```
    * gradle dependency
      ```
-     implementation 'one.microproject.iamservice:iam-service-client:2.5.5-RELEASE'
+     implementation 'one.microproject.iamservice:iam-service-client:2.5.6-RELEASE'
      ```
 2. Create client instance programmatically.
    ```

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

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.5-RELEASE'
+version = '2.5.6-RELEASE'
 sourceCompatibility = '11'
 
 repositories {

diff --git a/iam-examples/performance-testing/build.gradle b/iam-examples/performance-testing/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'one.microproject.iamservice'
-version = '2.5.5-RELEASE'
+version = '2.5.6-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.5-RELEASE.jar /spring-method-security-2.5.5-RELEASE.jar
+COPY build/libs/spring-method-security-2.5.6-RELEASE.jar /spring-method-security-2.5.6-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.5-RELEASE.jar
+java -jar build/libs/spring-method-security-2.5.6-RELEASE.jar
 ```
 
 ### Build Docker image 
 ```
-docker build . -t spring-method-security:2.5.5-RELEASE
+docker build . -t spring-method-security:2.5.6-RELEASE
 docker image list
-docker save --output="build/spring-method-security:2.5.5-RELEASE.tar" spring-method-security:2.5.5-RELEASE
+docker save --output="build/spring-method-security:2.5.6-RELEASE.tar" spring-method-security:2.5.6-RELEASE
 docker image rm -f <imageid>
-docker run -p 8082:8082 spring-method-security:2.5.5-RELEASE
+docker run -p 8082:8082 spring-method-security:2.5.6-RELEASE
 ```
diff --git a/iam-examples/spring-method-security/build.gradle b/iam-examples/spring-method-security/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'one.microproject.iamservice'
-version = '2.5.5-RELEASE'
+version = '2.5.6-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.5-RELEASE.jar
+java -Xms32m -Xmx128M -jar /spring-method-security-2.5.6-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.5-RELEASE.jar /spring-resource-server-2.5.5-RELEASE.jar
+COPY build/libs/spring-resource-server-2.5.6-RELEASE.jar /spring-resource-server-2.5.6-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.5-RELEASE.jar
+java -jar build/libs/spring-resource-server-2.5.6-RELEASE.jar
 ```
 ### Build Docker image 
 ```
-docker build . -t spring-resource-server:2.5.5-RELEASE
+docker build . -t spring-resource-server:2.5.6-RELEASE
 docker image list
-docker save --output="build/spring-resource-server:2.5.5-RELEASE.tar" spring-resource-server:2.5.5-RELEASE
+docker save --output="build/spring-resource-server:2.5.6-RELEASE.tar" spring-resource-server:2.5.6-RELEASE
 docker image rm -f <imageid>
-docker run -p 8081:8081 spring-resource-server:2.5.5-RELEASE
+docker run -p 8081:8081 spring-resource-server:2.5.6-RELEASE
 ```
 
 ### Reference Documentation

diff --git a/iam-examples/spring-resource-server/build.gradle b/iam-examples/spring-resource-server/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'one.microproject.iamservice'
-version = '2.5.5-RELEASE'
+version = '2.5.6-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.5-RELEASE.jar
+java -Xms32m -Xmx128M -jar /spring-resource-server-2.5.6-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.5-RELEASE.jar /spring-webflux-secured-2.5.5-RELEASE.jar
+COPY build/libs/spring-webflux-secured-2.5.6-RELEASE.jar /spring-webflux-secured-2.5.6-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
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'one.microproject.iamservice'
-version = '2.5.5-RELEASE'
+version = '2.5.6-RELEASE'
 sourceCompatibility = '11'
 
 repositories {
-Original file line number
+Diff line change
@@ Expand Up @@
       sleep 1
     done
-    java -Xms32m -Xmx128M -jar /spring-method-security-2.5.5-RELEASE.jar
+    java -Xms32m -Xmx128M -jar /spring-method-security-2.5.6-RELEASE.jar