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/.github/workflows/louhi-tag-release.yaml b/.github/workflows/louhi-tag-release.yaml new file mode 100644 index 000000000..2eb024e5e --- /dev/null +++ b/.github/workflows/louhi-tag-release.yaml @@ -0,0 +1,40 @@ +name: Louhi Release Tag + +on: + release: + types: [published] + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + permissions: + # Permission to create tag + # https://docs.github.com/en/rest/authentication/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-contents + contents: write + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Git + run: | + git config --local user.email "action@github.com" + git config --local user.name "Louhi Release Tag" + - name: Fetch all tags + run: git fetch --tags + - name: Create additional tags + shell: bash + env: + GH_TOKEN: ${{ github.token }} + run: | + SHA=$(git log -1 --format=format:%H) + PR_NUMBER=$(gh pr list --search "$SHA" --state merged --json number --jq '.[].number') + if [[ -z "${PR_NUMBER}" ]]; then + echo "Couldn't get pull request number for ${SHA}" + exit 1 + fi + echo "PR ${PR_NUMBER} for ${SHA}" + TAG_NAME="louhi-${PR_NUMBER}" + git tag $TAG_NAME + git push origin $TAG_NAME diff --git a/CHANGELOG.md b/CHANGELOG.md index c5ea4b3ab..f1e90108c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.38.0](https://github.com/googleapis/google-oauth-java-client/compare/v1.37.0...v1.38.0) (2025-02-14) + + +### Bug Fixes + +* Animal-sniffer and clirr to a profiles ([#1145](https://github.com/googleapis/google-oauth-java-client/issues/1145)) ([490bce7](https://github.com/googleapis/google-oauth-java-client/commit/490bce7d67bd6ea48ca01d50f0214b1698a2d816)) +* Javadoc fix in IdTokenVerifier ([#1134](https://github.com/googleapis/google-oauth-java-client/issues/1134)) ([9ff0f6b](https://github.com/googleapis/google-oauth-java-client/commit/9ff0f6bc57e4449f2877d3a3d5ac8e8adbc326e9)) + + +### Dependencies + +* Newer Maven plugin versions for Airlock ([#1140](https://github.com/googleapis/google-oauth-java-client/issues/1140)) ([11a8fca](https://github.com/googleapis/google-oauth-java-client/commit/11a8fca5203bde8721915dd57fef0094015ca51e)) + ## [1.37.0](https://github.com/googleapis/google-oauth-java-client/compare/v1.36.0...v1.37.0) (2024-12-11) 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-appengine/pom.xml b/google-oauth-client-appengine/pom.xml index ec8c2a820..8fa8914ea 100644 --- a/google-oauth-client-appengine/pom.xml +++ b/google-oauth-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 ../pom.xml google-oauth-client-appengine @@ -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} @@ -62,18 +62,6 @@ - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java17 - 1.0 - - - org.apache.felix maven-bundle-plugin 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/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml index 67c0665a7..ad02b32b6 100644 --- a/google-oauth-client-assembly/pom.xml +++ b/google-oauth-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 ../pom.xml com.google.oauth-client diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml index c960fa87c..7e396e35f 100644 --- a/google-oauth-client-bom/pom.xml +++ b/google-oauth-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.oauth-client google-oauth-client-bom - 1.37.0 + 1.38.0 pom Google OAuth Client Library for Java BOM @@ -63,43 +63,32 @@ com.google.oauth-client google-oauth-client - 1.37.0 + 1.38.0 com.google.oauth-client google-oauth-client-appengine - 1.37.0 + 1.38.0 com.google.oauth-client google-oauth-client-java6 - 1.37.0 + 1.38.0 com.google.oauth-client google-oauth-client-jetty - 1.37.0 + 1.38.0 com.google.oauth-client google-oauth-client-servlet - 1.37.0 + 1.38.0 - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - sonatype-nexus-staging - https://google.oss.sonatype.org/ - false - - maven-javadoc-plugin 3.4.1 @@ -134,6 +123,57 @@ + + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + sonatype-nexus-staging + https://google.oss.sonatype.org/ + false + + + + + + + + release-gcp-artifact-registry + + artifactregistry://please-define-artifact-registry-url-property + + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + release-sign-artifacts diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index 618a50583..925a82dd1 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 ../pom.xml google-oauth-client-java6 @@ -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} @@ -47,18 +47,6 @@ - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java17 - 1.0 - - - org.apache.felix maven-bundle-plugin diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml index f7a1eda7c..5b22ac456 100644 --- a/google-oauth-client-jetty/pom.xml +++ b/google-oauth-client-jetty/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 ../pom.xml google-oauth-client-jetty @@ -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} @@ -49,18 +49,6 @@ - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java17 - 1.0 - - - org.apache.felix maven-bundle-plugin diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index e1a24eb59..75be51b5f 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 ../pom.xml google-oauth-client-servlet @@ -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 6d4d4a570..e17fd7c2d 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 ../pom.xml google-oauth-client @@ -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/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java index 8e769fd72..979bfeb0e 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java @@ -103,7 +103,7 @@ * *

Note that {@link #verify(IdToken)} only implements a subset of the verification steps, mostly * just the MUST steps. Please read ID Token * Validation for the full list of verification steps. * * @since 1.16 diff --git a/pom.xml b/pom.xml index 82f9dc1e7..6e6c0ab2e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 pom Parent for the Google OAuth Client Library for Java Google OAuth Client Library for Java @@ -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,34 @@ 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 + maven-clean-plugin + 3.4.0 + + + org.apache.maven.plugins + maven-install-plugin + 3.1.3 @@ -290,7 +321,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.5.0 enforce-maven @@ -323,7 +354,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 @@ -354,21 +385,6 @@ - - maven-checkstyle-plugin - - checkstyle.xml - true - checkstyle-suppressions.xml - - - - - check - - - - org.codehaus.mojo findbugs-maven-plugin @@ -383,43 +399,6 @@ - - org.codehaus.mojo - clirr-maven-plugin - - 1.19.0 - ${basedir}/../clirr-ignored-differences.xml - true - - - - - check - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java17 - 1.0 - - - com.sun.net.httpserver.* - - - - - - check - - - - maven-project-info-reports-plugin @@ -431,10 +410,10 @@ package - - - org.sonatype.plugins - nexus-staging-maven-plugin + + + ${mpir.skip} + com.coveo @@ -481,9 +460,36 @@ 5.2.1 2.5 false + false + + checkstyle-tests + + + [11,) + + + + + maven-checkstyle-plugin + + checkstyle.xml + true + checkstyle-suppressions.xml + + + + + check + + + + + + + release-sign-artifacts @@ -497,7 +503,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.7 sign-artifacts @@ -517,7 +523,6 @@ - docFX @@ -537,7 +542,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 com.microsoft.doclet.DocFxDoclet false @@ -578,5 +582,114 @@ + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + + + release-gcp-artifact-registry + + artifactregistry://please-define-artifact-registry-url-property + + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + + + clirr-compatibility-check + + + + [1.8,) + + + + + org.codehaus.mojo + clirr-maven-plugin + + 1.19.0 + ${basedir}/../clirr-ignored-differences.xml + true + + + + + check + + + + + + + + + animal-sniffer + + + [1.8,) + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + org.codehaus.mojo.signature + + java17 + 1.0 + + + com.sun.net.httpserver.* + + + + + + check + + + + + + + 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 e1bb58304..ca377a3b9 100644 --- a/samples/dailymotion-cmdline-sample/pom.xml +++ b/samples/dailymotion-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 ../../pom.xml dailymotion-simple-cmdline-sample @@ -33,22 +33,6 @@ - - maven-checkstyle-plugin - 3.0.0 - - ../checkstyle.xml - true - false - - - - - check - - - - org.codehaus.mojo findbugs-maven-plugin @@ -73,14 +57,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - true - - ${project.artifactId}-${project.version} @@ -109,4 +85,65 @@ UTF-8 + + + checkstyle-tests + + + [11,) + + + + + maven-checkstyle-plugin + 3.6.0 + + ../checkstyle.xml + true + false + + + + com.puppycrawl.tools + checkstyle + 10.21.1 + + + + + + check + + + + + + + + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + + true + + + + + + diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml index 983ca6229..2308b530a 100644 --- a/samples/keycloak-pkce-cmdline-sample/pom.xml +++ b/samples/keycloak-pkce-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.37.0 + 1.38.0 ../../pom.xml keycloak-pkce-cmdline-sample @@ -33,22 +33,6 @@ - - maven-checkstyle-plugin - 3.0.0 - - ../checkstyle.xml - true - false - - - - - check - - - - org.codehaus.mojo findbugs-maven-plugin @@ -73,14 +57,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - true - - ${project.artifactId}-${project.version} @@ -109,4 +85,65 @@ UTF-8 + + + checkstyle-tests + + + [11,) + + + + + maven-checkstyle-plugin + 3.6.0 + + ../checkstyle.xml + true + false + + + + com.puppycrawl.tools + checkstyle + 10.21.1 + + + + + + check + + + + + + + + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + + true + + + + + + diff --git a/samples/pom.xml b/samples/pom.xml index 820a81719..92dc53626 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -43,14 +43,33 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - true - - + + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + + true + + + + + + diff --git a/versions.txt b/versions.txt index 7bbc36cba..057190025 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-oauth-client:1.37.0:1.37.0 +google-oauth-client:1.38.0:1.38.0