RuhNetConsulting
/
libphonenumber
mirror of https://github.com/google/libphonenumber
1
1
Fork 0
Code Issues 0 Projects 0 Releases 254 Wiki Activity
Browse Source

Merge branch 'master' into ethrynto-patch-1

pull/3883/head
Ethrynto 5 months ago
committed by GitHub
parent
192ed9480b 32b72195c8
commit
17de05b469
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
8 changed files with 49 additions and 51 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      .github/workflows/java-unit-test.yml
  2. +1
    -1
      README.md
  3. +5
    -4
      java/carrier/pom.xml
  4. +6
    -5
      java/demo/pom.xml
  5. +5
    -4
      java/geocoder/pom.xml
  6. +4
    -3
      java/internal/prefixmapper/pom.xml
  7. +3
    -2
      java/libphonenumber/pom.xml
  8. +24
    -31
      java/pom.xml

+ 1
- 1
.github/workflows/java-unit-test.yml View File

@ -28,7 +28,7 @@ jobs:
# it's safe to remove the first line entirely. # it's safe to remove the first line entirely.
- name: Test Build Tools with Maven - name: Test Build Tools with Maven
run: | run: |
mvn install -P github-actions -DskipTests=true -Dmaven.javadoc.skip=true -B -V
mvn install -P github-actions -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true -B -V
mvn -P github-actions test mvn -P github-actions test
- name: Test Java API with Ant - name: Test Java API with Ant
run: | run: |


+ 1
- 1
README.md View File

@ -55,7 +55,7 @@ Cream Sandwich).
The [Java demo](https://libphonenumber.appspot.com/) is updated with a slight The [Java demo](https://libphonenumber.appspot.com/) is updated with a slight
delay after the GitHub release. delay after the GitHub release.
Last demo update: v9.0.8.
Last demo update: v9.0.9.
Note: Even though the library (main branch/[maven release](https://repo1.maven.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.12.56/)) 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 is at v8.12.57, because of some deployment issues, we were unable to update the


+ 5
- 4
java/carrier/pom.xml View File

@ -2,14 +2,15 @@
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>carrier</artifactId> <artifactId>carrier</artifactId>
<version>2.9-SNAPSHOT</version>
<version>2.10-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>carrier</name>
<url>https://github.com/google/libphonenumber/</url> <url>https://github.com/google/libphonenumber/</url>
<parent> <parent>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId> <artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</parent> </parent>
<build> <build>
@ -81,12 +82,12 @@
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId> <artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>prefixmapper</artifactId> <artifactId>prefixmapper</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>


+ 6
- 5
java/demo/pom.xml View File

@ -3,13 +3,14 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>demo</artifactId> <artifactId>demo</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>demo</name>
<url>https://github.com/google/libphonenumber/</url> <url>https://github.com/google/libphonenumber/</url>
<parent> <parent>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId> <artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
@ -68,17 +69,17 @@
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId> <artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>geocoder</artifactId> <artifactId>geocoder</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>carrier</artifactId> <artifactId>carrier</artifactId>
<version>2.9-SNAPSHOT</version>
<version>2.10-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>


+ 5
- 4
java/geocoder/pom.xml View File

@ -2,14 +2,15 @@
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>geocoder</artifactId> <artifactId>geocoder</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>geocoder</name>
<url>https://github.com/google/libphonenumber/</url> <url>https://github.com/google/libphonenumber/</url>
<parent> <parent>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId> <artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</parent> </parent>
<build> <build>
@ -91,12 +92,12 @@
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId> <artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>prefixmapper</artifactId> <artifactId>prefixmapper</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>


+ 4
- 3
java/internal/prefixmapper/pom.xml View File

@ -2,14 +2,15 @@
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>prefixmapper</artifactId> <artifactId>prefixmapper</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>prefixmapper</name>
<url>https://github.com/google/libphonenumber/</url> <url>https://github.com/google/libphonenumber/</url>
<parent> <parent>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId> <artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
@ -83,7 +84,7 @@
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId> <artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>


+ 3
- 2
java/libphonenumber/pom.xml View File

@ -2,14 +2,15 @@
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>libphonenumber</artifactId> <artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>libphonenumber</name>
<url>https://github.com/google/libphonenumber/</url> <url>https://github.com/google/libphonenumber/</url>
<parent> <parent>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId> <artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</parent> </parent>
<build> <build>


+ 24
- 31
java/pom.xml View File

@ -3,8 +3,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId> <artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>libphonenumber-parent</name>
<url>https://github.com/google/libphonenumber/</url> <url>https://github.com/google/libphonenumber/</url>
<description> <description>
@ -166,6 +167,28 @@
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration>
<gpgArguments>
<arg>--batch</arg>
<arg>--yes</arg>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.sonatype.central</groupId> <groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId> <artifactId>central-publishing-maven-plugin</artifactId>
@ -178,36 +201,6 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<!-- Until 08. Dec 2016, this pom worked with maven-release-plugin at 2.2.1 <!-- Until 08. Dec 2016, this pom worked with maven-release-plugin at 2.2.1
and default SCM dependencies. On 11. Jan, 2017 that was no longer the and default SCM dependencies. On 11. Jan, 2017 that was no longer the
case, presumably because the default SCM version changed (cannot find case, presumably because the default SCM version changed (cannot find


Write Preview
Loading…
Cancel
Save