From 59d687f4cd4d58c6958b31d351b988887f01487e Mon Sep 17 00:00:00 2001 From: Tchoudomira Bakalova Date: Wed, 14 Aug 2024 12:41:46 +0300 Subject: [PATCH 1/4] Updating Java version to 21 LTS Signed-off-by: Tchoudomira Bakalova --- .github/workflows/build.yml | 2 +- common/artifact-manager/pom.xml | 10 +--------- common/o11n/project/pom.xml | 2 +- .../latest/General/Getting Started/Prerequisites.md | 2 +- .../Getting Started/Setting Up Local Environment.md | 2 +- maven/plugins/pom.xml | 8 -------- pom.xml | 4 ++-- 7 files changed, 7 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27584ef6a..0ea4fff46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - java: ["17"] + java: ["21"] maven: ["3.9.2"] node: ["16.20.2"] node_vmware_samples: ["14.17.1"] diff --git a/common/artifact-manager/pom.xml b/common/artifact-manager/pom.xml index 6e922847d..152029593 100644 --- a/common/artifact-manager/pom.xml +++ b/common/artifact-manager/pom.xml @@ -23,7 +23,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.12 prepare-agent @@ -44,14 +44,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 17 - 17 - - diff --git a/common/o11n/project/pom.xml b/common/o11n/project/pom.xml index a9816f102..7d78f4499 100644 --- a/common/o11n/project/pom.xml +++ b/common/o11n/project/pom.xml @@ -21,7 +21,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.12 prepare-agent diff --git a/docs/versions/latest/General/Getting Started/Prerequisites.md b/docs/versions/latest/General/Getting Started/Prerequisites.md index 937684dc4..47df0c184 100644 --- a/docs/versions/latest/General/Getting Started/Prerequisites.md +++ b/docs/versions/latest/General/Getting Started/Prerequisites.md @@ -17,7 +17,7 @@ Prerequisites for installation of Build Tools for VMware Aria. ### Prerequisites - [vRealize Developer Tools](https://github.com/vmware/vrealize-developer-tools) (Optional) -- Java 17 +- Java 21 - Maven 3.5+ ([official installation guide](https://maven.apache.org/install.html)) - NodeJS 16.x.x (use `nvm` if possible) [official downloads](https://nodejs.org/en/download/releases/) - Development vRealize Automation Tenant configured with development vRealize Orchestrator diff --git a/docs/versions/latest/General/Getting Started/Setting Up Local Environment.md b/docs/versions/latest/General/Getting Started/Setting Up Local Environment.md index 80a56069e..bf11c0780 100644 --- a/docs/versions/latest/General/Getting Started/Setting Up Local Environment.md +++ b/docs/versions/latest/General/Getting Started/Setting Up Local Environment.md @@ -30,7 +30,7 @@ Here you will learn the needed steps on how to configure your environment - Build Tools for VMware Aria Platform - [Build Tools for VMware Aria Platform](Setting%20Up%20Artifactory.md) ready to use - Workstation can access Build Tools for VMware Aria Platform services -- Java 17 +- Java 21 - Maven 3.5+ ([official installation guide](https://maven.apache.org/install.html)) ### Configuration diff --git a/maven/plugins/pom.xml b/maven/plugins/pom.xml index 8c1c399d4..fa84f6f4b 100644 --- a/maven/plugins/pom.xml +++ b/maven/plugins/pom.xml @@ -90,14 +90,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - org.jacoco jacoco-maven-plugin diff --git a/pom.xml b/pom.xml index 6ff7496eb..e99f76be4 100644 --- a/pom.xml +++ b/pom.xml @@ -154,8 +154,8 @@ maven-compiler-plugin 3.10.1 - 1.8 - 1.8 + 21 + 21 From 19aa11d5d7a3aa35fbd69bd832d59851af9333a9 Mon Sep 17 00:00:00 2001 From: Tchoudomira Bakalova Date: Wed, 14 Aug 2024 15:18:41 +0300 Subject: [PATCH 2/4] Updated jacoco-maven-plugin version to 0.8.12. Added maven compiler plugin configuration. Signed-off-by: Tchoudomira Bakalova --- common/artifact-manager/pom.xml | 8 ++++++++ maven/plugins/pom.xml | 2 +- package-installer/pom.xml | 2 +- pom.xml | 5 +++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/common/artifact-manager/pom.xml b/common/artifact-manager/pom.xml index 152029593..f25327f13 100644 --- a/common/artifact-manager/pom.xml +++ b/common/artifact-manager/pom.xml @@ -44,6 +44,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + diff --git a/maven/plugins/pom.xml b/maven/plugins/pom.xml index fa84f6f4b..c43561eec 100644 --- a/maven/plugins/pom.xml +++ b/maven/plugins/pom.xml @@ -93,7 +93,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.12 prepare-agent diff --git a/package-installer/pom.xml b/package-installer/pom.xml index c75f4dfe9..f8f68523c 100644 --- a/package-installer/pom.xml +++ b/package-installer/pom.xml @@ -88,7 +88,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.12 prepare-agent diff --git a/pom.xml b/pom.xml index e99f76be4..a76acdcd9 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ ${project.basedir} 2.41.1-SNAPSHOT + 21 @@ -154,8 +155,8 @@ maven-compiler-plugin 3.10.1 - 21 - 21 + ${java.version} + ${java.version} From 49bae218c7e431bdda85b16fb440e8127aa50bea Mon Sep 17 00:00:00 2001 From: Tchoudomira Bakalova Date: Wed, 14 Aug 2024 15:37:25 +0300 Subject: [PATCH 3/4] Updated Java version in github scanning workflows. Signed-off-by: Tchoudomira Bakalova --- .github/workflows/codeql-java.yml | 2 +- .github/workflows/super-linter.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-java.yml b/.github/workflows/codeql-java.yml index 62441eb7f..1a070eee7 100644 --- a/.github/workflows/codeql-java.yml +++ b/.github/workflows/codeql-java.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Maven Action uses: s4u/setup-maven-action@v1.7.0 with: - java-version: '17' + java-version: '21' java-distribution: 'temurin' maven-version: '3.9.2' diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index 591cb5646..d8f54b0ea 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Java Action uses: actions/setup-java@v3 with: - java-version: "17" + java-version: "21" distribution: "temurin" - name: Super-Linter From 46543b09248aabe473d9399d66aaf55f76de8afd Mon Sep 17 00:00:00 2001 From: Tchoudomira Bakalova Date: Thu, 15 Aug 2024 16:20:16 +0300 Subject: [PATCH 4/4] Reverted code to Java 17. Workflows with 17 and 21. Signed-off-by: Tchoudomira Bakalova --- .github/workflows/build.yml | 2 +- docs/versions/latest/General/Getting Started/Prerequisites.md | 2 +- .../General/Getting Started/Setting Up Local Environment.md | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ea4fff46..89ca0ae7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - java: ["21"] + java: ["17","21"] maven: ["3.9.2"] node: ["16.20.2"] node_vmware_samples: ["14.17.1"] diff --git a/docs/versions/latest/General/Getting Started/Prerequisites.md b/docs/versions/latest/General/Getting Started/Prerequisites.md index 47df0c184..937684dc4 100644 --- a/docs/versions/latest/General/Getting Started/Prerequisites.md +++ b/docs/versions/latest/General/Getting Started/Prerequisites.md @@ -17,7 +17,7 @@ Prerequisites for installation of Build Tools for VMware Aria. ### Prerequisites - [vRealize Developer Tools](https://github.com/vmware/vrealize-developer-tools) (Optional) -- Java 21 +- Java 17 - Maven 3.5+ ([official installation guide](https://maven.apache.org/install.html)) - NodeJS 16.x.x (use `nvm` if possible) [official downloads](https://nodejs.org/en/download/releases/) - Development vRealize Automation Tenant configured with development vRealize Orchestrator diff --git a/docs/versions/latest/General/Getting Started/Setting Up Local Environment.md b/docs/versions/latest/General/Getting Started/Setting Up Local Environment.md index bf11c0780..80a56069e 100644 --- a/docs/versions/latest/General/Getting Started/Setting Up Local Environment.md +++ b/docs/versions/latest/General/Getting Started/Setting Up Local Environment.md @@ -30,7 +30,7 @@ Here you will learn the needed steps on how to configure your environment - Build Tools for VMware Aria Platform - [Build Tools for VMware Aria Platform](Setting%20Up%20Artifactory.md) ready to use - Workstation can access Build Tools for VMware Aria Platform services -- Java 21 +- Java 17 - Maven 3.5+ ([official installation guide](https://maven.apache.org/install.html)) ### Configuration diff --git a/pom.xml b/pom.xml index a76acdcd9..5f7058f01 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ ${project.basedir} 2.41.1-SNAPSHOT - 21 + 17