Browse Source

Fix Maven project hierarchy and plugin versions, also moving towards a hermetic build (#1192)

Great!
reviewable/pr1206/r1
Keghani Kouzoujian 10 years ago
committed by lararennie
parent
commit
e02e7aa1e2
7 changed files with 15 additions and 16 deletions
  1. +1
    -1
      java/demo/pom.xml
  2. +1
    -0
      java/libphonenumber/pom.xml
  3. +4
    -4
      java/pom.xml
  4. +2
    -0
      tools/java/common/pom.xml
  5. +4
    -0
      tools/java/cpp-build/pom.xml
  6. +1
    -11
      tools/java/data/pom.xml
  7. +2
    -0
      tools/java/java-build/pom.xml

+ 1
- 1
java/demo/pom.xml View File

@ -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>


+ 1
- 0
java/libphonenumber/pom.xml View File

@ -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>


+ 4
- 4
java/pom.xml View File

@ -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>


+ 2
- 0
tools/java/common/pom.xml View File

@ -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>


+ 4
- 0
tools/java/cpp-build/pom.xml View File

@ -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>


+ 1
- 11
tools/java/data/pom.xml View File

@ -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>


+ 2
- 0
tools/java/java-build/pom.xml View File

@ -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>


Loading…
Cancel
Save