Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/java-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# it's safe to remove the first line entirely.
- name: Test Build Tools with Maven
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
- name: Test Java API with Ant
run: |
Expand Down
9 changes: 5 additions & 4 deletions java/carrier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<modelVersion>4.0.0</modelVersion>
<artifactId>carrier</artifactId>
<version>2.9-SNAPSHOT</version>
<version>2.10-SNAPSHOT</version>
<packaging>jar</packaging>
<name>carrier</name>
<url>https://github.com/google/libphonenumber/</url>

<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -81,12 +82,12 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>prefixmapper</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
11 changes: 6 additions & 5 deletions java/demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>demo</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
<packaging>war</packaging>
<name>demo</name>
<url>https://github.com/google/libphonenumber/</url>
<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</parent>

<properties>
Expand Down Expand Up @@ -68,17 +69,17 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>geocoder</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>carrier</artifactId>
<version>2.9-SNAPSHOT</version>
<version>2.10-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
9 changes: 5 additions & 4 deletions java/geocoder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<modelVersion>4.0.0</modelVersion>
<artifactId>geocoder</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
<packaging>jar</packaging>
<name>geocoder</name>
<url>https://github.com/google/libphonenumber/</url>

<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -91,12 +92,12 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>prefixmapper</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
7 changes: 4 additions & 3 deletions java/internal/prefixmapper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<modelVersion>4.0.0</modelVersion>
<artifactId>prefixmapper</artifactId>
<version>3.9-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
<packaging>jar</packaging>
<name>prefixmapper</name>
<url>https://github.com/google/libphonenumber/</url>

<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -83,7 +84,7 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
5 changes: 3 additions & 2 deletions java/libphonenumber/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<modelVersion>4.0.0</modelVersion>
<artifactId>libphonenumber</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
<packaging>jar</packaging>
<name>libphonenumber</name>
<url>https://github.com/google/libphonenumber/</url>

<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
</parent>

<build>
Expand Down
55 changes: 24 additions & 31 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
<version>9.0.9-SNAPSHOT</version>
<version>9.0.10-SNAPSHOT</version>
<packaging>pom</packaging>
<name>libphonenumber-parent</name>
<url>https://github.com/google/libphonenumber/</url>

<description>
Expand Down Expand Up @@ -166,6 +167,28 @@
<encoding>UTF-8</encoding>
</configuration>
</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>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
Expand All @@ -178,36 +201,6 @@
</plugins>
</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
and default SCM dependencies. On 11. Jan, 2017 that was no longer the
case, presumably because the default SCM version changed (cannot find
Expand Down
Loading