Merge branch 'master' into name-mismatch

Author: silvio2402

.github/workflows/osv-scanner-unified.yml

@@ -35,7 +35,7 @@ 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@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
+    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: |-
@@ -45,7 +45,7 @@ jobs:
   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@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
+    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: |-

.gitignore

@@ -1,5 +1,14 @@
-target/
-!tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
-build/
-lib/
-generated/
+# Ignore build directories and any files generated by the update script.
+cpp/build/
+cpp/src/phonenumbers/geocoding/geocoding_data.cc
+cpp/src/phonenumbers/phonemetadata.pb.*
+cpp/src/phonenumbers/phonenumber.pb.*
+cpp/test/phonenumbers/geocoding/geocoding_test_data.cc
+java/build/
+java/demo/war/WEB-INF/classes/
+java/demo/war/WEB-INF/lib/
+java/**/target/
+# Ignore the logs directory
+/logs/
+# Ignore ourselves because this is not intended to be submitted.
+/.gitignore

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.52.
+Last demo update: v8.13.53.
 
 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

cpp/src/phonenumbers/lite_metadata.cc

@@ -2,14 +2,14 @@
 <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>
   <artifactId>carrier</artifactId>
-  <version>1.237-SNAPSHOT</version>
+  <version>1.238-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.53-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -81,12 +81,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.53-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.247-SNAPSHOT</version>
+      <version>2.248-SNAPSHOT</version>
     </dependency>
   </dependencies>