diff --git a/.github/release-please.yml b/.github/release-please.yml index f8b09b12e..a2f4b464a 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -6,3 +6,7 @@ branches: handleGHRelease: true releaseType: java-lts branch: 0.25.2-sp + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + branch: java7 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 30a074f33..e26624dbb 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -10,7 +10,6 @@ branchProtectionRules: - linkage-monitor - lint - clirr - - units (7) - units (8) - units (11) - cla/google @@ -32,6 +31,20 @@ branchProtectionRules: requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true requiresStrictStatusChecks: true + - pattern: java7 + isAdminEnforced: true + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (8) + - units (11) + - cla/google + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: true permissionRules: - team: Googlers permission: pull diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0195b32f0..65ae6ecdd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [7, 8, 11] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh index 5cf7ba49e..46edbf7f2 100755 --- a/.kokoro/coerce_logs.sh +++ b/.kokoro/coerce_logs.sh @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME}) echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do - echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 59d2aafc7..9030ba8f9 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +shopt -s nullglob ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) @@ -46,7 +47,7 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." @@ -70,7 +71,7 @@ function completenessCheck() { set +e error_count=0 -for path in $(find -name ".flattened-pom.xml") +for path in **/.flattened-pom.xml do # Check flattened pom in each dir that contains it for completeness dir=$(dirname "$path") diff --git a/.repo-metadata.json b/.repo-metadata.json index c43968610..dc3c5f3c0 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -2,7 +2,7 @@ "name": "google-auth-library", "name_pretty": "Google Auth Library", "client_documentation": "https://googleapis.dev/java/google-auth-library/latest/", - "release_level": "beta", + "release_level": "ga", "language": "java", "repo": "googleapis/google-auth-library-java", "repo_short": "google-auth-library-java", diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ca79bcea..4ac7502ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## [1.0.0](https://www.github.com/googleapis/google-auth-library-java/compare/v0.27.0...v1.0.0) (2021-07-28) + + +### ⚠ BREAKING CHANGES + +* updating google-auth-library-java min Java version to 1.8 + +### Features + +* GA release of google-auth-library-java (ver 1.0.0) ([#704](https://www.github.com/googleapis/google-auth-library-java/issues/704)) ([3d9874f](https://www.github.com/googleapis/google-auth-library-java/commit/3d9874f1c91dfa10d6f72d41e922b3f1ec654943)) +* updating google-auth-library-java min Java version to 1.8 ([3d9874f](https://www.github.com/googleapis/google-auth-library-java/commit/3d9874f1c91dfa10d6f72d41e922b3f1ec654943)) + + +### Bug Fixes + +* Add shopt -s nullglob to dependencies script ([#693](https://www.github.com/googleapis/google-auth-library-java/issues/693)) ([c5aa708](https://www.github.com/googleapis/google-auth-library-java/commit/c5aa7084d9ca817a53cf6bac14d442adeeaeb310)) +* Update dependencies.sh to not break on mac ([c5aa708](https://www.github.com/googleapis/google-auth-library-java/commit/c5aa7084d9ca817a53cf6bac14d442adeeaeb310)) + ## [0.27.0](https://www.github.com/googleapis/google-auth-library-java/compare/v0.26.0...v0.27.0) (2021-07-14) diff --git a/README.md b/README.md index b390b1278..f86b20937 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ If you are using Maven, add this to your pom.xml file (notice that you can repla com.google.auth google-auth-library-oauth2-http - 0.27.0 + 1.0.0 ``` [//]: # ({x-version-update-end}) @@ -41,7 +41,7 @@ If you are using Gradle, add this to your dependencies [//]: # ({x-version-update-start:google-auth-library-oauth2-http:released}) ```Groovy -compile 'com.google.auth:google-auth-library-oauth2-http:0.27.0' +compile 'com.google.auth:google-auth-library-oauth2-http:1.0.0' ``` [//]: # ({x-version-update-end}) @@ -49,7 +49,7 @@ If you are using SBT, add this to your dependencies [//]: # ({x-version-update-start:google-auth-library-oauth2-http:released}) ```Scala -libraryDependencies += "com.google.auth" % "google-auth-library-oauth2-http" % "0.27.0" +libraryDependencies += "com.google.auth" % "google-auth-library-oauth2-http" % "1.0.0" ``` [//]: # ({x-version-update-end}) diff --git a/appengine/pom.xml b/appengine/pom.xml index 5ad4250f0..ae0d27c56 100644 --- a/appengine/pom.xml +++ b/appengine/pom.xml @@ -5,7 +5,7 @@ com.google.auth google-auth-library-parent - 0.27.0 + 1.0.0 ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index e04d3eb42..4f0d0e1fe 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.auth google-auth-library-bom - 0.27.0 + 1.0.0 pom Google Auth Library for Java BOM @@ -83,7 +83,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 true diff --git a/credentials/pom.xml b/credentials/pom.xml index 01600d71f..2f4e78ce7 100644 --- a/credentials/pom.xml +++ b/credentials/pom.xml @@ -4,7 +4,7 @@ com.google.auth google-auth-library-parent - 0.27.0 + 1.0.0 ../pom.xml diff --git a/oauth2_http/pom.xml b/oauth2_http/pom.xml index 935685d64..bc91a351e 100644 --- a/oauth2_http/pom.xml +++ b/oauth2_http/pom.xml @@ -5,7 +5,7 @@ com.google.auth google-auth-library-parent - 0.27.0 + 1.0.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 4f6b4962d..f7f219a5d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.auth google-auth-library-parent - 0.27.0 + 1.0.0 pom Google Auth Library for Java Client libraries providing authentication and @@ -62,11 +62,11 @@ 1.39.2 4.13.2 30.1.1-android - 1.9.89 + 1.9.90 3.0.2 false - 1.8.1 - 1.8.1 + 1.8.2 + 1.8.2 @@ -165,7 +165,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 7 @@ -231,8 +231,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 -Xlint:unchecked @@ -325,7 +325,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 html @@ -392,7 +392,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 attach-javadocs @@ -425,44 +425,6 @@ - - autovalue-java7 - - 1.7 - - ${basedir}/EnableAutoValue.txt - - - - - 1.4 - - - - - maven-compiler-plugin - - - - com.google.auto.value - auto-value - ${auto-value.version} - - - - - - - - autovalue-java8 @@ -520,7 +482,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 docFX diff --git a/synth.metadata b/synth.metadata index e5f5c3cd4..6fc9f18aa 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-auth-library-java.git", - "sha": "318281bba4aef9edd7500ea01a789a1581618cb8" + "sha": "dfe118c261aadf137a3cf47a7acb9892c7a6db4d" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "87254ac89a9559864c0a245d6b150406439ce3d8" } } ], @@ -77,6 +77,7 @@ ".kokoro/trampoline.sh", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", + "SECURITY.md", "codecov.yaml" ] } \ No newline at end of file diff --git a/versions.txt b/versions.txt index 7aef575ee..40665000c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-auth-library:0.27.0:0.27.0 -google-auth-library-bom:0.27.0:0.27.0 -google-auth-library-parent:0.27.0:0.27.0 -google-auth-library-appengine:0.27.0:0.27.0 -google-auth-library-credentials:0.27.0:0.27.0 -google-auth-library-oauth2-http:0.27.0:0.27.0 +google-auth-library:1.0.0:1.0.0 +google-auth-library-bom:1.0.0:1.0.0 +google-auth-library-parent:1.0.0:1.0.0 +google-auth-library-appengine:1.0.0:1.0.0 +google-auth-library-credentials:1.0.0:1.0.0 +google-auth-library-oauth2-http:1.0.0:1.0.0