From 13fb26156154cae269531431b6a6f44c3c630b96 Mon Sep 17 00:00:00 2001 From: pmm Date: Fri, 4 Oct 2024 11:59:01 +0530 Subject: [PATCH 01/10] [APPS-3060] Updated to Jdk-21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db1c67c9..e40ddd72 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ alfresco-java-sdk 2021 UTF-8 - 17 + 21 ${java.version} ${java.version} ${java.version} From 61f6e69cf1272e58749166b42b4460f6d3334e18 Mon Sep 17 00:00:00 2001 From: pmm Date: Fri, 4 Oct 2024 12:01:56 +0530 Subject: [PATCH 02/10] [APPS-3060] Updated to Jdk-21 --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3a130811..48e21fe8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,4 +15,4 @@ updates: interval: "daily" ignore: - dependency-name: "amazoncorretto" - versions: [">17"] + versions: [">21"] From e199fb91cbe8d62e9c93b152f044fcf386307a92 Mon Sep 17 00:00:00 2001 From: pmm Date: Fri, 4 Oct 2024 12:09:54 +0530 Subject: [PATCH 03/10] [APPS-3060] Updated the docker files --- samples/event-api-handlers/Dockerfile | 2 +- samples/event-api-handlers/README.md | 8 ++++---- samples/event-api-spring-integration/Dockerfile | 2 +- samples/event-api-spring-integration/README.md | 8 ++++---- samples/extension-template/Dockerfile | 2 +- samples/extension-template/README.md | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/samples/event-api-handlers/Dockerfile b/samples/event-api-handlers/Dockerfile index 69e66934..cf4e690c 100644 --- a/samples/event-api-handlers/Dockerfile +++ b/samples/event-api-handlers/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:17-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 +FROM amazoncorretto:21-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar diff --git a/samples/event-api-handlers/README.md b/samples/event-api-handlers/README.md index f2750f2e..9b4bab06 100644 --- a/samples/event-api-handlers/README.md +++ b/samples/event-api-handlers/README.md @@ -12,13 +12,13 @@ that log information about the handled events. To properly build and run the project in a local environment it is required to have installed some tools. -* Java 17: +* Java 21: ```bash $ java -version -openjdk version "17.0.4" 2022-07-19 LTS -OpenJDK Runtime Environment (build 17.0.4+8-LTS) -OpenJDK 64-Bit Server VM (build 17.0.4+8-LTS, mixed mode, sharing) +openjdk version "21.0.3" 2024-04-16 LTS +OpenJDK Runtime Environment (build 21.0.3+7-LTS-152) +OpenJDK 64-Bit Server VM (build 21.0.3+7-LTS-152, mixed mode, sharing) ``` diff --git a/samples/event-api-spring-integration/Dockerfile b/samples/event-api-spring-integration/Dockerfile index 69e66934..cf4e690c 100644 --- a/samples/event-api-spring-integration/Dockerfile +++ b/samples/event-api-spring-integration/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:17-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 +FROM amazoncorretto:21-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar diff --git a/samples/event-api-spring-integration/README.md b/samples/event-api-spring-integration/README.md index b6e7c01c..65a14dbf 100644 --- a/samples/event-api-spring-integration/README.md +++ b/samples/event-api-spring-integration/README.md @@ -11,13 +11,13 @@ to define sample Spring Integration flows that log information about specific ha To properly build and run the project in a local environment it is required to have installed some tools. -* Java 17: +* Java 21: ```bash $ java -version -openjdk version "17.0.4" 2022-07-19 LTS -OpenJDK Runtime Environment (build 17.0.4+8-LTS) -OpenJDK 64-Bit Server VM (build 17.0.4+8-LTS, mixed mode, sharing) +openjdk version "21.0.3" 2024-04-16 LTS +OpenJDK Runtime Environment (build 21.0.3+7-LTS-152) +OpenJDK 64-Bit Server VM (build 21.0.3+7-LTS-152, mixed mode, sharing) ``` diff --git a/samples/extension-template/Dockerfile b/samples/extension-template/Dockerfile index 69e66934..cf4e690c 100644 --- a/samples/extension-template/Dockerfile +++ b/samples/extension-template/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:17-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 +FROM amazoncorretto:21-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar diff --git a/samples/extension-template/README.md b/samples/extension-template/README.md index 5b319b77..16302226 100644 --- a/samples/extension-template/README.md +++ b/samples/extension-template/README.md @@ -14,13 +14,13 @@ to define a sample [```EventHandler```](../../alfresco-java-event-api/alfresco-j To properly build and run the project in a local environment it is required to have installed some tools. -* Java 17: +* Java 21: ```bash $ java -version -openjdk version "17.0.4" 2022-07-19 LTS -OpenJDK Runtime Environment (build 17.0.4+8-LTS) -OpenJDK 64-Bit Server VM (build 17.0.4+8-LTS, mixed mode, sharing) +openjdk version "21.0.3" 2024-04-16 LTS +OpenJDK Runtime Environment (build 21.0.3+7-LTS-152) +OpenJDK 64-Bit Server VM (build 21.0.3+7-LTS-152, mixed mode, sharing) ``` * [Maven](https://maven.apache.org/install.html) version 3.3 or higher: From 3aa6aa281259d67dacb61e8ba7d6764dcacf5311 Mon Sep 17 00:00:00 2001 From: omkaryadv177 <97588463+omkaryadv177@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:34:37 +0530 Subject: [PATCH 04/10] update java version to 21 --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04b77b60..e943dc60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,6 +75,8 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + with: + java-version: '21' - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: mvn install $MAVEN_CLI_OPTS -DskipTests=true -Dmaven.javadoc.skip=true From 217abebf4868b829e4776305e5dc184ed1b44f3b Mon Sep 17 00:00:00 2001 From: omkaryadv177 <97588463+omkaryadv177@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:36:13 +0530 Subject: [PATCH 05/10] updated java version to 21 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e943dc60..269fa29d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - with: + with: java-version: '21' - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} From bbeff0296aed6a16a67f6364d7b99c5d6c8898c8 Mon Sep 17 00:00:00 2001 From: omkaryadv177 <97588463+omkaryadv177@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:02:29 +0530 Subject: [PATCH 06/10] updated java version to 21 --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 269fa29d..6cdca40e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,6 +54,8 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + with: + java-version: '21' - name: "Clean-up SNAPSHOT artifacts" run: find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0 @@ -98,6 +100,8 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + with: + java-version: '21' - name: "Init" run: bash ./scripts/ci/init.sh - name: "Release" @@ -124,6 +128,8 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + with: + java-version: '21' - name: "Publish artifacts" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: mvn deploy $MAVEN_CLI_OPTS -DskipTests=true From cff337c241ae4eed07ddff5152801155a4d4154b Mon Sep 17 00:00:00 2001 From: pmm Date: Mon, 7 Oct 2024 12:59:26 +0530 Subject: [PATCH 07/10] [APPS-3060] Updated the build and verify tag --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cdca40e..e3c77a73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,8 +77,6 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - with: - java-version: '21' - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: mvn install $MAVEN_CLI_OPTS -DskipTests=true -Dmaven.javadoc.skip=true From 89698c6bc9b6f580395c1fdf19cc8d7077c10598 Mon Sep 17 00:00:00 2001 From: pmm Date: Mon, 7 Oct 2024 13:02:43 +0530 Subject: [PATCH 08/10] [APPS-3060] Updated the build and verify tag --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3c77a73..6cdca40e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,8 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + with: + java-version: '21' - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: mvn install $MAVEN_CLI_OPTS -DskipTests=true -Dmaven.javadoc.skip=true From 4e583e3b397d8b1fd69dbe2596a6b118f35903f9 Mon Sep 17 00:00:00 2001 From: pmm Date: Tue, 8 Oct 2024 12:36:40 +0530 Subject: [PATCH 09/10] [APPS-3060] Updated the readme file --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24b62afb..82fdafdb 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ contains a `docker-compose` file and scripts that allows you to build and run th ### Pre-Requisites -* Java version 17 or higher +* Java version 21 or higher * Spring boot 3.1 or higher * Maven version 3.3 or higher @@ -311,7 +311,7 @@ More Information: [Configuring Alfresco Event Gateway](https://www.github.com/Al ### Pre-Requisites -* Java version 17 or higher +* Java version 21 or higher * Maven version 3.3 or higher ### Build command From 639d20ed2b314ffc7a3cdc8fdd8ed53c02bb24e2 Mon Sep 17 00:00:00 2001 From: pmm Date: Tue, 22 Oct 2024 10:59:00 +0530 Subject: [PATCH 10/10] [APPS-3060] Rollback JDK 21 to 17 --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 8 -------- README.md | 4 ++-- pom.xml | 2 +- samples/event-api-handlers/Dockerfile | 2 +- samples/event-api-handlers/README.md | 8 ++++---- samples/event-api-spring-integration/Dockerfile | 2 +- samples/event-api-spring-integration/README.md | 8 ++++---- samples/extension-template/Dockerfile | 2 +- samples/extension-template/README.md | 8 ++++---- 10 files changed, 19 insertions(+), 27 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 48e21fe8..3a130811 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,4 +15,4 @@ updates: interval: "daily" ignore: - dependency-name: "amazoncorretto" - versions: [">21"] + versions: [">17"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cdca40e..04b77b60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,8 +54,6 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - with: - java-version: '21' - name: "Clean-up SNAPSHOT artifacts" run: find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0 @@ -77,8 +75,6 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - with: - java-version: '21' - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: mvn install $MAVEN_CLI_OPTS -DskipTests=true -Dmaven.javadoc.skip=true @@ -100,8 +96,6 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - with: - java-version: '21' - name: "Init" run: bash ./scripts/ci/init.sh - name: "Release" @@ -128,8 +122,6 @@ jobs: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - with: - java-version: '21' - name: "Publish artifacts" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: mvn deploy $MAVEN_CLI_OPTS -DskipTests=true diff --git a/README.md b/README.md index 82fdafdb..24b62afb 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ contains a `docker-compose` file and scripts that allows you to build and run th ### Pre-Requisites -* Java version 21 or higher +* Java version 17 or higher * Spring boot 3.1 or higher * Maven version 3.3 or higher @@ -311,7 +311,7 @@ More Information: [Configuring Alfresco Event Gateway](https://www.github.com/Al ### Pre-Requisites -* Java version 21 or higher +* Java version 17 or higher * Maven version 3.3 or higher ### Build command diff --git a/pom.xml b/pom.xml index e40ddd72..db1c67c9 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ alfresco-java-sdk 2021 UTF-8 - 21 + 17 ${java.version} ${java.version} ${java.version} diff --git a/samples/event-api-handlers/Dockerfile b/samples/event-api-handlers/Dockerfile index cf4e690c..69e66934 100644 --- a/samples/event-api-handlers/Dockerfile +++ b/samples/event-api-handlers/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:21-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 +FROM amazoncorretto:17-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar diff --git a/samples/event-api-handlers/README.md b/samples/event-api-handlers/README.md index 9b4bab06..f2750f2e 100644 --- a/samples/event-api-handlers/README.md +++ b/samples/event-api-handlers/README.md @@ -12,13 +12,13 @@ that log information about the handled events. To properly build and run the project in a local environment it is required to have installed some tools. -* Java 21: +* Java 17: ```bash $ java -version -openjdk version "21.0.3" 2024-04-16 LTS -OpenJDK Runtime Environment (build 21.0.3+7-LTS-152) -OpenJDK 64-Bit Server VM (build 21.0.3+7-LTS-152, mixed mode, sharing) +openjdk version "17.0.4" 2022-07-19 LTS +OpenJDK Runtime Environment (build 17.0.4+8-LTS) +OpenJDK 64-Bit Server VM (build 17.0.4+8-LTS, mixed mode, sharing) ``` diff --git a/samples/event-api-spring-integration/Dockerfile b/samples/event-api-spring-integration/Dockerfile index cf4e690c..69e66934 100644 --- a/samples/event-api-spring-integration/Dockerfile +++ b/samples/event-api-spring-integration/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:21-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 +FROM amazoncorretto:17-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar diff --git a/samples/event-api-spring-integration/README.md b/samples/event-api-spring-integration/README.md index 65a14dbf..b6e7c01c 100644 --- a/samples/event-api-spring-integration/README.md +++ b/samples/event-api-spring-integration/README.md @@ -11,13 +11,13 @@ to define sample Spring Integration flows that log information about specific ha To properly build and run the project in a local environment it is required to have installed some tools. -* Java 21: +* Java 17: ```bash $ java -version -openjdk version "21.0.3" 2024-04-16 LTS -OpenJDK Runtime Environment (build 21.0.3+7-LTS-152) -OpenJDK 64-Bit Server VM (build 21.0.3+7-LTS-152, mixed mode, sharing) +openjdk version "17.0.4" 2022-07-19 LTS +OpenJDK Runtime Environment (build 17.0.4+8-LTS) +OpenJDK 64-Bit Server VM (build 17.0.4+8-LTS, mixed mode, sharing) ``` diff --git a/samples/extension-template/Dockerfile b/samples/extension-template/Dockerfile index cf4e690c..69e66934 100644 --- a/samples/extension-template/Dockerfile +++ b/samples/extension-template/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:21-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 +FROM amazoncorretto:17-alpine3.18@sha256:6a3dc573328ced158ae25ffde792accbe8b1ff2e7b505c72d2d5e7b9bfa9ac26 ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar diff --git a/samples/extension-template/README.md b/samples/extension-template/README.md index 16302226..5b319b77 100644 --- a/samples/extension-template/README.md +++ b/samples/extension-template/README.md @@ -14,13 +14,13 @@ to define a sample [```EventHandler```](../../alfresco-java-event-api/alfresco-j To properly build and run the project in a local environment it is required to have installed some tools. -* Java 21: +* Java 17: ```bash $ java -version -openjdk version "21.0.3" 2024-04-16 LTS -OpenJDK Runtime Environment (build 21.0.3+7-LTS-152) -OpenJDK 64-Bit Server VM (build 21.0.3+7-LTS-152, mixed mode, sharing) +openjdk version "17.0.4" 2022-07-19 LTS +OpenJDK Runtime Environment (build 17.0.4+8-LTS) +OpenJDK 64-Bit Server VM (build 17.0.4+8-LTS, mixed mode, sharing) ``` * [Maven](https://maven.apache.org/install.html) version 3.3 or higher: