Author: mikedd
Date: Tue Feb 3 21:35:20 2009
New Revision: 740460
URL: http://svn.apache.org/viewvc?rev=740460&view=rev
Log:
OPENJPA-772 committing patch provided by Donald Woods
Modified:
openjpa/branches/1.0.x/openjpa-all/pom.xml
openjpa/branches/1.0.x/openjpa-examples/pom.xml
openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml
openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml
openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml
openjpa/branches/1.0.x/openjpa-jdbc/pom.xml
openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml
openjpa/branches/1.0.x/openjpa-kernel/pom.xml
openjpa/branches/1.0.x/openjpa-lib-5/pom.xml
openjpa/branches/1.0.x/openjpa-lib/pom.xml
openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.0.x/openjpa-persistence/pom.xml
openjpa/branches/1.0.x/openjpa-project/pom.xml
openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml
openjpa/branches/1.0.x/pom.xml
Modified: openjpa/branches/1.0.x/openjpa-all/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-all/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-all/pom.xml Tue Feb 3 21:35:20 2009
@@ -50,6 +50,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.0.x/openjpa-examples/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-examples/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-examples/pom.xml Tue Feb 3 21:35:20 2009
@@ -65,8 +65,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
<!--
need to skip reversemapping since it depends on
classes that are generated by the build.xml file
Modified: openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml Tue Feb 3
21:35:20 2009
@@ -45,6 +45,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml Tue Feb 3 21:35:20
2009
@@ -63,6 +63,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml Tue Feb 3 21:35:20 2009
@@ -46,16 +46,4 @@
<version>2.0</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: openjpa/branches/1.0.x/openjpa-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-jdbc/pom.xml Tue Feb 3 21:35:20 2009
@@ -41,6 +41,7 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArguments>
@@ -70,6 +71,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
Modified: openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml Tue Feb 3 21:35:20 2009
@@ -47,16 +47,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: openjpa/branches/1.0.x/openjpa-kernel/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-kernel/pom.xml Tue Feb 3 21:35:20 2009
@@ -41,6 +41,7 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArguments>
@@ -82,6 +83,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
@@ -123,6 +125,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/branches/1.0.x/openjpa-lib-5/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-lib-5/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-lib-5/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-lib-5/pom.xml Tue Feb 3 21:35:20 2009
@@ -41,16 +41,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: openjpa/branches/1.0.x/openjpa-lib/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-lib/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-lib/pom.xml Tue Feb 3 21:35:20 2009
@@ -41,6 +41,7 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArguments>
@@ -100,6 +101,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
@@ -113,6 +115,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.0.x/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml Tue Feb 3 21:35:20
2009
@@ -375,13 +375,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.0.x/openjpa-persistence/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/pom.xml Tue Feb 3 21:35:20 2009
@@ -47,16 +47,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: openjpa/branches/1.0.x/openjpa-project/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-project/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-project/pom.xml Tue Feb 3 21:35:20 2009
@@ -122,6 +122,7 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -157,6 +158,7 @@
content from the openjpa-project module.
-->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -172,11 +174,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>
@@ -333,6 +350,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -380,13 +398,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.0.x/openjpa-xmlstore/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml Tue Feb 3 21:35:20 2009
@@ -41,6 +41,7 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArguments>
@@ -64,6 +65,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
Modified: openjpa/branches/1.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.0.x/pom.xml?rev=740460&r1=740459&r2=740460&view=diff
==============================================================================
--- openjpa/branches/1.0.x/pom.xml (original)
+++ openjpa/branches/1.0.x/pom.xml Tue Feb 3 21:35:20 2009
@@ -34,6 +34,7 @@
<properties>
<scm.dir>svn.apache.org/repos/asf/openjpa/branches/1.0.x</scm.dir>
<openjpa.version>${pom.version}</openjpa.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<!--
@@ -143,7 +144,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
<executions>
<execution>
<phase>process-sources</phase>
@@ -194,7 +194,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
@@ -225,7 +224,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-3</version>
<executions>
<execution>
<goals>
@@ -237,7 +235,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>
@@ -287,7 +284,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<phase>process-classes</phase>
@@ -334,7 +330,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
<executions>
<execution>
<phase>verify</phase>
@@ -391,6 +386,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>
@@ -423,6 +419,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>
@@ -452,12 +449,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>
@@ -476,6 +557,7 @@
</reportSets>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
