From dadd2fce5ba7dad428c5140a475c8aca911a1316 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:28:53 -0500 Subject: [PATCH 01/11] chore: Update ci.yaml for Java 21 unit testing --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6204a9e11..7e8a2ee31 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11, 17] + java: [8, 11, 17, 21] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 From a526bf44878f282329b62e10c14fabeb2c6d0fbb Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Tue, 5 Dec 2023 16:37:56 -0500 Subject: [PATCH 02/11] chore: Updating Maven compiler plugin configuration to use a Java version of 8 or later --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 12cc7b298..1dba5fdcf 100644 --- a/pom.xml +++ b/pom.xml @@ -200,8 +200,8 @@ maven-compiler-plugin 2.5.1 - 1.7 - 1.7 + 1.8 + 1.8 From d6700e2ab52f973383124babeddaf993b379c274 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Tue, 5 Dec 2023 16:44:21 -0500 Subject: [PATCH 03/11] revert changes --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1dba5fdcf..12cc7b298 100644 --- a/pom.xml +++ b/pom.xml @@ -200,8 +200,8 @@ maven-compiler-plugin 2.5.1 - 1.8 - 1.8 + 1.7 + 1.7 From 37b53c02fc5710f0912733538f7a138636b402c7 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Tue, 5 Dec 2023 16:51:25 -0500 Subject: [PATCH 04/11] chore: update the maven bundle version to 1.8 --- google-oauth-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index bbcc4ea11..b84eefe56 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -59,7 +59,7 @@ com.google.oauth-client - JavaSE-1.7 + JavaSE-1.8 From fe4a656b5e357610737980e61362da06bd23c9b8 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Tue, 5 Dec 2023 17:05:09 -0500 Subject: [PATCH 05/11] Update pom.xml --- google-oauth-client/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index b84eefe56..b71798f99 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -41,6 +41,15 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + maven-source-plugin From 448222ae4e815a9de38304e31a3238c0ee3589d9 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Tue, 5 Dec 2023 17:15:46 -0500 Subject: [PATCH 06/11] Update pom.xml --- google-oauth-client-java6/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index ac671f169..3e9b63028 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -36,6 +36,15 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + maven-source-plugin From 7e1d2ff66348e807e1b31ef42c09328b42be4d66 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Tue, 5 Dec 2023 17:19:51 -0500 Subject: [PATCH 07/11] Update pom.xml --- google-oauth-client-servlet/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index 12ca9e04b..67ce9df05 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -37,6 +37,14 @@ + + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + maven-source-plugin From 2af88619f5a344f6ccb5bbff20edfbf67593d846 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:02:41 -0500 Subject: [PATCH 08/11] Update pom.xml --- google-oauth-client/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index b71798f99..b84eefe56 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -41,15 +41,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - maven-source-plugin From a011a24374014c14bb67dc5f51ab0cec2e36bf1e Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:03:28 -0500 Subject: [PATCH 09/11] Update pom.xml --- google-oauth-client-servlet/pom.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index 67ce9df05..e7535ee4c 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -37,14 +37,6 @@ - - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - maven-source-plugin @@ -100,7 +92,7 @@ com.google.oauth-client-servlet - JavaSE-1.7 + JavaSE-1.8 From edaf463c93d3923150b05db2bd4d1167f9db4784 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:04:05 -0500 Subject: [PATCH 10/11] Update pom.xml --- google-oauth-client-java6/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index 3e9b63028..8cb18a949 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -75,7 +75,7 @@ com.google.oauth-client-java6 - JavaSE-1.7 + JavaSE-1.8 From c3491c0f5f8bcc460a78e5edcbe7166002ae53dd Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:04:57 -0500 Subject: [PATCH 11/11] Update pom.xml --- google-oauth-client-java6/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index 8cb18a949..68b8de654 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -36,15 +36,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - maven-source-plugin