You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/02/03 23:49:04 UTC
svn commit: r740498 - in /openjpa/branches/1.3.x: ./ openjpa-all/
openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc/
openjpa-kernel/ openjpa-lib/ openjpa-persistence-jdbc/ openjpa-persistence/
openjpa-project/ openjpa-slice/ openjpa-x...
Author: mikedd
Date: Tue Feb 3 22:49:04 2009
New Revision: 740498
URL: http://svn.apache.org/viewvc?rev=740498&view=rev
Log:
OPENJPA-772 committing patch provided by Donald Woods
Modified:
openjpa/branches/1.3.x/openjpa-all/pom.xml
openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml
openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
openjpa/branches/1.3.x/openjpa-jdbc/pom.xml
openjpa/branches/1.3.x/openjpa-kernel/pom.xml
openjpa/branches/1.3.x/openjpa-lib/pom.xml
openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.3.x/openjpa-persistence/pom.xml
openjpa/branches/1.3.x/openjpa-project/pom.xml
openjpa/branches/1.3.x/openjpa-slice/pom.xml
openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml
openjpa/branches/1.3.x/pom.xml
Modified: openjpa/branches/1.3.x/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-all/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-all/pom.xml Tue Feb 3 22:49:04 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.3.x/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml Tue Feb 3 22:49:04 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.3.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml Tue Feb 3 22:49:04 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.3.x/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-jdbc/pom.xml Tue Feb 3 22:49:04 2009
@@ -61,15 +61,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: openjpa/branches/1.3.x/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-kernel/pom.xml Tue Feb 3 22:49:04 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.4</version>
@@ -90,6 +83,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -121,8 +115,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.3.x/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-lib/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-lib/pom.xml Tue Feb 3 22:49:04 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>
<execution>
Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Tue Feb 3 22:49:04 2009
@@ -336,13 +336,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>
@@ -354,13 +352,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.3.x/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence/pom.xml Tue Feb 3 22:49:04 2009
@@ -46,16 +46,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.3.x/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/pom.xml Tue Feb 3 22:49:04 2009
@@ -1,3 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
To build the distribution files from project root:
@@ -96,6 +118,7 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -131,6 +154,7 @@
content from the openjpa-project module.
-->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -146,11 +170,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>
@@ -337,6 +376,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -378,13 +418,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>
@@ -405,4 +438,4 @@
<artifactId>derby</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: openjpa/branches/1.3.x/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-slice/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-slice/pom.xml Tue Feb 3 22:49:04 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.3.x/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-xmlstore/pom.xml Tue Feb 3 22:49:04 2009
@@ -41,15 +41,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: openjpa/branches/1.3.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/pom.xml?rev=740498&r1=740497&r2=740498&view=diff
==============================================================================
--- openjpa/branches/1.3.x/pom.xml (original)
+++ openjpa/branches/1.3.x/pom.xml Tue Feb 3 22:49:04 2009
@@ -21,6 +21,11 @@
Maven release plugin requires the project tag to be on a single line.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<prerequisites>
<maven>2.0.4</maven>
@@ -32,6 +37,7 @@
<description>OpenJPA</description>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openjpa.version>${pom.version}</openjpa.version>
</properties>
@@ -122,7 +128,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 +159,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 +172,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 +182,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 +266,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 +312,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
<executions>
<execution>
<phase>verify</phase>
@@ -486,6 +486,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>
@@ -518,6 +519,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>
@@ -547,12 +549,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>
@@ -569,6 +655,7 @@
</reportSets>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>