From e3a3523eebc169ec87353ed94c12419e4dfa8b28 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 7 Feb 2025 12:23:42 -0500 Subject: [PATCH 1/5] fix: remove unnecessary nexus plugin activation (#2071) * fix: remove unnecessary nexus plugin activation * declare plugins wrapped by profiles --- google-http-client-appengine/pom.xml | 28 ++-- google-http-client-bom/pom.xml | 68 +++++++-- google-http-client-findbugs/pom.xml | 19 ++- pom.xml | 138 ++++++++++-------- .../dailymotion-simple-cmdline-sample/pom.xml | 18 ++- samples/pom.xml | 38 ++--- 6 files changed, 192 insertions(+), 117 deletions(-) diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index 84cd8805e..1965b52ca 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -12,6 +12,22 @@ Google App Engine extensions to the Google HTTP Client Library for Java. + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + org.codehaus.mojo.signature + java17 + 1.0 + + + + + maven-javadoc-plugin @@ -27,18 +43,6 @@ maven-source-plugin - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java17 - 1.0 - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 489f76165..ec67490e2 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -118,18 +118,22 @@ + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + true + + sonatype-nexus-staging + https://google.oss.sonatype.org/ + false + + + + - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - sonatype-nexus-staging - https://google.oss.sonatype.org/ - false - - org.apache.maven.plugins maven-javadoc-plugin @@ -158,6 +162,48 @@ + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + + + release-gcp-artifact-registry + + artifactregistry://undefined-artifact-registry-url-value + + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + release-sign-artifacts diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index 65f1ccd7d..ceacc5b68 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -12,17 +12,22 @@ Google APIs Client Library Findbugs custom plugin. + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + true + + + + maven-source-plugin - - org.codehaus.mojo - animal-sniffer-maven-plugin - - true - - + org.apache.maven.plugins maven-dependency-plugin diff --git a/pom.xml b/pom.xml index e02327982..c31922893 100644 --- a/pom.xml +++ b/pom.xml @@ -287,17 +287,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://google.oss.sonatype.org/ - ${deploy.autorelease} - - maven-assembly-plugin 3.7.1 @@ -516,53 +505,6 @@ - - org.codehaus.mojo - clirr-maven-plugin - - clirr-ignored-differences.xml - true - - - - - check - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - java7 - - check - - - - org.codehaus.mojo.signature - java17 - 1.0 - - - - - android - - check - - - - net.sf.androidscents.signature - android-api-level-19 - 4.4.2_r4 - - - - - maven-project-info-reports-plugin @@ -576,10 +518,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - com.coveo fmt-maven-plugin @@ -629,6 +567,82 @@ + + clirr-compatibility-check + + + + [1.8,) + + + + + org.codehaus.mojo + clirr-maven-plugin + + clirr-ignored-differences.xml + true + + + + + check + + + + + + + + + animal-sniffer + + + [1.7,) + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + java7 + + check + + + + org.codehaus.mojo.signature + java17 + 1.0 + + + + + android + + check + + + + net.sf.androidscents.signature + android-api-level-19 + 4.4.2_r4 + + + + + + + + java21 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index edfeb0d18..afa6e584b 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -11,6 +11,17 @@ Simple example for the Dailymotion API. + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + + + org.codehaus.mojo @@ -55,13 +66,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - ${project.artifactId}-${project.version} diff --git a/samples/pom.xml b/samples/pom.xml index f26c5460a..2943582a8 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -34,23 +34,25 @@ - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.3 - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - - true - - - + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.3 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + + true + + + + From 8a3068139b7096a88ad8a791391f29b051bb7952 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 16:11:18 -0500 Subject: [PATCH 2/5] chore(main): release 1.46.1-SNAPSHOT (#2070) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- google-http-client-android-test/pom.xml | 6 ++-- google-http-client-android/pom.xml | 4 +-- google-http-client-apache-v2/pom.xml | 4 +-- google-http-client-apache-v5/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 24 +++++++-------- google-http-client-findbugs/pom.xml | 4 +-- google-http-client-gson/pom.xml | 4 +-- google-http-client-jackson2/pom.xml | 4 +-- google-http-client-protobuf/pom.xml | 4 +-- google-http-client-test/pom.xml | 4 +-- google-http-client-xml/pom.xml | 4 +-- google-http-client/pom.xml | 4 +-- pom.xml | 4 +-- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 30 +++++++++---------- 17 files changed, 57 insertions(+), 57 deletions(-) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index da0c63d30..b39faa2af 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -4,7 +4,7 @@ google-http-client google-http-client-android-test Test project for google-http-client-android. - 1.46.0 + 1.46.1-SNAPSHOT apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.46.0 + 1.46.1-SNAPSHOT android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.46.0 + 1.46.1-SNAPSHOT junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index c0a07b414..60e663bfa 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-android - 1.46.0 + 1.46.1-SNAPSHOT Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index ff2ebd2dc..5fc7c5510 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-apache-v2 - 1.46.0 + 1.46.1-SNAPSHOT Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v5/pom.xml b/google-http-client-apache-v5/pom.xml index 71bd6ea3c..6ea5befe8 100644 --- a/google-http-client-apache-v5/pom.xml +++ b/google-http-client-apache-v5/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-apache-v5 - 1.46.0 + 1.46.1-SNAPSHOT Apache HTTP transport v5 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index 1965b52ca..c47310bc0 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-appengine - 1.46.0 + 1.46.1-SNAPSHOT Google App Engine extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index 031f37fb2..ab924ed2c 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -4,12 +4,12 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml com.google.http-client google-http-client-assembly - 1.46.0 + 1.46.1-SNAPSHOT pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index ec67490e2..be2080c64 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.http-client google-http-client-bom - 1.46.0 + 1.46.1-SNAPSHOT pom Google HTTP Client Library for Java BOM @@ -63,57 +63,57 @@ com.google.http-client google-http-client - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-android - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-apache-v2 - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-apache-v5 - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-appengine - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-findbugs - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-gson - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-jackson2 - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-protobuf - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-test - 1.46.0 + 1.46.1-SNAPSHOT com.google.http-client google-http-client-xml - 1.46.0 + 1.46.1-SNAPSHOT diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index ceacc5b68..d4519ec1e 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-findbugs - 1.46.0 + 1.46.1-SNAPSHOT Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index bb324f0d3..8b25323a1 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-gson - 1.46.0 + 1.46.1-SNAPSHOT GSON extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index 1734f952e..c164e0014 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-jackson2 - 1.46.0 + 1.46.1-SNAPSHOT Jackson 2 extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index 5ff8e2447..82470ba27 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-protobuf - 1.46.0 + 1.46.1-SNAPSHOT Protocol Buffer extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index f10773fe9..a5b69d428 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-test - 1.46.0 + 1.46.1-SNAPSHOT Shared classes used for testing of artifacts in the Google HTTP Client Library for Java. diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index 594874ca6..364009507 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client-xml - 1.46.0 + 1.46.1-SNAPSHOT XML extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 8eaa58758..abdc4809e 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../pom.xml google-http-client - 1.46.0 + 1.46.1-SNAPSHOT Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, diff --git a/pom.xml b/pom.xml index c31922893..a72f3dc69 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -547,7 +547,7 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.46.0 + 1.46.1-SNAPSHOT 2.0.32 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index afa6e584b..8cd5a87e4 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.46.0 + 1.46.1-SNAPSHOT ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index c0033ab98..d92d1a6f5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,18 +1,18 @@ # Format: # module:released-version:current-version -google-http-client:1.46.0:1.46.0 -google-http-client-bom:1.46.0:1.46.0 -google-http-client-parent:1.46.0:1.46.0 -google-http-client-android:1.46.0:1.46.0 -google-http-client-android-test:1.46.0:1.46.0 -google-http-client-apache-v2:1.46.0:1.46.0 -google-http-client-apache-v5:1.46.0:1.46.0 -google-http-client-appengine:1.46.0:1.46.0 -google-http-client-assembly:1.46.0:1.46.0 -google-http-client-findbugs:1.46.0:1.46.0 -google-http-client-gson:1.46.0:1.46.0 -google-http-client-jackson2:1.46.0:1.46.0 -google-http-client-protobuf:1.46.0:1.46.0 -google-http-client-test:1.46.0:1.46.0 -google-http-client-xml:1.46.0:1.46.0 +google-http-client:1.46.0:1.46.1-SNAPSHOT +google-http-client-bom:1.46.0:1.46.1-SNAPSHOT +google-http-client-parent:1.46.0:1.46.1-SNAPSHOT +google-http-client-android:1.46.0:1.46.1-SNAPSHOT +google-http-client-android-test:1.46.0:1.46.1-SNAPSHOT +google-http-client-apache-v2:1.46.0:1.46.1-SNAPSHOT +google-http-client-apache-v5:1.46.0:1.46.1-SNAPSHOT +google-http-client-appengine:1.46.0:1.46.1-SNAPSHOT +google-http-client-assembly:1.46.0:1.46.1-SNAPSHOT +google-http-client-findbugs:1.46.0:1.46.1-SNAPSHOT +google-http-client-gson:1.46.0:1.46.1-SNAPSHOT +google-http-client-jackson2:1.46.0:1.46.1-SNAPSHOT +google-http-client-protobuf:1.46.0:1.46.1-SNAPSHOT +google-http-client-test:1.46.0:1.46.1-SNAPSHOT +google-http-client-xml:1.46.0:1.46.1-SNAPSHOT From 5790ac4d27ebf2aa75155a4dcc24e7f74ca7b588 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 7 Feb 2025 16:37:28 -0500 Subject: [PATCH 3/5] Revert "deps: update dependency io.grpc:grpc-context to v1.70.0 (#2068)" (#2072) This reverts commit 7a580bf568bd2a5bc0519880f4a213f6c47c9849. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a72f3dc69..e6a03aee1 100644 --- a/pom.xml +++ b/pom.xml @@ -258,7 +258,7 @@ io.grpc grpc-context - 1.70.0 + 1.69.0 io.opencensus From fd38a8cbfe0c312881793b1b3242232dd8767de8 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 7 Feb 2025 21:37:40 +0000 Subject: [PATCH 4/5] chore: freeze guava and grpc dependencies until after LTS 8 is released (#2074) --- renovate.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index f734b7d7f..bc479bbe5 100644 --- a/renovate.json +++ b/renovate.json @@ -29,7 +29,8 @@ "matchPackagePatterns": [ "^com.google.guava:" ], - "versioning": "docker" + "versioning": "docker", + "enabled": false }, { "matchPackagePatterns": [ @@ -82,6 +83,14 @@ "^com.fasterxml.jackson.core" ], "groupName": "jackson dependencies" + }, + { + "semanticCommitType": "deps", + "groupName": "gRPC dependencies", + "matchPackageNames": [ + "/^io.grpc/" + ], + "enabled": false } ], "semanticCommits": "enabled", From 3ee8bb6380ee22a8a6eb6e5048c603fbdb9ee320 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 16:45:45 -0500 Subject: [PATCH 5/5] chore(main): release 1.46.1 (#2073) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 12 ++++++++ google-http-client-android-test/pom.xml | 6 ++-- google-http-client-android/pom.xml | 4 +-- google-http-client-apache-v2/pom.xml | 4 +-- google-http-client-apache-v5/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 24 +++++++-------- google-http-client-findbugs/pom.xml | 4 +-- google-http-client-gson/pom.xml | 4 +-- google-http-client-jackson2/pom.xml | 4 +-- google-http-client-protobuf/pom.xml | 4 +-- google-http-client-test/pom.xml | 4 +-- google-http-client-xml/pom.xml | 4 +-- google-http-client/pom.xml | 4 +-- pom.xml | 4 +-- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 30 +++++++++---------- 18 files changed, 69 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d09c2bc8..a453cdbe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.46.1](https://github.com/googleapis/google-http-java-client/compare/v1.46.0...v1.46.1) (2025-02-07) + + +### Bug Fixes + +* Remove unnecessary nexus plugin activation ([#2071](https://github.com/googleapis/google-http-java-client/issues/2071)) ([e3a3523](https://github.com/googleapis/google-http-java-client/commit/e3a3523eebc169ec87353ed94c12419e4dfa8b28)) + + +### Dependencies + +* Revert dependency io.grpc:grpc-context back to v1.69.0 ([5790ac4](https://github.com/googleapis/google-http-java-client/commit/5790ac4d27ebf2aa75155a4dcc24e7f74ca7b588)) + ## [1.46.0](https://github.com/googleapis/google-http-java-client/compare/v1.45.3...v1.46.0) (2025-02-06) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index b39faa2af..e73fc6dec 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -4,7 +4,7 @@ google-http-client google-http-client-android-test Test project for google-http-client-android. - 1.46.1-SNAPSHOT + 1.46.1 apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.46.1-SNAPSHOT + 1.46.1 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.46.1-SNAPSHOT + 1.46.1 junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 60e663bfa..d9eaacfdd 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-android - 1.46.1-SNAPSHOT + 1.46.1 Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index 5fc7c5510..d8df6bf66 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-apache-v2 - 1.46.1-SNAPSHOT + 1.46.1 Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v5/pom.xml b/google-http-client-apache-v5/pom.xml index 6ea5befe8..6ea3fee8b 100644 --- a/google-http-client-apache-v5/pom.xml +++ b/google-http-client-apache-v5/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-apache-v5 - 1.46.1-SNAPSHOT + 1.46.1 Apache HTTP transport v5 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index c47310bc0..b1b616ee0 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-appengine - 1.46.1-SNAPSHOT + 1.46.1 Google App Engine extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index ab924ed2c..d6d4baf3f 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -4,12 +4,12 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml com.google.http-client google-http-client-assembly - 1.46.1-SNAPSHOT + 1.46.1 pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index be2080c64..870f53066 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.http-client google-http-client-bom - 1.46.1-SNAPSHOT + 1.46.1 pom Google HTTP Client Library for Java BOM @@ -63,57 +63,57 @@ com.google.http-client google-http-client - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-android - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-apache-v2 - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-apache-v5 - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-appengine - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-findbugs - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-gson - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-jackson2 - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-protobuf - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-test - 1.46.1-SNAPSHOT + 1.46.1 com.google.http-client google-http-client-xml - 1.46.1-SNAPSHOT + 1.46.1 diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index d4519ec1e..dda69ac30 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-findbugs - 1.46.1-SNAPSHOT + 1.46.1 Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 8b25323a1..f72a4bef7 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-gson - 1.46.1-SNAPSHOT + 1.46.1 GSON extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index c164e0014..eb55599cc 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-jackson2 - 1.46.1-SNAPSHOT + 1.46.1 Jackson 2 extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index 82470ba27..4bf449ff6 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-protobuf - 1.46.1-SNAPSHOT + 1.46.1 Protocol Buffer extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index a5b69d428..e97309ca5 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-test - 1.46.1-SNAPSHOT + 1.46.1 Shared classes used for testing of artifacts in the Google HTTP Client Library for Java. diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index 364009507..0dca272c8 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client-xml - 1.46.1-SNAPSHOT + 1.46.1 XML extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index abdc4809e..45fb9a7d7 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../pom.xml google-http-client - 1.46.1-SNAPSHOT + 1.46.1 Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, diff --git a/pom.xml b/pom.xml index e6a03aee1..f892ee40c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -547,7 +547,7 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.46.1-SNAPSHOT + 1.46.1 2.0.32 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 8cd5a87e4..9b1f453e6 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.46.1-SNAPSHOT + 1.46.1 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index d92d1a6f5..564043952 100644 --- a/versions.txt +++ b/versions.txt @@ -1,18 +1,18 @@ # Format: # module:released-version:current-version -google-http-client:1.46.0:1.46.1-SNAPSHOT -google-http-client-bom:1.46.0:1.46.1-SNAPSHOT -google-http-client-parent:1.46.0:1.46.1-SNAPSHOT -google-http-client-android:1.46.0:1.46.1-SNAPSHOT -google-http-client-android-test:1.46.0:1.46.1-SNAPSHOT -google-http-client-apache-v2:1.46.0:1.46.1-SNAPSHOT -google-http-client-apache-v5:1.46.0:1.46.1-SNAPSHOT -google-http-client-appengine:1.46.0:1.46.1-SNAPSHOT -google-http-client-assembly:1.46.0:1.46.1-SNAPSHOT -google-http-client-findbugs:1.46.0:1.46.1-SNAPSHOT -google-http-client-gson:1.46.0:1.46.1-SNAPSHOT -google-http-client-jackson2:1.46.0:1.46.1-SNAPSHOT -google-http-client-protobuf:1.46.0:1.46.1-SNAPSHOT -google-http-client-test:1.46.0:1.46.1-SNAPSHOT -google-http-client-xml:1.46.0:1.46.1-SNAPSHOT +google-http-client:1.46.1:1.46.1 +google-http-client-bom:1.46.1:1.46.1 +google-http-client-parent:1.46.1:1.46.1 +google-http-client-android:1.46.1:1.46.1 +google-http-client-android-test:1.46.1:1.46.1 +google-http-client-apache-v2:1.46.1:1.46.1 +google-http-client-apache-v5:1.46.1:1.46.1 +google-http-client-appengine:1.46.1:1.46.1 +google-http-client-assembly:1.46.1:1.46.1 +google-http-client-findbugs:1.46.1:1.46.1 +google-http-client-gson:1.46.1:1.46.1 +google-http-client-jackson2:1.46.1:1.46.1 +google-http-client-protobuf:1.46.1:1.46.1 +google-http-client-test:1.46.1:1.46.1 +google-http-client-xml:1.46.1:1.46.1