From d79e42b4fdb1a045b90e28a1ceb3f2093fc186e5 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 23 Jan 2025 16:52:52 -0500 Subject: [PATCH 1/4] chore: fix broken link for javadoc. (#1142) --- google-oauth-client-appengine/pom.xml | 2 +- google-oauth-client-java6/pom.xml | 2 +- google-oauth-client-jetty/pom.xml | 2 +- google-oauth-client-servlet/pom.xml | 2 +- google-oauth-client/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml index 24cb5e6a4..cda732087 100644 --- a/google-oauth-client-appengine/pom.xml +++ b/google-oauth-client-appengine/pom.xml @@ -31,7 +31,7 @@ https://download.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index ee7b35e00..f3bb99e1d 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -16,7 +16,7 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml index fb7e8563c..bca8bd220 100644 --- a/google-oauth-client-jetty/pom.xml +++ b/google-oauth-client-jetty/pom.xml @@ -18,7 +18,7 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index 91016ce17..623955b9a 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -17,7 +17,7 @@ https://download.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index 496786a5f..54a2e4cef 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -21,7 +21,7 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/pom.xml b/pom.xml index ab53aa2ec..988a31d4e 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ https://docs.oracle.com/javase/7/docs/api/ https://cloud.google.com/appengine/docs/java/javadoc - https://googleapis.dev/java/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ Google OAuth Client Library for Java ${project.version} com.google.api.services From 11a8fca5203bde8721915dd57fef0094015ca51e Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Jan 2025 08:25:44 -0500 Subject: [PATCH 2/4] deps: newer Maven plugin versions for Airlock (#1140) * deps: newer Maven plugin versions for Airlock * Newer Javadoc version * checkstyle to profile * checkstyle.xml fix * allowUndeclaredRTE was removed * scope => accessModifiers * project-info-reports:dependencies changed site to reports --- .github/workflows/ci.yaml | 2 + checkstyle.xml | 2 +- google-oauth-client-assembly/assembly.xml | 14 ++-- pom.xml | 78 ++++++++++++++------ samples/checkstyle.xml | 37 +++++----- samples/dailymotion-cmdline-sample/pom.xml | 50 +++++++++---- samples/keycloak-pkce-cmdline-sample/pom.xml | 50 +++++++++---- 7 files changed, 152 insertions(+), 81 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index eb3e74f0b..6ea8645a1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ jobs: units: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: @@ -22,6 +23,7 @@ jobs: dependencies: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: diff --git a/checkstyle.xml b/checkstyle.xml index d5bf01f43..3ef76fc88 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -67,7 +67,7 @@ page at http://checkstyle.sourceforge.net/config.html --> - + diff --git a/google-oauth-client-assembly/assembly.xml b/google-oauth-client-assembly/assembly.xml index b1d857cb7..e4e1699bc 100644 --- a/google-oauth-client-assembly/assembly.xml +++ b/google-oauth-client-assembly/assembly.xml @@ -64,38 +64,38 @@ - ../google-oauth-client/target/site/dependencies.html + ../google-oauth-client/target/reports/dependencies.html google-oauth-client-dependencies.html google-oauth-java-client/dependencies - ../google-oauth-client-appengine/target/site/dependencies.html + ../google-oauth-client-appengine/target/reports/dependencies.html google-oauth-client-appengine-dependencies.html google-oauth-java-client/dependencies - ../google-oauth-client-java6/target/site/dependencies.html + ../google-oauth-client-java6/target/reports/dependencies.html google-oauth-client-java6-dependencies.html google-oauth-java-client/dependencies - ../google-oauth-client-jetty/target/site/dependencies.html + ../google-oauth-client-jetty/target/reports/dependencies.html google-oauth-client-jetty-dependencies.html google-oauth-java-client/dependencies - ../google-oauth-client-servlet/target/site/dependencies.html + ../google-oauth-client-servlet/target/reports/dependencies.html google-oauth-client-servlet-dependencies.html google-oauth-java-client/dependencies - target/site/css + target/reports/css google-oauth-java-client/dependencies/css - target/site/images + target/reports/images google-oauth-java-client/dependencies/images diff --git a/pom.xml b/pom.xml index 988a31d4e..fc93d091f 100644 --- a/pom.xml +++ b/pom.xml @@ -225,7 +225,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.11.2 attach-javadocs @@ -234,6 +234,13 @@ + + + org.apache.maven.wagon + wagon-provider-api + 3.3.3 + + org.apache.maven.plugins @@ -257,7 +264,14 @@ maven-checkstyle-plugin - 3.0.0 + 3.6.0 + + + com.puppycrawl.tools + checkstyle + 10.21.1 + + org.codehaus.mojo @@ -272,17 +286,24 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.22 + 1.24 org.apache.maven.plugins maven-project-info-reports-plugin - 3.5.0 + 3.8.0 + + + org.sonatype.plexus + plexus-sec-dispatcher + 1.4 + + org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.21.1 org.apache.maven.plugins @@ -364,21 +385,6 @@ - - maven-checkstyle-plugin - - checkstyle.xml - true - checkstyle-suppressions.xml - - - - - check - - - - org.codehaus.mojo findbugs-maven-plugin @@ -441,6 +447,10 @@ package + + + ${mpir.skip} + com.coveo @@ -487,9 +497,36 @@ 5.2.1 2.5 false + false + + checkstyle + + + [11,) + + + + + maven-checkstyle-plugin + + checkstyle.xml + true + checkstyle-suppressions.xml + + + + + check + + + + + + + release-sign-artifacts @@ -542,7 +579,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 com.microsoft.doclet.DocFxDoclet false diff --git a/samples/checkstyle.xml b/samples/checkstyle.xml index 66cd0c954..0f200449f 100644 --- a/samples/checkstyle.xml +++ b/samples/checkstyle.xml @@ -84,14 +84,10 @@ page at http://checkstyle.sourceforge.net/config.html --> - + - - - - @@ -197,21 +193,6 @@ page at http://checkstyle.sourceforge.net/config.html --> --> - - - - - - - - - @@ -332,5 +313,21 @@ page at http://checkstyle.sourceforge.net/config.html --> + + + + + + + + + + diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml index 1638a919d..6bae78624 100644 --- a/samples/dailymotion-cmdline-sample/pom.xml +++ b/samples/dailymotion-cmdline-sample/pom.xml @@ -33,22 +33,6 @@ - - maven-checkstyle-plugin - 3.0.0 - - ../checkstyle.xml - true - false - - - - - check - - - - org.codehaus.mojo findbugs-maven-plugin @@ -102,6 +86,40 @@ UTF-8 + + checkstyle + + + [11,) + + + + + maven-checkstyle-plugin + 3.6.0 + + ../checkstyle.xml + true + false + + + + com.puppycrawl.tools + checkstyle + 10.21.1 + + + + + + check + + + + + + + diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml index 20b98a2cd..71f5a6b0c 100644 --- a/samples/keycloak-pkce-cmdline-sample/pom.xml +++ b/samples/keycloak-pkce-cmdline-sample/pom.xml @@ -33,22 +33,6 @@ - - maven-checkstyle-plugin - 3.0.0 - - ../checkstyle.xml - true - false - - - - - check - - - - org.codehaus.mojo findbugs-maven-plugin @@ -102,6 +86,40 @@ UTF-8 + + checkstyle + + + [11,) + + + + + maven-checkstyle-plugin + 3.6.0 + + ../checkstyle.xml + true + false + + + + com.puppycrawl.tools + checkstyle + 10.21.1 + + + + + + check + + + + + + + From 91d89470880bec3f83340890d455a3eb9c279d99 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 29 Jan 2025 22:18:35 -0500 Subject: [PATCH 3/4] chore: checkstyle profile "checkstyle-test" (#1144) This profile name matches java-shared-config https://github.com/googleapis/java-shared-config/blob/2322b789d9568a1cd8ce4efc04fa11d7ff51c178/java-shared-config/pom.xml#L505C11-L505C27 --- pom.xml | 2 +- samples/dailymotion-cmdline-sample/pom.xml | 2 +- samples/keycloak-pkce-cmdline-sample/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fc93d091f..6861b2294 100644 --- a/pom.xml +++ b/pom.xml @@ -502,7 +502,7 @@ - checkstyle + checkstyle-tests [11,) diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml index 6bae78624..43f0ba2e9 100644 --- a/samples/dailymotion-cmdline-sample/pom.xml +++ b/samples/dailymotion-cmdline-sample/pom.xml @@ -87,7 +87,7 @@ - checkstyle + checkstyle-tests [11,) diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml index 71f5a6b0c..b1e929eed 100644 --- a/samples/keycloak-pkce-cmdline-sample/pom.xml +++ b/samples/keycloak-pkce-cmdline-sample/pom.xml @@ -87,7 +87,7 @@ - checkstyle + checkstyle-tests [11,) From 314edf994123bb12f81a6868746958c875cb1f3d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 30 Jan 2025 18:44:17 +0000 Subject: [PATCH 4/4] chore(deps): update dependency com.coveo:fmt-maven-plugin to v2.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6861b2294..1c48d62cb 100644 --- a/pom.xml +++ b/pom.xml @@ -455,7 +455,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.13 true