diff --git a/.github/release-please.yml b/.github/release-please.yml index e62668eef..3497d88b7 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -22,3 +22,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.2.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.7.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index c58a38000..9bf331a37 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -87,6 +87,20 @@ branchProtectionRules: - lint - clirr - cla/google + - pattern: 2.7.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - units (8) + - units (11) + - windows + - dependencies (8) + - dependencies (11) + - lint + - clirr + - cla/google permissionRules: - team: yoshi-admins permission: admin diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98f6e04a1..05593d27a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -117,3 +117,26 @@ jobs: - run: .kokoro/build.sh env: JOB_TYPE: test + units-java24: + # Building using Java 8 and run the tests with Java 24 runtime + name: "units (24)" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v3 + with: + java-version: 24 + distribution: temurin + - name: "Set jvm system property environment variable for surefire plugin (unit tests)" + # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests. + # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm + run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV + shell: bash + - uses: actions/setup-java@v3 + with: + java-version: 8 + distribution: temurin + - run: .kokoro/install_dependencies.sh + - run: .kokoro/build.sh + env: + JOB_TYPE: test diff --git a/CHANGELOG.md b/CHANGELOG.md index 8889dfbc4..9ac144867 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.8.0](https://github.com/googleapis/google-api-java-client/compare/v2.7.2...v2.8.0) (2025-05-20) + + +### Features + +* Next release from main branch is 2.8.0 ([#2563](https://github.com/googleapis/google-api-java-client/issues/2563)) ([57882ad](https://github.com/googleapis/google-api-java-client/commit/57882adbe0b9c48513642cfe624bb1ac7b842743)) + + +### Bug Fixes + +* **deps:** Update project.http.version to v1.47.0 ([#2543](https://github.com/googleapis/google-api-java-client/issues/2543)) ([922c382](https://github.com/googleapis/google-api-java-client/commit/922c3826234e218cbb1952026ba9491d6757e08a)) + ## [2.7.2](https://github.com/googleapis/google-api-java-client/compare/v2.7.1...v2.7.2) (2025-01-22) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 2bc3b11be..1a43e10cd 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml google-api-client-android diff --git a/google-api-client-apache-v5/pom.xml b/google-api-client-apache-v5/pom.xml index 7c9f3c332..3402babbd 100644 --- a/google-api-client-apache-v5/pom.xml +++ b/google-api-client-apache-v5/pom.xml @@ -6,7 +6,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 google-api-client-apache-v5 Apache extensions to the Google APIs Client Library for Java @@ -29,8 +29,8 @@ https://docs.oracle.com/javase/8/docs/api/ https://cloud.google.com/appengine/docs/standard/java/javadoc/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ - https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-oauth-client/${project.oauth.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 3d07ad9c6..c8caa057c 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml google-api-client-appengine @@ -17,8 +17,8 @@ http://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://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-oauth-client/${project.oauth.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 3abfb0459..c90855b93 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 45ee975a4..371a48dda 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 2.7.2 + 2.8.0 pom Google API Client Library for Java BOM @@ -63,48 +63,48 @@ com.google.api-client google-api-client - 2.7.2 + 2.8.0 com.google.api-client google-api-client-android - 2.7.2 + 2.8.0 com.google.api-client google-api-client-appengine - 2.7.2 + 2.8.0 com.google.api-client google-api-client-assembly - 2.7.2 + 2.8.0 pom com.google.api-client google-api-client-gson - 2.7.2 + 2.8.0 com.google.api-client google-api-client-jackson2 - 2.7.2 + 2.8.0 com.google.api-client google-api-client-protobuf - 2.7.2 + 2.8.0 com.google.api-client google-api-client-servlet - 2.7.2 + 2.8.0 com.google.api-client google-api-client-xml - 2.7.2 + 2.8.0 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 6d2301fbc..a252e379d 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml google-api-client-gson @@ -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-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 856277419..5faec630c 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml google-api-client-jackson2 @@ -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-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index ada1611ba..bb8f92d83 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml google-api-client-protobuf @@ -23,7 +23,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-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 7107d672e..66728b487 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml google-api-client-servlet @@ -16,8 +16,8 @@ http://download.oracle.com/javase/7/docs/api/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ - https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-oauth-client/${project.oauth.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index cf9165bb9..31dec8ed7 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml google-api-client-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-api-client/pom.xml b/google-api-client/pom.xml index e63449d23..9f14d982f 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 ../pom.xml google-api-client @@ -35,8 +35,8 @@ https://docs.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://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-oauth-client/${project.oauth.version}/ ${project.name} ${project.version} ${project.artifactId} ${project.version} diff --git a/google-api-client/src/main/resources/com/google/api/client/googleapis/google.p12 b/google-api-client/src/main/resources/com/google/api/client/googleapis/google.p12 index 9f7953100..0e9081c4c 100644 Binary files a/google-api-client/src/main/resources/com/google/api/client/googleapis/google.p12 and b/google-api-client/src/main/resources/com/google/api/client/googleapis/google.p12 differ diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java index 372fdc106..ef8aa80b1 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java @@ -35,7 +35,7 @@ public void testGetCertificateTrustStore() throws Exception { } // intentionally check the count of certificates, so it can help us detect if a new certificate // has been added or removed - assertEquals(70, trustStore.size()); + assertEquals(71, trustStore.size()); } public void testVersionMatcher() { diff --git a/pom.xml b/pom.xml index 2b6d391f6..8b4f5a9a2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.7.2 + 2.8.0 pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library @@ -413,8 +413,8 @@ http://download.oracle.com/javase/7/docs/api/ http://cloud.google.com/appengine/docs/java/javadoc - https://googleapis.dev/java/google-http-client/${project.http.version}/ - https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/ + https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/ + https://cloud.google.com/java/docs/reference/google-oauth-client/${project.oauth.version}/ Google API Client Library for Java ${project.version} ${basedir}/overview.html @@ -529,7 +529,7 @@ UTF-8 - 1.45.2 + 1.47.0 4.4.16 4.5.14 5.3.1 diff --git a/versions.txt b/versions.txt index 6810843a5..f55a3c6d8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.7.2:2.7.2 +google-api-client:2.8.0:2.8.0