Merge branch 'master' into dependabot/maven/java/demo/maven-1b7e7d95da

Author: mandlil

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: v9.0.3.
+Last demo update: v9.0.4.
 
 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

@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #include "phonenumbers/phonenumbermatcher.h"
+#include <memory>
 #include <string>
 #include <vector>
 #include <limits>
@@ -78,8 +79,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   // fuzz the matching with the icu adapter
   std::string matched_string;
   i18n::phonenumbers::ICURegExpFactory factory;
-  i18n::phonenumbers::RegExp* regexp = factory.CreateRegExp(regexp_string);
+  std::unique_ptr<i18n::phonenumbers::RegExp> regexp(
+    factory.CreateRegExp(regexp_string));
   regexp->Match(text, full_match, &matched_string);
 
   return 0;
-}
+}

cpp/src/phonenumbers/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>2.4-SNAPSHOT</version>
+  <version>2.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.4-SNAPSHOT</version>
+    <version>9.0.5-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -81,12 +81,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.4-SNAPSHOT</version>
+      <version>9.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>3.4-SNAPSHOT</version>
+      <version>3.5-SNAPSHOT</version>
     </dependency>
   </dependencies>