[maven-release-plugin] prepare for next development iteration

[platform/upstream/libphonenumber.git] / java / pom.xml

diff --git a/java/pom.xml b/java/pom.xml
index 04015a3..04d0a23 100644 (file)
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -2,10 +2,9 @@
 <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>
   <groupId>com.googlecode.libphonenumber</groupId>
-  <artifactId>libphonenumber</artifactId>
-  <version>3.6-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>libphonenumber</name>
+  <artifactId>libphonenumber-parent</artifactId>
+  <version>7.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
   <url>http://code.google.com/p/libphonenumber/</url>
 
   <parent>
@@ -37,6 +36,10 @@
     <url>scm:svn:http://libphonenumber.googlecode.com/svn/trunk/java/</url>
   </scm>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <developers>
     <developer>
       <id>jia.shao.peng</id>
@@ -74,115 +77,25 @@
     </contributor>
   </contributors>
 
+  <modules>
+    <module>libphonenumber</module>
+    <module>internal/prefixmapper</module>
+    <module>carrier</module>
+    <module>geocoder</module>
+    <module>demo</module>
+  </modules>
+
   <build>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/com/google/i18n/phonenumbers/data</directory>
-        <targetPath>com/google/i18n/phonenumbers/data</targetPath>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>test/com/google/i18n/phonenumbers/data</directory>
-        <targetPath>com/google/i18n/phonenumbers/data</targetPath>
-      </testResource>
-      <testResource>
-        <directory>test/com/google/i18n/phonenumbers/geocoding/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data</targetPath>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2</version>
-        <executions>
-          <execution>
-            <id>build-metadata</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>java</executable>
-              <arguments>
-                <argument>-jar</argument>
-                <argument>../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar</argument>
-                <argument>BuildMetadataProtoFromXml</argument>
-                <argument>../resources/PhoneNumberMetaData.xml</argument>
-                <argument>src</argument>
-                <argument>false</argument> <!-- Not for testing. -->
-                <argument>false</argument> <!-- No lite metadata. -->
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>build-test-metadata</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>java</executable>
-              <arguments>
-                <argument>-jar</argument>
-                <argument>../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar</argument>
-                <argument>BuildMetadataProtoFromXml</argument>
-                <argument>../resources/PhoneNumberMetaDataForTesting.xml</argument>
-                <argument>test</argument>
-                <argument>true</argument> <!-- For testing. -->
-                <argument>false</argument> <!-- No lite metadata. -->
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>build-geo-data</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>java</executable>
-              <arguments>
-                <argument>-jar</argument>
-                <argument>../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar</argument>
-                <argument>GenerateAreaCodeData</argument>
-                <argument>../resources/geocoding</argument>
-                <argument>src/com/google/i18n/phonenumbers/geocoding/data</argument>
-                <argument>false</argument> <!-- Not for testing. -->
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>build-geo-test-data</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>java</executable>
-              <arguments>
-                <argument>-jar</argument>
-                <argument>../tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar</argument>
-                <argument>GenerateAreaCodeData</argument>
-                <argument>../resources/test/geocoding</argument>
-                <argument>test/com/google/i18n/phonenumbers/geocoding/testing_data</argument>
-                <argument>true</argument> <!-- For testing. -->
-              </arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.12</version>
         <configuration>
-          <excludes>
-            <exclude>**/geocoding/</exclude>
-          </excludes>
+          <forkMode>never</forkMode>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
         </configuration>
       </plugin>
       <plugin>
@@ -213,11 +126,10 @@
       </plugin>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-7</version>
+        <version>2.2.1</version>
         <configuration>
-          <tagBase>
-            https://libphonenumber.googlecode.com/svn/tags/
-          </tagBase>
+          <tagBase>https://libphonenumber.googlecode.com/svn/tags/</tagBase>
+          <tagNameFormat>libphonenumber-@{project.version}</tagNameFormat>
         </configuration>
       </plugin>
       <plugin>
@@ -262,10 +174,6 @@
     </profile>
   </profiles>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>junit</groupId>