diff options
| author | Christian Edward Gruber <cgruber@google.com> | 2014-02-13 10:37:24 -0800 |
|---|---|---|
| committer | Christian Edward Gruber <cgruber@google.com> | 2014-02-13 10:41:42 -0800 |
| commit | 3236b100a95b739577dfcd117c24615370a1d0af (patch) | |
| tree | 98bf3967526d67be2edd0ddd0c1ae0ffeacaba09 /pom.xml | |
| parent | bb63dc1a4fc5d5cec7692090856809bab75b4f8c (diff) | |
| download | guice-3236b100a95b739577dfcd117c24615370a1d0af.tar.gz | |
Replace guava 11 with 16 and extract Guava as a separate dependency.
Also, tidy up a teensy bit of test infrastructure, make sure OSGI test is excluded since it's designed for ant-only, and make maven tests fork, as they run out of permgen consistently. Lastly, make the build system enforce a 1.6 minimum, not a 1.5 minimum.
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 92 |
1 files changed, 10 insertions, 82 deletions
@@ -111,14 +111,10 @@ See the Apache License Version 2.0 for the specific language governing permissio </properties> <dependencies> - <!-- - | Run tests with TestNG - --> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.11</version> - <classifier>jdk15</classifier> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> <scope>test</scope> </dependency> </dependencies> @@ -174,21 +170,25 @@ See the Apache License Version 2.0 for the specific language governing permissio <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.6</version> + <version>1.10</version> <configuration> <signature> <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java15</artifactId> + <artifactId>java16</artifactId> <version>1.0</version> </signature> </configuration> <executions> <execution> - <id>check-java-1.5-compat</id> + <id>check-java-1.6-compat</id> <phase>process-classes</phase> <goals> <goal>check</goal> @@ -196,78 +196,6 @@ See the Apache License Version 2.0 for the specific language governing permissio </execution> </executions> </plugin> - <!-- - | Shared JarJar configuration - --> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>jarjar-maven-plugin</artifactId> - <version>1.4</version> - <configuration> - <rules> - <rule> - <pattern>net.sf.cglib.*</pattern> - <result>com.google.inject.internal.cglib.$@1</result> - </rule> - <rule> - <pattern>net.sf.cglib.**.*</pattern> - <result>com.google.inject.internal.cglib.@1.$@2</result> - </rule> - <rule> - <pattern>org.objectweb.asm.*</pattern> - <result>com.google.inject.internal.asm.$@1</result> - </rule> - <rule> - <pattern>org.objectweb.asm.**.*</pattern> - <result>com.google.inject.internal.asm.@1.$@2</result> - </rule> - <rule> - <pattern>com.google.common.*</pattern> - <result>com.google.inject.internal.guava.$@1</result> - </rule> - <rule> - <pattern>com.google.common.**.*</pattern> - <result>com.google.inject.internal.guava.@1.$@2</result> - </rule> - <keep> - <pattern>com.google.inject.**</pattern> - </keep> - <keep> - <pattern>com.googlecode.**</pattern> - </keep> - <keep> - <!-- the servlet extension uses this but core doesn't, - so we explicitly instruct the build to keep it. --> - <pattern>com.google.common.base.Throwables</pattern> - </keep> - </rules> - </configuration> - <!-- - | JarJar all classes before running tests - --> - <executions> - <execution> - <id>jarjar-classes</id> - <phase>process-test-classes</phase> - <goals> - <goal>jarjar</goal> - </goals> - <configuration> - <input>{classes}</input> - </configuration> - </execution> - <execution> - <id>jarjar-test-classes</id> - <phase>process-test-classes</phase> - <goals> - <goal>jarjar</goal> - </goals> - <configuration> - <input>{test-classes}</input> - </configuration> - </execution> - </executions> - </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.5</version> |