Author: mikedd
Date: Tue Feb 3 21:18:54 2009
New Revision: 740453
URL: http://svn.apache.org/viewvc?rev=740453&view=rev
Log:
OPENJPA-772 committing patch provided by Donald Woods
Modified:
openjpa/branches/1.2.x/openjpa-all/pom.xml
openjpa/branches/1.2.x/openjpa-integration/examples/pom.xml
openjpa/branches/1.2.x/openjpa-integration/tck/pom.xml
openjpa/branches/1.2.x/openjpa-kernel/pom.xml
openjpa/branches/1.2.x/openjpa-lib/pom.xml
openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.2.x/openjpa-project/pom.xml
openjpa/branches/1.2.x/openjpa-slice/pom.xml
openjpa/branches/1.2.x/pom.xml
Modified: openjpa/branches/1.2.x/openjpa-all/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-all/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-all/pom.xml Tue Feb 3 21:18:54 2009
@@ -42,6 +42,7 @@
multiple same-named files to each other (which is
required for correctly aggregating services files).
-->
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/branches/1.2.x/openjpa-integration/examples/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-integration/examples/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-integration/examples/pom.xml Tue Feb 3
21:18:54 2009
@@ -47,6 +47,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/branches/1.2.x/openjpa-integration/tck/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-integration/tck/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-integration/tck/pom.xml Tue Feb 3 21:18:54
2009
@@ -70,6 +70,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/branches/1.2.x/openjpa-kernel/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/pom.xml Tue Feb 3 21:18:54 2009
@@ -65,13 +65,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>2.1</version>
@@ -106,6 +99,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -148,8 +142,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
<configuration>
<excludes>
<exclude>**/com/ibm/**</exclude>
Modified: openjpa/branches/1.2.x/openjpa-lib/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-lib/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-lib/pom.xml Tue Feb 3 21:18:54 2009
@@ -72,13 +72,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
<!--
get the svn revision number and set it in the
subversion.revision setting - disabled for now
@@ -86,6 +79,7 @@
zip (when there is no .svn/ metadata)
-->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<!--
Modified: openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-persistence-jdbc/pom.xml Tue Feb 3 21:18:54
2009
@@ -253,13 +253,11 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -271,13 +269,7 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/branches/1.2.x/openjpa-project/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-project/pom.xml Tue Feb 3 21:18:54 2009
@@ -119,6 +119,7 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -154,6 +155,7 @@
content from the openjpa-project module.
-->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -169,11 +171,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
<configuration>
<siteDirectory>target/filtered-site</siteDirectory>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Do not fail the build, as ianal will fail on
source zips due to included META-INF dirs -->
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -360,6 +377,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -407,13 +425,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-jsch</artifactId>
- <version>1.7.0</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: openjpa/branches/1.2.x/openjpa-slice/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-slice/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-slice/pom.xml Tue Feb 3 21:18:54 2009
@@ -127,13 +127,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/branches/1.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/pom.xml?rev=740453&r1=740452&r2=740453&view=diff
==============================================================================
--- openjpa/branches/1.2.x/pom.xml (original)
+++ openjpa/branches/1.2.x/pom.xml Tue Feb 3 21:18:54 2009
@@ -32,6 +32,7 @@
<description>OpenJPA</description>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openjpa.version>${pom.version}</openjpa.version>
</properties>
@@ -122,7 +123,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
@@ -154,7 +154,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-3</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -168,7 +167,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy site site-deploy</goals>
@@ -179,7 +177,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
<executions>
<execution>
<phase>verify</phase>
@@ -264,7 +261,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<phase>process-classes</phase>
@@ -311,7 +307,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
<executions>
<execution>
<phase>verify</phase>
@@ -481,6 +476,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>
@@ -513,6 +509,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
@@ -542,12 +539,96 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-jsch</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ </plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if any artifacts are missing
legal files -->
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<reporting>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
<reportSet>
@@ -564,6 +645,7 @@
</reportSets>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
