You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/08/19 19:31:55 UTC
svn commit: r987238 - in /openjpa/trunk: ./ openjpa-all/
openjpa-examples/image-gallery/ openjpa-examples/simple/
openjpa-integration/daytrader/ openjpa-integration/examples/
openjpa-integration/jmx/ openjpa-integration/slf4j/
openjpa-integration/tck/ ...
Author: dwoods
Date: Thu Aug 19 17:31:55 2010
New Revision: 987238
URL: http://svn.apache.org/viewvc?rev=987238&view=rev
Log:
OPENJPA-1712 Merge in build updates from 2.0.x branch
Added:
openjpa/trunk/openjpa-testsupport/
openjpa/trunk/openjpa-testsupport/pom.xml (with props)
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-examples/image-gallery/pom.xml
openjpa/trunk/openjpa-examples/simple/pom.xml
openjpa/trunk/openjpa-integration/daytrader/pom.xml
openjpa/trunk/openjpa-integration/examples/pom.xml
openjpa/trunk/openjpa-integration/jmx/pom.xml
openjpa/trunk/openjpa-integration/slf4j/pom.xml
openjpa/trunk/openjpa-integration/tck/pom.xml
openjpa/trunk/openjpa-integration/validation/pom.xml
openjpa/trunk/openjpa-jdbc/pom.xml
openjpa/trunk/openjpa-kernel/pom.xml
openjpa/trunk/openjpa-lib/pom.xml
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-persistence-locking/pom.xml
openjpa/trunk/openjpa-persistence/pom.xml
openjpa/trunk/openjpa-slice/pom.xml
openjpa/trunk/openjpa-xmlstore/pom.xml
openjpa/trunk/openjpa/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=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Thu Aug 19 17:31:55 2010
@@ -52,6 +52,20 @@
</execution>
</executions>
</plugin>
+ <!--
+ Need to disable jar plugin here, as it overwrites the shade
+ plugin created binary jar.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
<!-- Create our aggregate all JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -108,7 +122,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- other includes -->
<dependency>
Modified: openjpa/trunk/openjpa-examples/image-gallery/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/image-gallery/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/image-gallery/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/image-gallery/pom.xml Thu Aug 19 17:31:55 2010
@@ -51,40 +51,15 @@
<artifactId>openjpa-all</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
- <!-- The jar plugin builds a jar containing the image gallery classes -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<!-- The surefire plugin is used to run the jUnit tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<argLine>${surefire.jvm.args}</argLine>
<useFile>false</useFile>
@@ -94,6 +69,7 @@
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
<!-- Use the openjpa maven plugin to enhance the domain model classes -->
Modified: openjpa/trunk/openjpa-examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/simple/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/simple/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/simple/pom.xml Thu Aug 19 17:31:55 2010
@@ -48,21 +48,6 @@
<artifactId>openjpa-all</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: openjpa/trunk/openjpa-integration/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/daytrader/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/daytrader/pom.xml Thu Aug 19 17:31:55 2010
@@ -47,8 +47,8 @@
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${pom.version}</version>
+ <artifactId>openjpa-all</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Maybe one day we can used published artifacts for this...
<dependency>
@@ -64,25 +64,9 @@
-->
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
+ <artifactId>openjpa-testsupport</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -94,19 +78,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- old way of using antrun to enhance classes
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -154,10 +125,11 @@
</execution>
</executions>
<dependencies>
+ <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${pom.version}</version>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
Modified: openjpa/trunk/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/examples/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/examples/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/examples/pom.xml Thu Aug 19 17:31:55 2010
@@ -70,7 +70,7 @@
<path id="assembly.classpath">
<fileset dir="${examples.base}">
- <include name="**/openjpa-all-${pom.version}.jar" />
+ <include name="**/openjpa-all-${project.version}.jar" />
</fileset>
</path>
<available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
Modified: openjpa/trunk/openjpa-integration/jmx/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/jmx/pom.xml Thu Aug 19 17:31:55 2010
@@ -53,25 +53,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
+ <artifactId>openjpa-testsupport</artifactId>
<version>${project.version}</version>
- <!-- <classifier>tests</classifier> -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -148,18 +132,6 @@
</systemProperties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: openjpa/trunk/openjpa-integration/slf4j/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/slf4j/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/slf4j/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/slf4j/pom.xml Thu Aug 19 17:31:55 2010
@@ -53,44 +53,20 @@
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
+ <artifactId>openjpa-all</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
+ <artifactId>openjpa-testsupport</artifactId>
<version>${project.version}</version>
- <!-- <classifier>tests</classifier> -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- new way of using openjpa-maven-plugin to enhance classes
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: openjpa/trunk/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/pom.xml Thu Aug 19 17:31:55 2010
@@ -201,7 +201,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
@@ -430,7 +430,7 @@ databaseName=${db.name}
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Thu Aug 19 17:31:55 2010
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<!-- allow profiles to decide which validation spec to use -->
<exclusions>
<exclusion>
@@ -141,18 +141,12 @@
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
- <!-- <classifier>tests</classifier> -->
+ <artifactId>openjpa-testsupport</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>jakarta-regexp</groupId>
<artifactId>jakarta-regexp</artifactId>
<scope>test</scope>
@@ -163,18 +157,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: openjpa/trunk/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc/pom.xml Thu Aug 19 17:31:55 2010
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -81,37 +81,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Thu Aug 19 17:31:55 2010
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: openjpa/trunk/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Thu Aug 19 17:31:55 2010
@@ -140,34 +140,6 @@ openjpa.enhancer.revision=${pcenhancer.L
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Thu Aug 19 17:31:55 2010
@@ -683,12 +683,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
@@ -750,58 +750,6 @@
</execution>
</executions>
</plugin>
- <!--
- Create a o-p-j-tests.jar so we can reuse some of the base
- TestCase classes in other modules, like openjpa-integration.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>test-base-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>test-base</classifier>
- <classesDirectory>${project.build.testOutputDirectory}</classesDirectory>
- <includes>
- <!-- Note: Including entities in this jar will
- cause problems for any modules that need
- to enhance their own entities.
- -->
- <include>**/org/apache/openjpa/persistence/test/*.class</include>
- <include>META-INF/LICENSE*</include>
- <include>META-INF/NOTICE*</include>
- <include>META-INF/DISCLAIM*</include>
- </includes>
- </configuration>
- </execution>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Modified: openjpa/trunk/openjpa-persistence-locking/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-locking/pom.xml Thu Aug 19 17:31:55 2010
@@ -688,13 +688,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
- <!-- <classifier>test-base</classifier> -->
+ <artifactId>openjpa-testsupport</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -742,18 +741,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args}</argLine>
Modified: openjpa/trunk/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence/pom.xml Thu Aug 19 17:31:55 2010
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -59,37 +59,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: openjpa/trunk/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Thu Aug 19 17:31:55 2010
@@ -40,12 +40,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -128,34 +128,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${test.jvm.arguments}</argLine>
Added: openjpa/trunk/openjpa-testsupport/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-testsupport/pom.xml?rev=987238&view=auto
==============================================================================
--- openjpa/trunk/openjpa-testsupport/pom.xml (added)
+++ openjpa/trunk/openjpa-testsupport/pom.xml Thu Aug 19 17:31:55 2010
@@ -0,0 +1,117 @@
+<?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.
+-->
+<!--
+ Please keep the project tag on one line to avoid confusing
+ the release plugin.
+-->
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-testsupport</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenJPA Test Support Jar</name>
+
+ <dependencies>
+ <!-- make sure we build after o-p-j -->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- need a depend on o-p-j tests jar -->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!--
+ Manually build a subset jar of o-p-j-tests.jar
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>extract-jar</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <unjar overwrite="true" dest="${project.build.testOutputDirectory}">
+ <fileset dir="${basedir}/../openjpa-persistence-jdbc">
+ <include name="target/openjpa-persistence-jdbc-${project.version}-tests.jar" />
+ </fileset>
+ </unjar>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <includes>
+ <!-- Note: Including entities in this jar will
+ cause problems for any modules that need
+ to enhance their own entities.
+ -->
+ <include>org/apache/openjpa/persistence/test/*.class</include>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/persistence.xml</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <!-- Don't run any of the extracted tests here... -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: openjpa/trunk/openjpa-testsupport/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/trunk/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-xmlstore/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa-xmlstore/pom.xml (original)
+++ openjpa/trunk/openjpa-xmlstore/pom.xml Thu Aug 19 17:31:55 2010
@@ -40,13 +40,18 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
- <!-- <classifier>test-base</classifier> -->
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-testsupport</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -54,35 +59,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- new way of using openjpa-maven-plugin to enhance classes -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -103,11 +79,11 @@
</execution>
</executions>
<dependencies>
+ <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
<dependency>
<groupId>org.apache.openjpa</groupId>
- <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
<artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
Modified: openjpa/trunk/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Thu Aug 19 17:31:55 2010
@@ -129,17 +129,17 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<!--
Need to exclude jaxb, so the following will not get included
as compile depends in the aggregate JAR by the shade plugin:
@@ -196,22 +196,22 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-xmlstore</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-slice</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=987238&r1=987237&r2=987238&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Thu Aug 19 17:31:55 2010
@@ -128,6 +128,7 @@
<module>openjpa-jdbc</module>
<module>openjpa-persistence</module>
<module>openjpa-persistence-jdbc</module>
+ <module>openjpa-testsupport</module>
<module>openjpa-persistence-locking</module>
<module>openjpa-xmlstore</module>
<module>openjpa-slice</module>
@@ -142,173 +143,12 @@
<!-- ================ -->
<!-- Build Profiles -->
<!-- ================ -->
+
+ <!-- Release profile is inherited from parent apache-7.pom
<profile>
<id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <!--
- javadoc plugin doesn't copy resources like the normal jar plugin.
- Unzip license,etc from normal jar and add to javadoc jar.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>javadoc.resources</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <!-- create output dir for nested parent poms -->
- <mkdir dir="${project.build.directory}" />
- <unzip dest="${project.build.directory}/apidocs">
- <patternset>
- <include name="META-INF/*.txt" />
- </patternset>
- <fileset dir="${project.build.directory}">
- <include name="${artifactId}-${pom.version}.jar" />
- </fileset>
- </unzip>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptorRefs>
- <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
- </descriptorRefs>
- <tarLongFileFormat>gnu</tarLongFileFormat>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <id>process-javadoc</id>
- <phase>process-classes</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <configuration>
- <additionalparam>
- ${javadoc.additionalparam}
- </additionalparam>
- <aggregate>true</aggregate>
- <subpackages>org.apache.openjpa</subpackages>
- <verbose>false</verbose>
- <maxmemory>512m</maxmemory>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/javaee/6/docs/api</link>
- <link>http://jakarta.apache.org/commons/collections/api-release</link>
- </links>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <goals>deploy site site-deploy</goals>
- <arguments>-Papache-release,docbook-profile,test-derby -DskipTests=true</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <excludes>
- <!-- comments are usupported in services files -->
- <exclude>**/javax.persistence.spi.PersistenceProvider</exclude>
- <exclude>**/javax.annotation.processing.Processor</exclude>
- <!-- comments are usupported by our rsrc parser -->
- <exclude>**/*.rsrc</exclude>
- <!-- comments are usupported in these files -->
- <exclude>**/org.apache.openjpa.revision.properties</exclude>
- <exclude>scripts/*.list</exclude>
- <exclude>scripts/*.options</exclude>
- <exclude>scripts/*.dict</exclude>
- <!-- generated content -->
- <exclude>**/.*/**</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/maven-eclipse.xml</exclude>
- <exclude>**/rat.txt</exclude>
- <!-- Exclude internal build-only repository -->
- <exclude>**/internal-repository/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</profile>
+ -->
<profile>
<id>sign-release</id>
@@ -365,28 +205,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals><goal>javadoc</goal></goals>
- <configuration>
- <additionalparam>
- ${javadoc.additionalparam}
- </additionalparam>
- <aggregate>true</aggregate>
- <subpackages>org.apache.openjpa</subpackages>
-
- <verbose>false</verbose>
- <!-- <linksource>true</linksource> -->
- <maxmemory>512m</maxmemory>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/javaee/6/docs/api</link>
- <link>http://jakarta.apache.org/commons/collections/api-release</link>
- </links>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -764,9 +582,11 @@
<build>
<pluginManagement>
<plugins>
+ <!-- apache-7.pom default of 2.0.2 fails for JDK5 testing -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -775,24 +595,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Specification-Title>JSR-317 Java Persistence API</Specification-Title>
- <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
- <Specification-Version>2.0</Specification-Version>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
@@ -882,24 +684,28 @@
<excludeSubProjects>false</excludeSubProjects>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludes>
+ <!-- comments are usupported in services files -->
+ <exclude>**/javax.persistence.spi.PersistenceProvider</exclude>
+ <exclude>**/javax.annotation.processing.Processor</exclude>
+ <!-- comments are usupported by our rsrc parser -->
+ <exclude>**/*.rsrc</exclude>
+ <!-- comments are usupported in these files -->
+ <exclude>**/org.apache.openjpa.revision.properties</exclude>
+ <exclude>scripts/*.list</exclude>
+ <exclude>scripts/*.options</exclude>
+ <exclude>scripts/*.dict</exclude>
<!-- generated content -->
<exclude>**/.*/**</exclude>
<exclude>**/target/**/*</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/maven-eclipse.xml</exclude>
+ <exclude>**/rat.txt</exclude>
+ <exclude>release.properties</exclude>
+ <exclude>DEPENDENCIES</exclude>
+ <!-- Exclude internal build-only repository -->
+ <exclude>**/internal-repository/**</exclude>
</excludes>
- <includes>
- <!-- only check common source files -->
- <include>**/src/**/*.bat</include>
- <include>**/src/**/*.css</include>
- <include>**/src/**/*.html</include>
- <include>**/src/**/*.java</include>
- <include>**/src/**/*.js</include>
- <include>**/src/**/*.jsp</include>
- <include>**/src/**/*.properties</include>
- <include>**/src/**/*.sh</include>
- <include>**/src/**/*.txt</include>
- <include>**/src/**/*.vm</include>
- <include>**/src/**/*.xml</include>
- </includes>
</configuration>
</plugin>
<!-- inherited from apache-7.pom, but need config updates -->
@@ -909,27 +715,12 @@
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy site site-deploy</goals>
- <arguments>-Papache-release,docbook-profile,test-derby -DskipTests=true</arguments>
+ <arguments>-Papache-release,docbook-profile,test-derby -DskipTests</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<dependencies>
@@ -941,62 +732,11 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>install</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
<version>1.0-alpha-1</version>
@@ -1030,6 +770,34 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${buildNumber}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-tests</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.0.1</version>
@@ -1043,11 +811,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>1.1</version>
@@ -1067,10 +830,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -1136,43 +895,6 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
</plugin>
- <!-- this has to be done in each module so we don't generate
- tests.jar artifacts that fail the IANAL check
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>attach-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- <!-- Don't include in all builds for now
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- -->
</plugins>
</build>
@@ -1181,6 +903,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.1</version>
<reportSets>
<reportSet>
<reports>
@@ -1197,6 +920,18 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>javadoc</report>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>