Author: dwoods
Date: Fri Oct 29 14:00:35 2010
New Revision: 1028748
URL: http://svn.apache.org/viewvc?rev=1028748&view=rev
Log:
OPENJPA-1861 build updates to support using Maven 3.0
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-jdbc/pom.xml
openjpa/trunk/openjpa-kernel/pom.xml
openjpa/trunk/openjpa-lib/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-all/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=1028748&r1=1028747&r2=1028748&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Fri Oct 29 14:00:35 2010
@@ -58,6 +58,7 @@
Need to disable jar plugin here, as it overwrites the shade
plugin created binary jar.
-->
+ <!-- exclude for shade-1.4 and maven 3.0
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -68,7 +69,7 @@
</execution>
</executions>
</plugin>
-
+ -->
<!-- Create our aggregate all JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: openjpa/trunk/openjpa-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/pom.xml?rev=1028748&r1=1028747&r2=1028748&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc/pom.xml Fri Oct 29 14:00:35 2010
@@ -70,7 +70,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
</dependency>
Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?rev=1028748&r1=1028747&r2=1028748&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Fri Oct 29 14:00:35 2010
@@ -61,7 +61,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
</dependency>
Modified: openjpa/trunk/openjpa-lib/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?rev=1028748&r1=1028747&r2=1028748&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Fri Oct 29 14:00:35 2010
@@ -62,7 +62,7 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
</dependency>
Modified: openjpa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1028748&r1=1028747&r2=1028748&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Fri Oct 29 14:00:35 2010
@@ -545,9 +545,9 @@
<version>${slf4jVersion}</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
@@ -606,7 +606,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -673,7 +673,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -713,6 +713,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy site site-deploy</goals>
@@ -728,19 +729,26 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
- <version>1.7.0</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
+ <!-- tries to pull in older ant-1.5.jar -->
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -761,23 +769,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-velocity</artifactId>
- <version>1.1.3</version>
- </dependency>
- </dependencies>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<executions>
<execution>
<id>default-jar</id>
