From d2a77865f041c17625cc7a53dbfad9e7093deee6 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 10 Feb 2025 13:08:17 -0800 Subject: [PATCH] Change snapshot version numbers to begin with a number. This is the first piece of https://github.com/google/guava/issues/7094, which is progress toward [modularization](https://github.com/google/guava/issues/2970): javac (rightly or wrongly) wants a version number that starts with a number. We saw this previously [with Error Prone](https://github.com/google/error-prone/pull/4311#issuecomment-1986230314) and [with JSpecify](https://github.com/jspecify/jspecify/commit/0d39a0e8bf4ec863a2738835bb2421b25c48f282). Relates-To: elide-dev/jpms#1 Signed-off-by: Sam Gammon RELNOTES=n/a PiperOrigin-RevId: 725320956 --- README.md | 4 ++-- android/guava-bom/pom.xml | 2 +- android/guava-testlib/pom.xml | 2 +- android/guava-tests/pom.xml | 2 +- android/guava/pom.xml | 2 +- android/pom.xml | 4 ++-- guava-bom/pom.xml | 2 +- guava-gwt/pom.xml | 20 ++++++++++---------- guava-testlib/pom.xml | 2 +- guava-tests/pom.xml | 2 +- guava/pom.xml | 2 +- pom.xml | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index a182a6b4f509..4841b0187771 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,8 @@ consult the ## Snapshots and Documentation Snapshots of Guava built from the `master` branch are available through Maven -using version `HEAD-jre-SNAPSHOT`, or `HEAD-android-SNAPSHOT` for the Android -flavor. +using version `1.0-HEAD-jre-SNAPSHOT`, or `1.0-HEAD-android-SNAPSHOT` for the +Android flavor. [Snapshot API Javadoc][guava-snapshot-api-docs] as well as [Snapshot API Diffs][guava-snapshot-api-diffs] are also available. diff --git a/android/guava-bom/pom.xml b/android/guava-bom/pom.xml index 8fde93d1a75a..e6a5d9f132ac 100644 --- a/android/guava-bom/pom.xml +++ b/android/guava-bom/pom.xml @@ -8,7 +8,7 @@ com.google.guava guava-bom - HEAD-android-SNAPSHOT + 1.0-HEAD-android-SNAPSHOT pom diff --git a/android/guava-testlib/pom.xml b/android/guava-testlib/pom.xml index b1575bc06144..4f1ea6d336a6 100644 --- a/android/guava-testlib/pom.xml +++ b/android/guava-testlib/pom.xml @@ -5,7 +5,7 @@ com.google.guava guava-parent - HEAD-android-SNAPSHOT + 1.0-HEAD-android-SNAPSHOT guava-testlib Guava Testing Library diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml index a0170657f827..4886c1f1f605 100644 --- a/android/guava-tests/pom.xml +++ b/android/guava-tests/pom.xml @@ -5,7 +5,7 @@ com.google.guava guava-parent - HEAD-android-SNAPSHOT + 1.0-HEAD-android-SNAPSHOT guava-tests Guava Unit Tests diff --git a/android/guava/pom.xml b/android/guava/pom.xml index b39871f4495e..49627f59860f 100644 --- a/android/guava/pom.xml +++ b/android/guava/pom.xml @@ -6,7 +6,7 @@ com.google.guava guava-parent - HEAD-android-SNAPSHOT + 1.0-HEAD-android-SNAPSHOT guava bundle diff --git a/android/pom.xml b/android/pom.xml index 32fcdf0e7b4c..9831c358083b 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.google.guava guava-parent - HEAD-android-SNAPSHOT + 1.0-HEAD-android-SNAPSHOT pom Guava Maven Parent Parent for guava artifacts @@ -42,7 +42,7 @@ integration android android - HEAD-jre-SNAPSHOT + 1.0-HEAD-jre-SNAPSHOT standard-jvm jre diff --git a/guava-bom/pom.xml b/guava-bom/pom.xml index 8c5ea2ec035f..af7c956adbaa 100644 --- a/guava-bom/pom.xml +++ b/guava-bom/pom.xml @@ -8,7 +8,7 @@ com.google.guava guava-bom - HEAD-jre-SNAPSHOT + 1.0-HEAD-jre-SNAPSHOT pom diff --git a/guava-gwt/pom.xml b/guava-gwt/pom.xml index 54273437840d..fac01f9f5daf 100644 --- a/guava-gwt/pom.xml +++ b/guava-gwt/pom.xml @@ -5,7 +5,7 @@ com.google.guava guava-parent - HEAD-jre-SNAPSHOT + 1.0-HEAD-jre-SNAPSHOT guava-gwt Guava GWT compatible libs @@ -134,15 +134,15 @@ maven-compiler-plugin - - - - - - **/ForceGuavaCompilation* - **/DummyJavadocClass* - - + + + + + + **/ForceGuavaCompilation* + **/DummyJavadocClass* + + maven-jar-plugin diff --git a/guava-testlib/pom.xml b/guava-testlib/pom.xml index 65061deb809c..7d4186391197 100644 --- a/guava-testlib/pom.xml +++ b/guava-testlib/pom.xml @@ -5,7 +5,7 @@ com.google.guava guava-parent - HEAD-jre-SNAPSHOT + 1.0-HEAD-jre-SNAPSHOT guava-testlib Guava Testing Library diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml index f387806880c3..595d4c3fc436 100644 --- a/guava-tests/pom.xml +++ b/guava-tests/pom.xml @@ -5,7 +5,7 @@ com.google.guava guava-parent - HEAD-jre-SNAPSHOT + 1.0-HEAD-jre-SNAPSHOT guava-tests Guava Unit Tests diff --git a/guava/pom.xml b/guava/pom.xml index d47241bee8a1..c87a5c7ec49e 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -6,7 +6,7 @@ com.google.guava guava-parent - HEAD-jre-SNAPSHOT + 1.0-HEAD-jre-SNAPSHOT guava bundle diff --git a/pom.xml b/pom.xml index 46623678d3be..c840d0df4d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.google.guava guava-parent - HEAD-jre-SNAPSHOT + 1.0-HEAD-jre-SNAPSHOT pom Guava Maven Parent Parent for guava artifacts @@ -42,7 +42,7 @@ integration standard-jvm jre - HEAD-android-SNAPSHOT + 1.0-HEAD-android-SNAPSHOT android android