Author: dwoods
Date: Mon Jan 25 20:48:59 2010
New Revision: 902968
URL: http://svn.apache.org/viewvc?rev=902968&view=rev
Log:
move creation of *-tests.jar to modules that actually have tests, otherwise
jars with no test and no legal files will get generated and cause the release
process to fail
Modified:
openjpa/branches/2.0.0-beta/openjpa-integration/tck/pom.xml
openjpa/branches/2.0.0-beta/openjpa-integration/validation/pom.xml
openjpa/branches/2.0.0-beta/openjpa-jdbc/pom.xml
openjpa/branches/2.0.0-beta/openjpa-kernel/pom.xml
openjpa/branches/2.0.0-beta/openjpa-lib/pom.xml
openjpa/branches/2.0.0-beta/openjpa-persistence-jdbc/pom.xml
openjpa/branches/2.0.0-beta/openjpa-persistence-locking/pom.xml
openjpa/branches/2.0.0-beta/openjpa-persistence/pom.xml
openjpa/branches/2.0.0-beta/openjpa-slice/pom.xml
openjpa/branches/2.0.0-beta/pom.xml
Modified: openjpa/branches/2.0.0-beta/openjpa-integration/tck/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-integration/tck/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/openjpa-integration/tck/pom.xml Mon Jan 25
20:48:59 2010
@@ -418,16 +418,7 @@
</plugin>
</plugins>
</build>
- <!-- only used for old JPA 1.0 RI API, which we don't use anymore
- <repositories>
- <repository>
- <id>java.net</id>
- <name>Java.net Maven Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- -->
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: openjpa/branches/2.0.0-beta/openjpa-integration/validation/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-integration/validation/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-integration/validation/pom.xml
(original)
+++ openjpa/branches/2.0.0-beta/openjpa-integration/validation/pom.xml Mon Jan
25 20:48:59 2010
@@ -232,6 +232,19 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests</id>
+ <phase>verify</phase>
+ <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/branches/2.0.0-beta/openjpa-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-jdbc/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/openjpa-jdbc/pom.xml Mon Jan 25 20:48:59 2010
@@ -78,4 +78,22 @@
<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>
+ <phase>verify</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: openjpa/branches/2.0.0-beta/openjpa-kernel/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-kernel/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/openjpa-kernel/pom.xml Mon Jan 25 20:48:59 2010
@@ -125,6 +125,15 @@
</manifestEntries>
</archive>
</configuration>
+ <executions>
+ <execution>
+ <id>attach-tests</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: openjpa/branches/2.0.0-beta/openjpa-lib/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-lib/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-lib/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/openjpa-lib/pom.xml Mon Jan 25 20:48:59 2010
@@ -115,6 +115,19 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: openjpa/branches/2.0.0-beta/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-persistence-jdbc/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/openjpa-persistence-jdbc/pom.xml Mon Jan 25
20:48:59 2010
@@ -777,6 +777,13 @@
</includes>
</configuration>
</execution>
+ <execution>
+ <id>attach-tests</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: openjpa/branches/2.0.0-beta/openjpa-persistence-locking/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-persistence-locking/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/openjpa-persistence-locking/pom.xml Mon Jan 25
20:48:59 2010
@@ -749,6 +749,19 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests</id>
+ <phase>verify</phase>
+ <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/branches/2.0.0-beta/openjpa-persistence/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-persistence/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/openjpa-persistence/pom.xml Mon Jan 25 20:48:59
2010
@@ -73,6 +73,19 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -86,28 +99,21 @@
</activation>
<id>jdk6-compiler</id>
<build>
- <!--
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <echo
file="${basedir}/src/main/resources/META-INF/services/javax.annotation.processing.Processor"
-
message="org.apache.openjpa.persistence.meta.AnnotationProcessor6"/>
- </tasks>
- </configuration>
+ <id>attach-tests</id>
+ <phase>verify</phase>
<goals>
- <goal>run</goal>
+ <goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
- -->
</build>
</profile>
</profiles>
Modified: openjpa/branches/2.0.0-beta/openjpa-slice/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-slice/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-slice/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/openjpa-slice/pom.xml Mon Jan 25 20:48:59 2010
@@ -120,6 +120,19 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests</id>
+ <phase>verify</phase>
+ <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>
Modified: openjpa/branches/2.0.0-beta/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/pom.xml?rev=902968&r1=902967&r2=902968&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/pom.xml (original)
+++ openjpa/branches/2.0.0-beta/pom.xml Mon Jan 25 20:48:59 2010
@@ -949,6 +949,7 @@
</execution>
</executions>
</plugin>
+ <!-- moved to modules as this causes release builds to break
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -962,7 +963,8 @@
</execution>
</executions>
</plugin>
- </plugins>
+ -->
+ </plugins>
</build>
<reporting>
