From c977d7a4a62a8cf11fdad202bfdc7cbf9e2e10da Mon Sep 17 00:00:00 2001
From: tijanavg <tijanavg@google.com>
Date: Tue, 26 Nov 2024 14:44:50 +0000
Subject: [PATCH 1/2] Added Automatic-Module-Name to published jars. Context:
 https://b.corp.google.com/issues/308334884

---
 java/carrier/pom.xml               | 26 +++++++++++++++---------
 java/geocoder/pom.xml              | 32 ++++++++++++++++++++----------
 java/internal/prefixmapper/pom.xml | 28 +++++++++++++++++---------
 java/libphonenumber/pom.xml        | 26 ++++++++++++++++++------
 java/pom.xml                       | 25 +++++++++++++++--------
 5 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml
index 1e47cc5e0c..8e660b08b0 100644
--- a/java/carrier/pom.xml
+++ b/java/carrier/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
   <version>1.235-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -24,8 +25,10 @@
     </resources>
     <testResources>
       <testResource>
-        <directory>test/com/google/i18n/phonenumbers/carrier/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/carrier/testing_data</targetPath>
+        <directory>test/com/google/i18n/phonenumbers/carrier/testing_data
+        </directory>
+        <targetPath>com/google/i18n/phonenumbers/carrier/testing_data
+        </targetPath>
       </testResource>
     </testResources>
     <plugins>
@@ -35,24 +38,29 @@
         <version>5.1.9</version>
         <configuration>
           <instructions>
-          	<Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
+            <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>default-jar</id>
             <configuration>
               <archive>
-                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                <manifestFile>
+                  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                </manifestFile>
+                <manifestEntries>
+                  <Automatic-Module-Name>com.google.i18n.phonenumbers.carrier
+                  </Automatic-Module-Name>
+                </manifestEntries>
               </archive>
             </configuration>
           </execution>
-		</executions>
-	  </plugin>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
index 40a015754a..450a5fb175 100644
--- a/java/geocoder/pom.xml
+++ b/java/geocoder/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
   <version>2.245-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -28,12 +29,16 @@
     </resources>
     <testResources>
       <testResource>
-        <directory>test/com/google/i18n/phonenumbers/geocoding/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data</targetPath>
+        <directory>test/com/google/i18n/phonenumbers/geocoding/testing_data
+        </directory>
+        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data
+        </targetPath>
       </testResource>
       <testResource>
-        <directory>test/com/google/i18n/phonenumbers/timezones/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/timezones/testing_data</targetPath>
+        <directory>test/com/google/i18n/phonenumbers/timezones/testing_data
+        </directory>
+        <targetPath>com/google/i18n/phonenumbers/timezones/testing_data
+        </targetPath>
       </testResource>
     </testResources>
     <plugins>
@@ -43,24 +48,29 @@
         <version>5.1.9</version>
         <configuration>
           <instructions>
-          	<Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
+            <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>default-jar</id>
             <configuration>
               <archive>
-                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                <manifestFile>
+                  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                </manifestFile>
+                <manifestEntries>
+                  <Automatic-Module-Name>com.google.i18n.phonenumbers.geocoder
+                  </Automatic-Module-Name>
+                </manifestEntries>
               </archive>
             </configuration>
           </execution>
-		</executions>
-	  </plugin>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
diff --git a/java/internal/prefixmapper/pom.xml b/java/internal/prefixmapper/pom.xml
index 9c43180d50..0ebfca012a 100644
--- a/java/internal/prefixmapper/pom.xml
+++ b/java/internal/prefixmapper/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
   <version>2.245-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -19,8 +20,11 @@
     <testSourceDirectory>test</testSourceDirectory>
     <testResources>
       <testResource>
-        <directory>../../geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data</targetPath>
+        <directory>
+          ../../geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data
+        </directory>
+        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data
+        </targetPath>
       </testResource>
     </testResources>
     <plugins>
@@ -30,24 +34,30 @@
         <version>5.1.9</version>
         <configuration>
           <instructions>
-          	<Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
+            <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>default-jar</id>
             <configuration>
               <archive>
-                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                <manifestFile>
+                  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                </manifestFile>
+                <manifestEntries>
+                  <Automatic-Module-Name>
+                    com.google.i18n.phonenumbers.prefixmapper
+                  </Automatic-Module-Name>
+                </manifestEntries>
               </archive>
             </configuration>
           </execution>
-		</executions>
-	  </plugin>
+        </executions>
+      </plugin>
 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index 54f95f9460..c472bd42d2 100644
--- a/java/libphonenumber/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
   <version>8.13.51-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -35,20 +36,26 @@
         <version>5.1.9</version>
         <configuration>
           <instructions>
-          	<Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+            <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
             <Export-Package>com.google.i18n.phonenumbers</Export-Package>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>default-jar</id>
             <configuration>
               <archive>
-                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                <manifestFile>
+                  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                </manifestFile>
+                <manifestEntries>
+                  <Automatic-Module-Name>
+                    com.google.i18n.phonenumbers.libphonenumber
+                  </Automatic-Module-Name>
+                </manifestEntries>
               </archive>
             </configuration>
           </execution>
@@ -61,7 +68,14 @@
             <configuration>
               <classifier>no-metadata</classifier>
               <archive>
-                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                <manifestFile>
+                  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                </manifestFile>
+                <manifestEntries>
+                  <Automatic-Module-Name>
+                    com.google.i18n.phonenumbers.libphonenumber
+                  </Automatic-Module-Name>
+                </manifestEntries>
               </archive>
               <excludes>
                 <exclude>com/google/i18n/phonenumbers/data/*</exclude>
diff --git a/java/pom.xml b/java/pom.xml
index c864d6fc72..3cdaa49a5a 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
@@ -14,7 +16,8 @@
   </parent>
 
   <description>
-    Google's common Java library for parsing, formatting, storing and validating international phone numbers.
+    Google's common Java library for parsing, formatting, storing and validating
+    international phone numbers.
     Optimized for running on smartphones.
   </description>
 
@@ -31,8 +34,10 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:https://github.com/google/libphonenumber.git</connection>
-    <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git</developerConnection>
+    <connection>scm:git:https://github.com/google/libphonenumber.git
+    </connection>
+    <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git
+    </developerConnection>
     <url>https://github.com/google/libphonenumber/</url>
     <tag>v8.13.50</tag>
   </scm>
@@ -108,6 +113,10 @@
           <artifactId>animal-sniffer-maven-plugin</artifactId>
           <version>1.15</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.3.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -162,20 +171,20 @@
         <version>3.11.0</version>
         <configuration>
           <source>1.7</source>
-	  <target>1.7</target>
-	  <encoding>UTF-8</encoding>
+          <target>1.7</target>
+          <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
-	<version>1.6.13</version>
+        <version>1.6.13</version>
         <extensions>true</extensions>
         <configuration>
           <serverId>sonatype-nexus-staging</serverId>
           <nexusUrl>https://oss.sonatype.org/</nexusUrl>
           <stagingProfileId>23ed8fbc71e875</stagingProfileId>
-	  <skipStagingRepositoryClose>true</skipStagingRepositoryClose>
+          <skipStagingRepositoryClose>true</skipStagingRepositoryClose>
         </configuration>
       </plugin>
     </plugins>

From 5273bf665eb5484acc8da66d4e3324871d3fe50f Mon Sep 17 00:00:00 2001
From: tijanavg <tijanavg@google.com>
Date: Wed, 11 Dec 2024 13:07:37 +0000
Subject: [PATCH 2/2] 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 @@
                 <manifestFile>
                   ${project.build.outputDirectory}/META-INF/MANIFEST.MF
                 </manifestFile>
-                <manifestEntries>
-                  <Automatic-Module-Name>com.google.i18n.phonenumbers.carrier
-                  </Automatic-Module-Name>
-                </manifestEntries>
               </archive>
             </configuration>
           </execution>
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 @@
                 <manifestFile>
                   ${project.build.outputDirectory}/META-INF/MANIFEST.MF
                 </manifestFile>
-                <manifestEntries>
-                  <Automatic-Module-Name>com.google.i18n.phonenumbers.geocoder
-                  </Automatic-Module-Name>
-                </manifestEntries>
               </archive>
             </configuration>
           </execution>