diff options
author | Grant Menke <grantmenke@google.com> | 2023-10-17 22:06:59 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-10-17 22:06:59 +0000 |
commit | 7ae3da0ed02d08883b654d6ffb662abd73e0d3ad (patch) | |
tree | 4d774a2781bff5ffa068be7e3accd68ba16299be | |
parent | 23bf80daadfa5db86643296585a868d7abf367b1 (diff) | |
parent | 911fda45d0e10b186c0dcedbf79101ef65cc7843 (diff) | |
download | libphonenumber-7ae3da0ed02d08883b654d6ffb662abd73e0d3ad.tar.gz |
Merge "Update libphonenumber to v8.13.23" into main
20 files changed, 57 insertions, 22 deletions
diff --git a/README.version b/README.version index 7667b113..1ac6a25c 100644 --- a/README.version +++ b/README.version @@ -1,3 +1,3 @@ URL: https://github.com/googlei18n/libphonenumber/ -Version: 8.13.22 +Version: 8.13.23 BugComponent: 20868 @@ -11,6 +11,8 @@ <property name="prefixmapper.test.dir" value="internal/prefixmapper/test"/> <property name="build.dir" value="build"/> <property name="classes.dir" value="${build.dir}/classes"/> + <property name="script.dir" value="script"/> + <property name="script.name" value="download-junit-jars.sh"/> <property name="jar.dir" value="${build.dir}/jar"/> <property name="lib.dir" value="lib"/> <property name="report.dir" value="${build.dir}/junitreport"/> @@ -31,6 +33,13 @@ </fileset> </path> + <target name="download-jars"> + <!-- Execute the shell script to download junit and mockito jars --> + <exec executable="sh" dir="${script.dir}"> + <arg value="${script.name}"/> + </exec> + </target> + <target name="build-phone-metadata"> <exec executable="java"> <arg value="-jar" /> @@ -186,7 +195,7 @@ </target> <target name="compile" description="Compile Java source." - depends="build-phone-metadata,build-short-metadata,build-alternate-metadata,build-carrier-data,build-geo-data,build-timezones-data"> + depends="download-jars,build-phone-metadata,build-short-metadata,build-alternate-metadata,build-carrier-data,build-geo-data,build-timezones-data"> <mkdir dir="${classes.dir}"/> <javac srcdir="${libphonenumber.src.dir};${carrier.src.dir};${geocoder.src.dir};${prefixmapper.src.dir}" destdir="${classes.dir}" classpathref="classpath" includeAntRuntime="false" encoding="UTF-8"/> diff --git a/carrier/pom.xml b/carrier/pom.xml index 475645a8..4a616ce1 100644 --- a/carrier/pom.xml +++ b/carrier/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.206</version> + <version>1.207</version> <packaging>jar</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> </parent> <build> @@ -79,12 +79,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.216</version> + <version>2.217</version> </dependency> </dependencies> diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en Binary files differindex 450e661a..27c080bb 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en Binary files differindex 0f21fc2d..4f062dfe 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en Binary files differindex bdff7482..3164cb4b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/30_en diff --git a/demo/pom.xml b/demo/pom.xml index 17f47cff..27afdf0e 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> <packaging>war</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> </parent> <properties> @@ -68,17 +68,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.216</version> + <version>2.217</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.206</version> + <version>1.207</version> </dependency> </dependencies> diff --git a/geocoder/pom.xml b/geocoder/pom.xml index 2edf19e6..9be18af3 100644 --- a/geocoder/pom.xml +++ b/geocoder/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.216</version> + <version>2.217</version> <packaging>jar</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> </parent> <build> @@ -87,12 +87,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.216</version> + <version>2.217</version> </dependency> </dependencies> diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml index 605fafb8..622c95ca 100644 --- a/internal/prefixmapper/pom.xml +++ b/internal/prefixmapper/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.216</version> + <version>2.217</version> <packaging>jar</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -75,7 +75,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> </dependency> </dependencies> diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index 460c8015..f214eac7 100644 --- a/libphonenumber/pom.xml +++ b/libphonenumber/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> <packaging>jar</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> </parent> <build> diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW Binary files differindex 9f2d7305..a351b32a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE Binary files differindex a8615534..10e027f3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU Binary files differindex 6d48846c..c66a2139 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE Binary files differindex 8a9203aa..44be786b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.22</version> + <version>8.13.23</version> <packaging>pom</packaging> <url>https://github.com/google/libphonenumber/</url> @@ -34,7 +34,7 @@ <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.22</tag> + <tag>v8.13.23</tag> </scm> <properties> diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW Binary files differindex 9f2d7305..a351b32a 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE Binary files differindex a8615534..10e027f3 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU Binary files differindex 6d48846c..c66a2139 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE Binary files differindex 8a9203aa..44be786b 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE diff --git a/script/download-junit-jars.sh b/script/download-junit-jars.sh new file mode 100644 index 00000000..aa577a26 --- /dev/null +++ b/script/download-junit-jars.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# Set the version of JUnit and Mockito +junit_version="4.13.1" +mockito_version="1.10.19" +cd ../ +# Function to download a JAR if not available +download_jar() { + local jar_name="$1" + local jar_filename="$2" + local download_url="$3" + + if [ ! -f "lib/$jar_filename" ]; then + echo "Downloading $jar_name..." + wget "$download_url" -P lib + else + echo "$jar_name already exists in lib directory." + fi +} + +# Check and download JUnit&Mockito JAR +download_jar "JUnit" "junit-$junit_version.jar" "https://repo1.maven.org/maven2/junit/junit/$junit_version/junit-$junit_version.jar" +download_jar "Mockito" "mockito-all-$mockito_version.jar" "https://repo1.maven.org/maven2/org/mockito/mockito-all/$mockito_version/mockito-all-$mockito_version.jar" + +# Run the mvn install command for the Snapshot jars +cd ../ +mvn clean install |