From 6c19cd9b25054b7c8c60d2cd2083c982fd70804a Mon Sep 17 00:00:00 2001 From: Juraj Veverka Date: Sat, 6 Mar 2021 11:26:56 +0100 Subject: [PATCH] version ugrade --- README.md | 2 +- build.gradle | 54 +++++++++---------- docker-compose.yml | 8 +-- .../01a-standalone-server-config.md | 16 +++--- iam-common/iam-client-spring/README.md | 4 +- iam-common/iam-client-spring/build.gradle | 2 +- iam-common/iam-client/README.md | 4 +- iam-common/iam-client/build.gradle | 2 +- iam-common/iam-model/build.gradle | 2 +- iam-common/iam-service-client/README.md | 4 +- iam-common/iam-service-client/build.gradle | 2 +- iam-core/build.gradle | 2 +- .../iamservice/core/utils/ModelUtils.java | 2 +- iam-examples/integration-tests/build.gradle | 2 +- .../spring-method-security/Dockerfile | 2 +- iam-examples/spring-method-security/README.md | 8 +-- .../spring-method-security/build.gradle | 4 +- .../spring-method-security/start-service.sh | 2 +- .../spring-resource-server/Dockerfile | 2 +- iam-examples/spring-resource-server/README.md | 8 +-- .../spring-resource-server/build.gradle | 4 +- .../spring-resource-server/start-service.sh | 2 +- .../spring-webflux-secured/Dockerfile | 2 +- .../spring-webflux-secured/build.gradle | 4 +- .../spring-webflux-secured/start-service.sh | 2 +- iam-persistence/iam-caches-redis/build.gradle | 2 +- .../iam-persistence-file-system/build.gradle | 2 +- .../iam-persistence-mongo/build.gradle | 2 +- iam-service/Dockerfile | 2 +- iam-service/README.md | 26 ++++----- iam-service/build.gradle | 4 +- iam-service/iam-service-start.sh | 4 +- release/Dockerfile.amd64 | 2 +- release/Dockerfile.arm32v7 | 2 +- release/Dockerfile.arm64v8 | 2 +- release/README-release.md | 10 ++-- release/RELEASE-CHECKLIST.md | 6 +-- release/RELEASE-NOTES.md | 8 +-- release/create-release.sh | 2 +- release/docker-create-image.sh | 2 +- release/version-upgrade.sh | 4 +- 41 files changed, 113 insertions(+), 113 deletions(-) diff --git a/README.md b/README.md index 0581f531..66c0e024 100644 --- 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.1-RELEASE-amd64 + docker run -d -p 8080:8080 jurajveverka/iam-service:2.5.2-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/build.gradle b/build.gradle index c89a2963..d31625a3 100644 --- a/build.gradle +++ b/build.gradle @@ -44,9 +44,9 @@ project(':iam-model') { 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') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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') } } @@ -64,9 +64,9 @@ project(':iam-client') { implementation 'org.bouncycastle:bcpg-jdk15on:1.68' implementation 'org.bouncycastle:bcpkix-jdk15on:1.68' - testImplementation('org.junit.jupiter:junit-jupiter:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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') } } @@ -87,9 +87,9 @@ project(':iam-client-spring') { 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') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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') } } @@ -108,9 +108,9 @@ project(':iam-service-client') { implementation 'org.bouncycastle:bcpg-jdk15on:1.68' implementation 'org.bouncycastle:bcpkix-jdk15on:1.68' - testImplementation('org.junit.jupiter:junit-jupiter:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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') } } @@ -132,9 +132,9 @@ project(':iam-core') { 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') - testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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') } } @@ -182,9 +182,9 @@ project(':iam-persistence-file-system') { implementation('org.bouncycastle:bcpkix-jdk15on:1.68') testImplementation('org.slf4j:slf4j-simple:1.7.30') - testImplementation('org.junit.jupiter:junit-jupiter:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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') } } @@ -210,9 +210,9 @@ project(':iam-persistence-mongo') { } testImplementation('org.slf4j:slf4j-simple:1.7.30') - testImplementation('org.junit.jupiter:junit-jupiter:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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.testcontainers:junit-jupiter:1.15.2') testImplementation('org.testcontainers:mongodb:1.15.2') } @@ -230,9 +230,9 @@ project(':iam-caches-redis') { implementation('redis.clients:jedis:3.3.0') testImplementation('org.slf4j:slf4j-simple:1.7.30') - testImplementation('org.junit.jupiter:junit-jupiter:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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.testcontainers:junit-jupiter:1.15.2') } } @@ -254,9 +254,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.0') - testImplementation('org.junit.jupiter:junit-jupiter-api:5.7.0') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.7.0') + 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('com.squareup.okhttp3:okhttp:4.9.0') } } diff --git a/docker-compose.yml b/docker-compose.yml index 8f40cba0..bb67ab21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: iam-service: - image: iam-service:2.5.1-RELEASE + image: iam-service:2.5.2-RELEASE build: context: iam-service dockerfile: Dockerfile @@ -9,7 +9,7 @@ services: #ports: # - "8080:8080" spring-method-security: - image: spring-method-security:2.5.1-RELEASE + image: spring-method-security:2.5.2-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.1-RELEASE + image: spring-resource-server:2.5.2-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.1-RELEASE + image: spring-webflux-secured:2.5.2-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 index b4ed9718..20d91945 100644 --- 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.1-RELEASE.jar \ + java -Xms32m -Xmx128m -jar iam-service-2.5.2-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.1-RELEASE \ + docker run -d --name iam-service-2.5.2-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.1-RELEASE-amd64 + -p 8080:8080 jurajveverka/iam-service:2.5.2-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.1-RELEASE /bin/sh - docker logs --follow iam-service-2.5.1-RELEASE + docker exec -ti iam-service-2.5.2-RELEASE /bin/sh + docker logs --follow iam-service-2.5.2-RELEASE ``` * Verify Service state, check OpenAPI documentation. ``` @@ -48,9 +48,9 @@ ``` * Stop and cleanup Docker ``` - 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 + docker stop iam-service-2.5.2-RELEASE + docker rm iam-service-2.5.2-RELEASE + docker image rm -f iam-service:2.5.2-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 index 9e61788a..c6098fb8 100644 --- 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 one.microproject.iamservice iam-client-spring - 2.5.1-RELEASE + 2.5.2-RELEASE ``` * gradle dependency ``` - implementation 'one.microproject.iamservice:iam-client-spring:2.5.1-RELEASE' + implementation 'one.microproject.iamservice:iam-client-spring:2.5.2-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 index 75370438..1ef72a7c 100644 --- 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.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' diff --git a/iam-common/iam-client/README.md b/iam-common/iam-client/README.md index 7d422945..e510ddfe 100644 --- 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 one.microproject.iamservice iam-client - 2.5.1-RELEASE + 2.5.2-RELEASE ``` * gradle dependency ``` - implementation 'one.microproject.iamservice:iam-client:2.5.1-RELEASE' + implementation 'one.microproject.iamservice:iam-client:2.5.2-RELEASE' ``` 2. Create client instance programmatically. ``` diff --git a/iam-common/iam-client/build.gradle b/iam-common/iam-client/build.gradle index b5527fcc..f61a71c1 100644 --- 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.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' diff --git a/iam-common/iam-model/build.gradle b/iam-common/iam-model/build.gradle index 1c4a19ab..84a34465 100644 --- 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.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' diff --git a/iam-common/iam-service-client/README.md b/iam-common/iam-service-client/README.md index af430039..2da41009 100644 --- 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. one.microproject.iamservice iam-service-client - 2.5.1-RELEASE + 2.5.2-RELEASE ``` * gradle dependency ``` - implementation 'one.microproject.iamservice:iam-service-client:2.5.1-RELEASE' + implementation 'one.microproject.iamservice:iam-service-client:2.5.2-RELEASE' ``` 2. Create client instance programmatically. ``` diff --git a/iam-common/iam-service-client/build.gradle b/iam-common/iam-service-client/build.gradle index befb0721..a0d1ff61 100644 --- 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.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' diff --git a/iam-core/build.gradle b/iam-core/build.gradle index 824609a5..ede993e7 100644 --- 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.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { 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 index 9b643b58..704ac81e 100644 --- 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.1-RELEASE"; + public static final String MODEL_VERSION = "2.5.2-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 index 26068cef..9cb2891f 100644 --- 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.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { diff --git a/iam-examples/spring-method-security/Dockerfile b/iam-examples/spring-method-security/Dockerfile index 74e3c742..803b9d8a 100644 --- 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.1-RELEASE.jar /spring-method-security-2.5.1-RELEASE.jar +COPY build/libs/spring-method-security-2.5.2-RELEASE.jar /spring-method-security-2.5.2-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 index 5a091ef0..110debd1 100644 --- 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.1-RELEASE.jar +java -jar build/libs/spring-method-security-2.5.2-RELEASE.jar ``` ### Build Docker image ``` -docker build . -t spring-method-security:2.5.1-RELEASE +docker build . -t spring-method-security:2.5.2-RELEASE docker image list -docker save --output="build/spring-method-security:2.5.1-RELEASE.tar" spring-method-security:2.5.1-RELEASE +docker save --output="build/spring-method-security:2.5.2-RELEASE.tar" spring-method-security:2.5.2-RELEASE docker image rm -f -docker run -p 8082:8082 spring-method-security:2.5.1-RELEASE +docker run -p 8082:8082 spring-method-security:2.5.2-RELEASE ``` diff --git a/iam-examples/spring-method-security/build.gradle b/iam-examples/spring-method-security/build.gradle index d9fe2720..c974a216 100644 --- 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.2' + id 'org.springframework.boot' version '2.4.3' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } group = 'one.microproject.iamservice' -version = '2.5.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { diff --git a/iam-examples/spring-method-security/start-service.sh b/iam-examples/spring-method-security/start-service.sh index d0e6b999..90708497 100755 --- 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.1-RELEASE.jar +java -Xms32m -Xmx128M -jar /spring-method-security-2.5.2-RELEASE.jar diff --git a/iam-examples/spring-resource-server/Dockerfile b/iam-examples/spring-resource-server/Dockerfile index 0ee52e3a..1050362f 100644 --- 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.1-RELEASE.jar /spring-resource-server-2.5.1-RELEASE.jar +COPY build/libs/spring-resource-server-2.5.2-RELEASE.jar /spring-resource-server-2.5.2-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 index cffdc724..d9740deb 100644 --- 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.1-RELEASE.jar +java -jar build/libs/spring-resource-server-2.5.2-RELEASE.jar ``` ### Build Docker image ``` -docker build . -t spring-resource-server:2.5.1-RELEASE +docker build . -t spring-resource-server:2.5.2-RELEASE docker image list -docker save --output="build/spring-resource-server:2.5.1-RELEASE.tar" spring-resource-server:2.5.1-RELEASE +docker save --output="build/spring-resource-server:2.5.2-RELEASE.tar" spring-resource-server:2.5.2-RELEASE docker image rm -f -docker run -p 8081:8081 spring-resource-server:2.5.1-RELEASE +docker run -p 8081:8081 spring-resource-server:2.5.2-RELEASE ``` ### Reference Documentation diff --git a/iam-examples/spring-resource-server/build.gradle b/iam-examples/spring-resource-server/build.gradle index 94632772..1d3d083a 100644 --- 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.2' + id 'org.springframework.boot' version '2.4.3' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } group = 'one.microproject.iamservice' -version = '2.5.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { diff --git a/iam-examples/spring-resource-server/start-service.sh b/iam-examples/spring-resource-server/start-service.sh index 28b39e12..a087f66d 100755 --- 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.1-RELEASE.jar +java -Xms32m -Xmx128M -jar /spring-resource-server-2.5.2-RELEASE.jar diff --git a/iam-examples/spring-webflux-secured/Dockerfile b/iam-examples/spring-webflux-secured/Dockerfile index 8a397eda..a6d00fe6 100644 --- 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.1-RELEASE.jar /spring-webflux-secured-2.5.1-RELEASE.jar +COPY build/libs/spring-webflux-secured-2.5.2-RELEASE.jar /spring-webflux-secured-2.5.2-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 index 5cc497b0..c17124ff 100644 --- 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.2' + id 'org.springframework.boot' version '2.4.3' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } group = 'one.microproject.iamservice' -version = '2.5.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { diff --git a/iam-examples/spring-webflux-secured/start-service.sh b/iam-examples/spring-webflux-secured/start-service.sh index 704ee619..af1e56d5 100755 --- 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.1-RELEASE.jar +java -Xms32m -Xmx128M -jar /spring-webflux-secured-2.5.2-RELEASE.jar diff --git a/iam-persistence/iam-caches-redis/build.gradle b/iam-persistence/iam-caches-redis/build.gradle index 7fa443bb..dba4408f 100644 --- a/iam-persistence/iam-caches-redis/build.gradle +++ b/iam-persistence/iam-caches-redis/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'one.microproject.iamservice' -version = '2.5.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { diff --git a/iam-persistence/iam-persistence-file-system/build.gradle b/iam-persistence/iam-persistence-file-system/build.gradle index 7fa443bb..dba4408f 100644 --- a/iam-persistence/iam-persistence-file-system/build.gradle +++ b/iam-persistence/iam-persistence-file-system/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'one.microproject.iamservice' -version = '2.5.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { diff --git a/iam-persistence/iam-persistence-mongo/build.gradle b/iam-persistence/iam-persistence-mongo/build.gradle index 7fa443bb..dba4408f 100644 --- a/iam-persistence/iam-persistence-mongo/build.gradle +++ b/iam-persistence/iam-persistence-mongo/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'one.microproject.iamservice' -version = '2.5.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { diff --git a/iam-service/Dockerfile b/iam-service/Dockerfile index aa273248..b610f0c8 100644 --- a/iam-service/Dockerfile +++ b/iam-service/Dockerfile @@ -2,7 +2,7 @@ # https://hub.docker.com/r/adoptopenjdk/openjdk11 FROM adoptopenjdk/openjdk11:alpine-jre -COPY build/libs/iam-service-2.5.1-RELEASE.jar /iam-service-2.5.1-RELEASE.jar +COPY build/libs/iam-service-2.5.2-RELEASE.jar /iam-service-2.5.2-RELEASE.jar COPY iam-service-start.sh /iam-service-start.sh COPY src/main/resources/application.yml /application.yml RUN chmod +x /iam-service-start.sh diff --git a/iam-service/README.md b/iam-service/README.md index d1dd9111..9e4f7b7d 100644 --- a/iam-service/README.md +++ b/iam-service/README.md @@ -4,40 +4,40 @@ IAM as microservice. Standalone OAuth2/OpenID-connect authorization and authenti ## Build and Run ``` gradle clean build -java -jar build/libs/iam-service-2.5.1-RELEASE.jar +java -jar build/libs/iam-service-2.5.2-RELEASE.jar # run using customized configutation -java -jar build/libs/iam-service-2.5.1-RELEASE.jar --spring.config.location=file:/path/to/application.yml +java -jar build/libs/iam-service-2.5.2-RELEASE.jar --spring.config.location=file:/path/to/application.yml ``` ### Build Docker Image ``` -docker build -t iam-service:2.5.1-RELEASE . +docker build -t iam-service:2.5.2-RELEASE . docker image list -docker save --output="build/iam-service:2.5.1-RELEASE.tar" iam-service:2.5.1-RELEASE +docker save --output="build/iam-service:2.5.2-RELEASE.tar" iam-service:2.5.2-RELEASE ``` ### Run Docker Container ``` -docker run -d --name iam-service-2.5.1-RELEASE \ +docker run -d --name iam-service-2.5.2-RELEASE \ -e SERVER_PORT=8080 \ -e ADMIN_PASSWORD=secret \ -e ADMIN_SECRET=top-secret \ -e XMX=128m \ - -p 8080:8080 iam-service:2.5.1-RELEASE + -p 8080:8080 iam-service:2.5.2-RELEASE -docker run -d --name iam-service-2.5.1-RELEASE \ +docker run -d --name iam-service-2.5.2-RELEASE \ -e APP_CONFIG_PATH=/opt/data/application.yml \ -e XMX=128m \ -v /custom/data/dir:/opt/data \ - -p 8080:8080 iam-service:2.5.1-RELEASE + -p 8080:8080 iam-service:2.5.2-RELEASE -docker attach iam-service-2.5.1-RELEASE -docker logs iam-service-2.5.1-RELEASE +docker attach iam-service-2.5.2-RELEASE +docker logs iam-service-2.5.2-RELEASE ``` ### Docker Cleanup ``` -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 +docker stop iam-service-2.5.2-RELEASE +docker rm iam-service-2.5.2-RELEASE +docker image rm -f iam-service:2.5.2-RELEASE ``` \ No newline at end of file diff --git a/iam-service/build.gradle b/iam-service/build.gradle index af34a70d..561359a0 100644 --- a/iam-service/build.gradle +++ b/iam-service/build.gradle @@ -1,11 +1,11 @@ plugins { - id 'org.springframework.boot' version '2.4.2' + id 'org.springframework.boot' version '2.4.3' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } group = 'one.microproject.iamservice' -version = '2.5.1-RELEASE' +version = '2.5.2-RELEASE' sourceCompatibility = '11' repositories { diff --git a/iam-service/iam-service-start.sh b/iam-service/iam-service-start.sh index 3c83007d..89c5193c 100644 --- a/iam-service/iam-service-start.sh +++ b/iam-service/iam-service-start.sh @@ -7,7 +7,7 @@ if [ "${APP_CONFIG_PATH}" = "false" ]; then echo "using default configuration" echo "SERVER_PORT=${SERVER_PORT}" echo "XMX=${XMX}" - java -Xms32m -Xmx${XMX} -Djava.security.egd=file:/dev/./urandom -jar /iam-service-2.5.1-RELEASE.jar \ + java -Xms32m -Xmx${XMX} -Djava.security.egd=file:/dev/./urandom -jar /iam-service-2.5.2-RELEASE.jar \ --server.port=${SERVER_PORT} \ --iam-service.data-model.default-admin-password=${ADMIN_PASSWORD} \ --iam-service.data-model.default-admin-secret=${ADMIN_SECRET} @@ -15,6 +15,6 @@ else echo "using custom configuration" echo "APP_CONFIG_PATH=${APP_CONFIG_PATH}" echo "XMX=${XMX}" - java -Xms32m -Xmx${XMX} -Djava.security.egd=file:/dev/./urandom -jar /iam-service-2.5.1-RELEASE.jar \ + java -Xms32m -Xmx${XMX} -Djava.security.egd=file:/dev/./urandom -jar /iam-service-2.5.2-RELEASE.jar \ --spring.config.location=file:${APP_CONFIG_PATH} fi diff --git a/release/Dockerfile.amd64 b/release/Dockerfile.amd64 index 7602c5ee..078410ca 100644 --- a/release/Dockerfile.amd64 +++ b/release/Dockerfile.amd64 @@ -2,7 +2,7 @@ # https://hub.docker.com/r/adoptopenjdk/openjdk11 FROM adoptopenjdk/openjdk11:alpine-jre -COPY iam-service-2.5.1-RELEASE.jar /iam-service-2.5.1-RELEASE.jar +COPY iam-service-2.5.2-RELEASE.jar /iam-service-2.5.2-RELEASE.jar COPY iam-service-start.sh /iam-service-start.sh COPY application-filesystem.yml /application.yml RUN chmod +x /iam-service-start.sh diff --git a/release/Dockerfile.arm32v7 b/release/Dockerfile.arm32v7 index bdd1f3e4..f73ae676 100644 --- a/release/Dockerfile.arm32v7 +++ b/release/Dockerfile.arm32v7 @@ -3,7 +3,7 @@ #https://hub.docker.com/r/arm32v7/adoptopenjdk FROM arm32v7/adoptopenjdk:11-jre-hotspot-focal -COPY iam-service-2.5.1-RELEASE.jar /iam-service-2.5.1-RELEASE.jar +COPY iam-service-2.5.2-RELEASE.jar /iam-service-2.5.2-RELEASE.jar COPY iam-service-start.sh /iam-service-start.sh COPY application-filesystem.yml /application.yml RUN chmod +x /iam-service-start.sh diff --git a/release/Dockerfile.arm64v8 b/release/Dockerfile.arm64v8 index b130a9af..47dc79d5 100644 --- a/release/Dockerfile.arm64v8 +++ b/release/Dockerfile.arm64v8 @@ -3,7 +3,7 @@ #https://hub.docker.com/r/arm64v8/adoptopenjdk FROM arm64v8/adoptopenjdk:11-jre-hotspot-focal -COPY iam-service-2.5.1-RELEASE.jar /iam-service-2.5.1-RELEASE.jar +COPY iam-service-2.5.2-RELEASE.jar /iam-service-2.5.2-RELEASE.jar COPY iam-service-start.sh /iam-service-start.sh COPY application-filesystem.yml /application.yml RUN chmod +x /iam-service-start.sh diff --git a/release/README-release.md b/release/README-release.md index 79988aef..7ca3f40c 100644 --- a/release/README-release.md +++ b/release/README-release.md @@ -1,6 +1,6 @@ -# IAM Service 2.5.1-RELEASE +# IAM Service 2.5.2-RELEASE Really simple standalone OAuth2/OIDC -[*Identity Access Management* (IAM) service](https://github.com/jveverka/iam-service/tree/2.5.1-RELEASE), +[*Identity Access Management* (IAM) service](https://github.com/jveverka/iam-service/tree/2.5.2-RELEASE), authentication and authorization server. ## Quick startup guide @@ -12,12 +12,12 @@ authentication and authorization server. ``` * Start __iam-service__ (Requires JVM installed). ``` - java -Xms32m -Xmx128m -jar iam-service-2.5.1-RELEASE.jar --spring.config.location=file:application.yml + java -Xms32m -Xmx128m -jar iam-service-2.5.2-RELEASE.jar --spring.config.location=file:application.yml ``` * Start __iam-service__ as docker container. ``` - docker run -d --name iam-service-2.5.1-RELEASE \ - -p 8080:8080 jurajveverka/iam-service:2.5.1-RELEASE-amd64 + docker run -d --name iam-service-2.5.2-RELEASE \ + -p 8080:8080 jurajveverka/iam-service:2.5.2-RELEASE-amd64 ``` ### Next Steps diff --git a/release/RELEASE-CHECKLIST.md b/release/RELEASE-CHECKLIST.md index 9ae5a983..9e2d8a4f 100644 --- a/release/RELEASE-CHECKLIST.md +++ b/release/RELEASE-CHECKLIST.md @@ -3,7 +3,7 @@ * Make sure all changes are committed and pushed. * Make sure the documentation is up-to date. * Make sure all tests are passing. -* ``NEW_RELEASE_VERSION=2.5.1-RELEASE`` +* ``NEW_RELEASE_VERSION=2.5.2-RELEASE`` * Upgrade component version in script below. ``` ./version-upgrade.sh @@ -44,8 +44,8 @@ ``` * Test created docker image. ``` - docker logs --follow iam-service-2.5.1-RELEASE - docker exec -it iam-service-2.5.1-RELEASE /bin/sh + docker logs --follow iam-service-2.5.2-RELEASE + docker exec -it iam-service-2.5.2-RELEASE /bin/sh ``` * Publish docker image to dockerhub. ``` diff --git a/release/RELEASE-NOTES.md b/release/RELEASE-NOTES.md index dba02e7a..b0921568 100644 --- a/release/RELEASE-NOTES.md +++ b/release/RELEASE-NOTES.md @@ -1,12 +1,12 @@ # IAM service - OAuth2 server -Simple standalone OAuth2/OIDC [*Identity Access Management* (IAM) service](https://github.com/jveverka/iam-service/tree/v2.5.1-RELEASE), authentication and authorization server. +Simple standalone OAuth2/OIDC [*Identity Access Management* (IAM) service](https://github.com/jveverka/iam-service/tree/v2.5.2-RELEASE), authentication and authorization server. ## Quick startup guide 1. Start OAuth2 server in default configuration [dockerhub project](https://hub.docker.com/r/jurajveverka/iam-service). ``` - docker run --name iam-service-2.5.1-RELEASE \ + docker run --name iam-service-2.5.2-RELEASE \ --restart unless-stopped \ - -d -p 8080:8080 jurajveverka/iam-service:2.5.1-RELEASE-amd64 + -d -p 8080:8080 jurajveverka/iam-service:2.5.2-RELEASE-amd64 curl 'http://localhost:8080/services/discovery' | json_pp curl 'http://localhost:8080/services/oauth2/iam-admins/iam-admins/.well-known/openid-configuration' | json_pp ``` @@ -15,6 +15,6 @@ Simple standalone OAuth2/OIDC [*Identity Access Management* (IAM) service](http http://localhost:8080/swagger-ui/index.html?url=/v3/api-docs#/ ``` ## Advanced configurations -1. Download release file ``iam-service-release-2.5.1-RELEASE.zip`` +1. Download release file ``iam-service-release-2.5.2-RELEASE.zip`` 2. Please check [__User's Guide__](https://github.com/jveverka/iam-service/tree/2.x.x/docs/IAM-user-manual) and [__Examples__](https://github.com/jveverka/iam-service/tree/2.x.x/iam-examples) for more details. diff --git a/release/create-release.sh b/release/create-release.sh index 27880fb8..28b095fc 100755 --- a/release/create-release.sh +++ b/release/create-release.sh @@ -7,7 +7,7 @@ cd .. ./run-full-test-suite.sh eval_result_exit $? "Build ${GREEN}OK${NOCOLOR}" "${RED}ERROR: build failed !${NOCOLOR}" -VERSION=2.5.1-RELEASE +VERSION=2.5.2-RELEASE RELEASE_DIR=build/iam-service-${VERSION} cd ${HOME_DIR} diff --git a/release/docker-create-image.sh b/release/docker-create-image.sh index 39ae546d..c7889187 100755 --- a/release/docker-create-image.sh +++ b/release/docker-create-image.sh @@ -4,7 +4,7 @@ NOCOLOR='\033[0m' RED='\033[0;31m' GREEN='\033[0;32m' -VERSION=2.5.1-RELEASE +VERSION=2.5.2-RELEASE DOCKER_IMAGE=jurajveverka/iam-service DOCKER_NAME=iam-service diff --git a/release/version-upgrade.sh b/release/version-upgrade.sh index 6443b842..7915cd06 100755 --- a/release/version-upgrade.sh +++ b/release/version-upgrade.sh @@ -1,7 +1,7 @@ #!/bin/bash -OLD_VERSION=2.5.0-RELEASE -NEW_VERSION=2.5.1-RELEASE +OLD_VERSION=2.5.1-RELEASE +NEW_VERSION=2.5.2-RELEASE cd ..