Merge branch 'google:master' into rename-nongeographicalregion

google · Dec 11, 2024 · 67c88bb · 67c88bb
2 parents 32e0765 + 462cea9
commit 67c88bb
Show file tree

Hide file tree

Showing 64 changed files with 28,297 additions and 28,590 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -49,7 +49,7 @@ jobs:
         uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
 
       - name: Install Protoc
-        uses: arduino/setup-protoc@v1
+        uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1.3.0
         with:
           version: '3.x'
 

diff --git a/.github/workflows/osv-scanner-unified.yml b/.github/workflows/osv-scanner-unified.yml
@@ -35,8 +35,20 @@ jobs:
   scan-scheduled:
     if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
     # If you want to copy this config, highly suggest pinning this version to a release rather than tracking the main branch
-    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@c80d3cb8d7bfabae9f047f6b8ea68792dd2ebcf6 # v1.9.0
+    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
+    with:
+       # Just scan the root directory and docs, since everything else is fixtures
+      scan-args: |-
+        -r
+        --skip-git
+        ./
   scan-pr:
     if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
     # If you want to copy this config, highly suggest pinning this version to a release rather than tracking the main branch
-    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@c80d3cb8d7bfabae9f047f6b8ea68792dd2ebcf6 # v1.9.0
+    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
+    with:
+      # Just scan the root directory and docs, since everything else is fixtures
+      scan-args: |-
+        -r
+        --skip-git
+        ./
diff --git 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.50.
+Last demo update: v8.13.51.
 
 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

diff --git a/cpp/src/phonenumbers/lite_metadata.cc b/cpp/src/phonenumbers/lite_metadata.cc
diff --git a/cpp/src/phonenumbers/metadata.cc b/cpp/src/phonenumbers/metadata.cc
diff --git a/cpp/src/phonenumbers/short_metadata.cc b/cpp/src/phonenumbers/short_metadata.cc
diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml
@@ -1,16 +1,17 @@
 <?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>
+  <version>1.236-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.51-SNAPSHOT</version>
+    <version>8.13.52-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -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>
@@ -79,12 +87,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.51-SNAPSHOT</version>
+      <version>8.13.52-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.245-SNAPSHOT</version>
+      <version>2.246-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
diff --git a/java/demo/pom.xml b/java/demo/pom.xml
@@ -3,21 +3,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>8.13.51-SNAPSHOT</version>
+  <version>8.13.52-SNAPSHOT</version>
   <packaging>war</packaging>
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.51-SNAPSHOT</version>
+    <version>8.13.52-SNAPSHOT</version>
   </parent>
 
   <properties>
     <app.deploy.project>libphonenumber-hrd</app.deploy.project>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     <archiveClasses>true</archiveClasses>
     <soy.root>${project.basedir}/src/main/resources/com/google/phonenumbers/demo</soy.root>
@@ -68,17 +68,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.51-SNAPSHOT</version>
+      <version>8.13.52-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.245-SNAPSHOT</version>
+      <version>2.246-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.235-SNAPSHOT</version>
+      <version>1.236-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/demo/src/main/webapp/WEB-INF/appengine-web.xml b/java/demo/src/main/webapp/WEB-INF/appengine-web.xml
@@ -2,7 +2,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>libphonenumber-hrd</application>
   <version>1</version>
-  <runtime>java11</runtime>
+  <runtime>java17</runtime>
   <threadsafe>true</threadsafe>
 
   <!-- Configure java.util.logging -->

diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
@@ -1,16 +1,17 @@
 <?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>
+  <version>2.246-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.51-SNAPSHOT</version>
+    <version>8.13.52-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -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>
@@ -87,12 +97,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.51-SNAPSHOT</version>
+      <version>8.13.52-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.245-SNAPSHOT</version>
+      <version>2.246-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
diff --git a/java/internal/prefixmapper/pom.xml b/java/internal/prefixmapper/pom.xml
@@ -1,16 +1,17 @@
 <?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>
+  <version>2.246-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.51-SNAPSHOT</version>
+    <version>8.13.52-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -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>
@@ -75,7 +85,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.51-SNAPSHOT</version>
+      <version>8.13.52-SNAPSHOT</version>
     </dependency>
   </dependencies>