From e0bb0279f5645f71c3d1e6dfdfe65ed29cca6302 Mon Sep 17 00:00:00 2001 From: Alexey Averikhin Date: Mon, 6 Nov 2023 06:25:28 +0100 Subject: [PATCH 1/5] Update dependencies and plugins --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b5be88ea..459eb65c 100644 --- a/pom.xml +++ b/pom.xml @@ -74,18 +74,18 @@ OVERRIDE_REPO_URL - 3.12.0 + 3.13.0 4.4 - 1.15 - 2.11.0 - 1.5.0 - 1.10.0 - 2.19.0 + 1.16.0 + 2.15.0 + 1.6.0 + 1.11.0 + 2.21.1 4.13.2 2.33 2.3.1 2.3.2 - 4.4.3 + 5.0.1 3.0.0 @@ -112,7 +112,7 @@ 4.6.0.0 3.16.0 1.3.0 - 1.13.0 + 2.0.1 From 01ac2f25d0eab953f331fa40cc7345d89251af4b Mon Sep 17 00:00:00 2001 From: "R.Brown" Date: Mon, 6 Nov 2023 06:56:23 +0100 Subject: [PATCH 2/5] Use java 17 for the CI pipeline --- .github/workflows/netlicesning-client-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/netlicesning-client-ci.yml b/.github/workflows/netlicesning-client-ci.yml index 23d0e9b1..aa98b93d 100644 --- a/.github/workflows/netlicesning-client-ci.yml +++ b/.github/workflows/netlicesning-client-ci.yml @@ -13,7 +13,7 @@ on: jobs: build: runs-on: [self-hosted] - container: maven:3.8.6-openjdk-11 + container: maven:3.8.6-openjdk-17 env: # This is needed, as java doesn't respect the environment variable $HOME, but gets the # user home by other means from the system. The default user in the above container is @@ -25,7 +25,7 @@ jobs: MAVEN_OPTS: -Duser.home=/github/home strategy: matrix: - java-version: [11] + java-version: [11, 17] steps: - uses: actions/checkout@v3 From defead02980bb219ddedb403bbc716201fe806da Mon Sep 17 00:00:00 2001 From: "R.Brown" Date: Mon, 6 Nov 2023 07:03:46 +0100 Subject: [PATCH 3/5] Update maven image to 17 --- .github/workflows/netlicesning-client-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/netlicesning-client-ci.yml b/.github/workflows/netlicesning-client-ci.yml index aa98b93d..71d7853d 100644 --- a/.github/workflows/netlicesning-client-ci.yml +++ b/.github/workflows/netlicesning-client-ci.yml @@ -13,7 +13,7 @@ on: jobs: build: runs-on: [self-hosted] - container: maven:3.8.6-openjdk-17 + container: maven:3-amazoncorretto-17 env: # This is needed, as java doesn't respect the environment variable $HOME, but gets the # user home by other means from the system. The default user in the above container is From 3716f21a408e4be7857a24dc60b646aac5a82403 Mon Sep 17 00:00:00 2001 From: "R.Brown" Date: Mon, 6 Nov 2023 07:07:25 +0100 Subject: [PATCH 4/5] Update java version to 17 --- .github/workflows/netlicesning-client-codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/netlicesning-client-codeql-analysis.yml b/.github/workflows/netlicesning-client-codeql-analysis.yml index 756cd25f..dcdea77f 100644 --- a/.github/workflows/netlicesning-client-codeql-analysis.yml +++ b/.github/workflows/netlicesning-client-codeql-analysis.yml @@ -25,7 +25,7 @@ jobs: analyze: name: Analyze runs-on: [self-hosted] - container: maven:3.8.6-openjdk-11 + container: maven:3-amazoncorretto-17 permissions: actions: read contents: read From 8d35b0405ce714573f96ada457492f3ea9c7800c Mon Sep 17 00:00:00 2001 From: "R.Brown" Date: Mon, 6 Nov 2023 07:07:53 +0100 Subject: [PATCH 5/5] Update java version to 17 --- .github/workflows/netlicensing-client-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/netlicensing-client-release.yml b/.github/workflows/netlicensing-client-release.yml index 4e1c4552..5a6596cb 100644 --- a/.github/workflows/netlicensing-client-release.yml +++ b/.github/workflows/netlicensing-client-release.yml @@ -13,7 +13,7 @@ jobs: release: name: Release ${{ github.event.inputs.release-version }} runs-on: self-hosted - container: maven:3.8.6-openjdk-11 + container: maven:3-amazoncorretto-17 steps: - uses: actions/checkout@v3