From 9fc0f28fb95d4aa32f637b58cb0aea76991d0f8c Mon Sep 17 00:00:00 2001 From: Tijana Vislavski Gradina Date: Thu, 12 Dec 2024 06:20:34 +0000 Subject: [PATCH 1/3] Removed Automatic-Module-Name from carrier and geocoder... (#3758) * Added Automatic-Module-Name to published jars. Context: https://b.corp.google.com/issues/308334884 * Removed Automatic-Module-Name from carrier and geocoder. Classes in these modules belong to the same package as core libphonenumber library, which leads to the split package problem with Java modules. --- java/carrier/pom.xml | 4 ---- java/geocoder/pom.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml index 18fa0e1916..9a5130bd32 100644 --- a/java/carrier/pom.xml +++ b/java/carrier/pom.xml @@ -52,10 +52,6 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - com.google.i18n.phonenumbers.carrier - - diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml index b713d5c763..6c43f1c942 100644 --- a/java/geocoder/pom.xml +++ b/java/geocoder/pom.xml @@ -62,10 +62,6 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - com.google.i18n.phonenumbers.geocoder - - From 3eff8ac0befc297a2b9b8a8cdcb687c1dcbd8f8f Mon Sep 17 00:00:00 2001 From: mandlil <138015259+mandlil@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:47:48 +0000 Subject: [PATCH 2/3] Mandlil maven update (#3764) * [maven-release-plugin] prepare release v8.13.52 * [maven-release-plugin] prepare for next development iteration --- java/carrier/pom.xml | 12 +++++------- java/demo/pom.xml | 10 +++++----- java/geocoder/pom.xml | 12 +++++------- java/internal/prefixmapper/pom.xml | 10 ++++------ java/libphonenumber/pom.xml | 8 +++----- java/pom.xml | 6 ++---- 6 files changed, 24 insertions(+), 34 deletions(-) diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml index 9a5130bd32..206e221983 100644 --- a/java/carrier/pom.xml +++ b/java/carrier/pom.xml @@ -1,17 +1,15 @@ - + 4.0.0 carrier - 1.236-SNAPSHOT + 1.237-SNAPSHOT jar https://github.com/google/libphonenumber/ com.googlecode.libphonenumber libphonenumber-parent - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT @@ -83,12 +81,12 @@ com.googlecode.libphonenumber libphonenumber - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT com.googlecode.libphonenumber prefixmapper - 2.246-SNAPSHOT + 2.247-SNAPSHOT diff --git a/java/demo/pom.xml b/java/demo/pom.xml index 3536af7a80..9945ae97f5 100644 --- a/java/demo/pom.xml +++ b/java/demo/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.googlecode.libphonenumber demo - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT war https://github.com/google/libphonenumber/ com.googlecode.libphonenumber libphonenumber-parent - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT @@ -68,17 +68,17 @@ com.googlecode.libphonenumber libphonenumber - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT com.googlecode.libphonenumber geocoder - 2.246-SNAPSHOT + 2.247-SNAPSHOT com.googlecode.libphonenumber carrier - 1.236-SNAPSHOT + 1.237-SNAPSHOT diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml index 6c43f1c942..ee631b9b69 100644 --- a/java/geocoder/pom.xml +++ b/java/geocoder/pom.xml @@ -1,17 +1,15 @@ - + 4.0.0 geocoder - 2.246-SNAPSHOT + 2.247-SNAPSHOT jar https://github.com/google/libphonenumber/ com.googlecode.libphonenumber libphonenumber-parent - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT @@ -93,12 +91,12 @@ com.googlecode.libphonenumber libphonenumber - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT com.googlecode.libphonenumber prefixmapper - 2.246-SNAPSHOT + 2.247-SNAPSHOT diff --git a/java/internal/prefixmapper/pom.xml b/java/internal/prefixmapper/pom.xml index 1e3249d9dd..b94f4f1952 100644 --- a/java/internal/prefixmapper/pom.xml +++ b/java/internal/prefixmapper/pom.xml @@ -1,17 +1,15 @@ - + 4.0.0 prefixmapper - 2.246-SNAPSHOT + 2.247-SNAPSHOT jar https://github.com/google/libphonenumber/ com.googlecode.libphonenumber libphonenumber-parent - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT ../../pom.xml @@ -85,7 +83,7 @@ com.googlecode.libphonenumber libphonenumber - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml index f2ff83f3b0..b355687277 100644 --- a/java/libphonenumber/pom.xml +++ b/java/libphonenumber/pom.xml @@ -1,17 +1,15 @@ - + 4.0.0 libphonenumber - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT jar https://github.com/google/libphonenumber/ com.googlecode.libphonenumber libphonenumber-parent - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT diff --git a/java/pom.xml b/java/pom.xml index 2dca367300..c991c43ff7 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 com.googlecode.libphonenumber libphonenumber-parent - 8.13.52-SNAPSHOT + 8.13.53-SNAPSHOT pom https://github.com/google/libphonenumber/ From 424617599369e7adba8a5d1509b910d9ce2e3e44 Mon Sep 17 00:00:00 2001 From: mandlil <138015259+mandlil@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:48:35 +0000 Subject: [PATCH 3/3] Update README.md (#3765) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a6362a4ff..444d97617f 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Cream Sandwich). The [Java demo](https://libphonenumber.appspot.com/) is updated with a slight delay after the GitHub release. -Last demo update: v8.13.51. +Last demo update: v8.13.52. Note: Even though the library (main branch/[maven release](https://repo1.maven.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.12.56/)) is at v8.12.57, because of some deployment issues, we were unable to update the