From e02e7aa1e2210cf24172e6aff78a5d899ced8097 Mon Sep 17 00:00:00 2001
From: Keghani Kouzoujian <keghani@users.noreply.github.com>
Date: Wed, 6 Jul 2016 12:11:20 +0200
Subject: [PATCH] Fix Maven project hierarchy and plugin versions, also moving
 towards a hermetic build (#1192)

Great!
---
 java/demo/pom.xml             |  2 +-
 java/libphonenumber/pom.xml   |  1 +
 java/pom.xml                  |  8 ++++----
 tools/java/common/pom.xml     |  2 ++
 tools/java/cpp-build/pom.xml  |  4 ++++
 tools/java/data/pom.xml       | 12 +-----------
 tools/java/java-build/pom.xml |  2 ++
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/java/demo/pom.xml b/java/demo/pom.xml
index a1e3345b6..015d9e0ef 100644
--- a/java/demo/pom.xml
+++ b/java/demo/pom.xml
@@ -31,7 +31,7 @@
       <version>2.5</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
+      <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>1.3.2</version>
     </dependency>
diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index 3f197d8bf..d20340495 100644
--- a/java/libphonenumber/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -31,6 +31,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
         <configuration>
           <excludes>
             <exclude>com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.class</exclude>
diff --git a/java/pom.xml b/java/pom.xml
index 203ac0927..f54f22421 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -8,9 +8,9 @@
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
+    <groupId>com.google.i18n.phonenumbers</groupId>
+    <artifactId>libphonenumber-build-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
   <description>
@@ -92,7 +92,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.12</version>
         <configuration>
-          <forkMode>never</forkMode>
+          <forkCount>0</forkCount>
           <includes>
             <include>**/*Test.java</include>
           </includes>
diff --git a/tools/java/common/pom.xml b/tools/java/common/pom.xml
index 456c7f589..14beba550 100644
--- a/tools/java/common/pom.xml
+++ b/tools/java/common/pom.xml
@@ -21,6 +21,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -31,6 +32,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
         <executions>
           <execution>
             <id>add-source</id>
diff --git a/tools/java/cpp-build/pom.xml b/tools/java/cpp-build/pom.xml
index c99811dea..0f2fb6677 100644
--- a/tools/java/cpp-build/pom.xml
+++ b/tools/java/cpp-build/pom.xml
@@ -25,6 +25,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -33,6 +34,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -56,6 +58,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <version>1.4.0</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -76,6 +79,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
         <configuration>
           <archive>
             <manifest>
diff --git a/tools/java/data/pom.xml b/tools/java/data/pom.xml
index ef04c1864..77aeca15f 100644
--- a/tools/java/data/pom.xml
+++ b/tools/java/data/pom.xml
@@ -47,15 +47,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>net.kindleit</groupId>
-        <artifactId>maven-gae-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -80,13 +77,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <warSourceDirectory>webapp</warSourceDirectory>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
diff --git a/tools/java/java-build/pom.xml b/tools/java/java-build/pom.xml
index 77d860bef..3caa92261 100644
--- a/tools/java/java-build/pom.xml
+++ b/tools/java/java-build/pom.xml
@@ -43,6 +43,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -51,6 +52,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
         <executions>
           <execution>
             <id>add-source</id>