Author: dwoods
Date: Wed Aug 25 15:49:37 2010
New Revision: 989185
URL: http://svn.apache.org/viewvc?rev=989185&view=rev
Log:
OPENJPA-1712 Remove openjpa-testsupport that Maven 3.0-beta-2 can't handle.
Simplify javadoc creation.
Removed:
openjpa/branches/2.0.x/openjpa-testsupport/
Modified:
openjpa/branches/2.0.x/openjpa-all/pom.xml
openjpa/branches/2.0.x/openjpa-integration/pom.xml
openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml
openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml
openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml
openjpa/branches/2.0.x/openjpa/pom.xml
openjpa/branches/2.0.x/pom.xml
Modified: openjpa/branches/2.0.x/openjpa-all/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-all/pom.xml?rev=989185&r1=989184&r2=989185&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-all/pom.xml Wed Aug 25 15:49:37 2010
@@ -36,35 +36,40 @@
<packaging>jar</packaging>
<name>OpenJPA Aggregate Jar with Dependencies</name>
+ <dependencies>
+ <!--
+ Start with openjpa.jar and let the maven-shade-plugin
+ determine the transitive dependencies to include from it.
+ -->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- include commons-logging -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<!-- disable creating javadoc for this module -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>none</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--
- Need to disable source plugin here, as it overwrites the shade
- plugin created sources jar.
- -->
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <!-- disable creating source jars for this module -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>none</phase>
- </execution>
- </executions>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
</plugin>
<!--
Need to disable jar plugin here, as it overwrites the shade
@@ -75,11 +80,12 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <id>attach-tests</id>
+ <id>default-jar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
+
<!-- Create our aggregate all JAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -127,21 +133,4 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
- <!--
- Start with openjpa.jar and let the maven-shade-plugin
- determine the transitive dependencies to include from it.
- -->
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- include commons-logging -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- </dependencies>
</project>
Modified: openjpa/branches/2.0.x/openjpa-integration/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/pom.xml?rev=989185&r1=989184&r2=989185&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/pom.xml Wed Aug 25 15:49:37 2010
@@ -45,19 +45,13 @@
<build>
<plugins>
- <!-- disable creating javadoc for all sub-modules -->
+ <!-- disable creating javadoc for these modules -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>none</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml?rev=989185&r1=989184&r2=989185&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml Wed Aug 25
15:49:37 2010
@@ -181,7 +181,7 @@
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-testsupport</artifactId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -205,6 +205,33 @@
<build>
<plugins>
+ <!-- Extract the common test support files from o-p-j-tests.jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+
<artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+
<includes>org/apache/openjpa/persistence/test/*.class</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Modified: openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml?rev=989185&r1=989184&r2=989185&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml Wed Aug 25
15:49:37 2010
@@ -692,7 +692,7 @@
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-testsupport</artifactId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -720,16 +720,38 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <!-- Extract the common test support files from o-p-j-tests.jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>attach-javadocs</id>
- <phase>none</phase>
+ <id>unpack</id>
+ <phase>test-compile</phase>
<goals>
- <goal>jar</goal>
+ <goal>unpack</goal>
</goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+
<artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+
<includes>org/apache/openjpa/persistence/test/*.class</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Modified: openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml?rev=989185&r1=989184&r2=989185&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml Wed Aug 25 15:49:37 2010
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-testsupport</artifactId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -59,6 +59,33 @@
<build>
<plugins>
+ <!-- Extract the common test support files from o-p-j-tests.jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+
<artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+
<includes>org/apache/openjpa/persistence/test/*.class</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- new way of using openjpa-maven-plugin to enhance classes -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: openjpa/branches/2.0.x/openjpa/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa/pom.xml?rev=989185&r1=989184&r2=989185&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa/pom.xml Wed Aug 25 15:49:37 2010
@@ -41,30 +41,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>none</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
-
- <!--
- Need to disable source plugin here, as it overwrites the shade
- plugin created sources jar.
- -->
+ <!-- disable creating source jars for this module -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>none</phase>
- </execution>
- </executions>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
</plugin>
<!-- Create our aggregate JAR -->
Modified: openjpa/branches/2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/pom.xml?rev=989185&r1=989184&r2=989185&view=diff
==============================================================================
--- openjpa/branches/2.0.x/pom.xml (original)
+++ openjpa/branches/2.0.x/pom.xml Wed Aug 25 15:49:37 2010
@@ -123,7 +123,6 @@
<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>
@@ -183,27 +182,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
-<!--
- <execution>
- <id>aggregate</id>
- <phase>site</phase>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
--->
- </executions>
- </plugin>
</plugins>
</build>
</profile>
@@ -254,7 +232,7 @@
<profile>
<!--
- Javadoc profile. Docs can be built by running:
+ Aggregate Javadoc profile. Docs can be built by running:
mvn process-resources -Dtest=false -Pjavadoc-profile
-->
<id>javadoc-profile</id>
@@ -263,14 +241,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -615,6 +585,20 @@
</dependencies>
<build>
+ <defaultGoal>install</defaultGoal>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+
<pluginManagement>
<plugins>
<!-- apache-7.pom default of 2.0.2 fails for JDK5 testing -->
@@ -786,23 +770,38 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
- <show>package</show>
- <quiet>true</quiet>
- <source>1.5</source>
- <additionalparam>
- ${javadoc.additionalparam}
- </additionalparam>
- <subpackages>org.apache.openjpa</subpackages>
- <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>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <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>
+ <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>
</pluginManagement>
@@ -918,35 +917,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>jdepend-maven-plugin</report>
- <report>surefire-report-maven-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- </reports>
- </reportSet>
- </reportSets>
</plugin>
-<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- <show>package</show>
- <quiet>true</quiet>
- <source>1.5</source>
- <additionalparam>
- ${javadoc.additionalparam}
- </additionalparam>
- <aggregate>true</aggregate>
- <subpackages>org.apache.openjpa</subpackages>
- <maxmemory>512m</maxmemory>
+ <show>package</show>
+ <quiet>true</quiet>
+ <source>1.5</source>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://java.sun.com/javaee/6/docs/api</link>
@@ -957,36 +936,16 @@
<reportSet>
<reports>
<report>javadoc</report>
+ <report>test-javadoc</report>
</reports>
</reportSet>
</reportSets>
</plugin>
--->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
<version>2.0-beta-2</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
- <configuration>
-
<configLocation>${checkstyle.config.location}</configLocation>
-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>**/*_.java</excludes>
- </configuration>
- </plugin>
</plugins>
</reporting>
