Author: dwoods
Date: Fri Aug 6 16:22:21 2010
New Revision: 983040
URL: http://svn.apache.org/viewvc?rev=983040&view=rev
Log:
OPENJPA-1712 Fix creation of test artifacts, so they get signed during
-Papache-release deploys to nexus repo
Modified:
openjpa/trunk/openjpa-integration/daytrader/pom.xml
openjpa/trunk/openjpa-integration/jmx/pom.xml
openjpa/trunk/openjpa-integration/slf4j/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/pom.xml
Modified: openjpa/trunk/openjpa-integration/daytrader/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/daytrader/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/daytrader/pom.xml Fri Aug 6 16:22:21 2010
@@ -100,7 +100,6 @@
<executions>
<execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/trunk/openjpa-integration/jmx/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/jmx/pom.xml Fri Aug 6 16:22:21 2010
@@ -22,7 +22,8 @@
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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.openjpa</groupId>
@@ -37,17 +38,6 @@
<properties>
<checkstyle.config.location>${project.basedir}/../../openjpa-project/checkstyle.xml</checkstyle.config.location>
- <dbcp.maxActive>10</dbcp.maxActive>
- <dbcp.maxIdle>5</dbcp.maxIdle>
- <dbcp.minIdle>2</dbcp.minIdle>
- <dbcp.maxWait>10000</dbcp.maxWait>
-
<dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
-
<connection.driver.name>org.apache.derby.jdbc.EmbeddedDriver</connection.driver.name>
-
<connection.url>jdbc:derby:target/database/openjpa-derby-database;create=true</connection.url>
- <connection.username />
- <connection.password />
- <test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
- <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
<!-- Enable the JMX platform MBean provider -->
<test.jvm.jmxprovider>com.sun.management.jmxremote</test.jvm.jmxprovider>
<!-- Disable JMX platform MBean authentication -->
@@ -88,32 +78,40 @@
</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>
+ <!-- Use openjpa maven plugin to enhance the domain model classes -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
<configuration>
- <archive>
- <manifest>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
+ <includes>org/apache/openjpa/integration/jmx/*.class</includes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ <!--
persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile-->
</configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>test-enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</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>
- <trimStackTrace>false</trimStackTrace>
- <useSystemClassLoader>true</useSystemClassLoader>
<systemProperties>
<property>
<name>openjpa.Log</name>
@@ -133,50 +131,35 @@
</property>
<property>
<name>derby.locks.deadlockTimeout</name>
- <value>5</value>
+ <value>${derby.locks.deadlockTimeout}</value>
</property>
<property>
<name>derby.locks.waitTimeout</name>
- <value>6</value>
+ <value>${derby.locks.waitTimeout}</value>
+ </property>
+ <property>
+ <name>openjpa.ConnectionProperties</name>
+
<value>DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
</property>
<property>
- <name>openjpa.ConnectionProperties</name>
-
<value>DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
+ <name>tests.openjpa.allowfailure</name>
+ <value>${tests.openjpa.allowfailure}</value>
</property>
</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>
- </pluginManagement>
- <plugins>
- <plugin>
- <!-- Use the openjpa maven plugin to enhance the domain model
classes -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <includes>org/apache/openjpa/integration/jmx/*.class</includes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- <!--
persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile-->
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>test-enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </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=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/slf4j/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/slf4j/pom.xml Fri Aug 6 16:22:21 2010
@@ -84,7 +84,6 @@
<executions>
<execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
@@ -165,16 +164,20 @@
</property>
<property>
<name>derby.locks.deadlockTimeout</name>
- <value>5</value>
+ <value>${derby.locks.deadlockTimeout}</value>
</property>
<property>
<name>derby.locks.waitTimeout</name>
- <value>6</value>
+ <value>${derby.locks.waitTimeout}</value>
</property>
<property>
<name>openjpa.ConnectionProperties</name>
<value>DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
</property>
+ <property>
+ <name>tests.openjpa.allowfailure</name>
+ <value>${tests.openjpa.allowfailure}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Fri Aug 6 16:22:21
2010
@@ -35,18 +35,6 @@
<name>OpenJPA Integration Tests - Bean Validation</name>
<description>OpenJPA Integration Tests - Bean Validation</description>
- <properties>
- <dbcp.maxActive>10</dbcp.maxActive>
- <dbcp.maxIdle>5</dbcp.maxIdle>
- <dbcp.minIdle>2</dbcp.minIdle>
- <dbcp.maxWait>10000</dbcp.maxWait>
-
<dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
-
<connection.driver.name>org.apache.derby.jdbc.EmbeddedDriver</connection.driver.name>
-
<connection.url>jdbc:derby:target/database/openjpa-derby-database;create=true</connection.url>
- <connection.username />
- <connection.password />
- </properties>
-
<profiles>
<!-- Default profile for testing with Apache BVAL provider -->
<!-- See http://incubator.apache.org/projects/beanvalidation.html -->
@@ -220,7 +208,6 @@
<executions>
<execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
@@ -286,16 +273,20 @@
</property>
<property>
<name>derby.locks.deadlockTimeout</name>
- <value>5</value>
+ <value>${derby.locks.deadlockTimeout}</value>
</property>
<property>
<name>derby.locks.waitTimeout</name>
- <value>6</value>
+ <value>${derby.locks.waitTimeout}</value>
</property>
<property>
<name>openjpa.ConnectionProperties</name>
<value>DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
</property>
+ <property>
+ <name>tests.openjpa.allowfailure</name>
+ <value>${tests.openjpa.allowfailure}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Modified: openjpa/trunk/openjpa-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc/pom.xml Fri Aug 6 16:22:21 2010
@@ -21,18 +21,21 @@
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";>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-jdbc</artifactId>
- <packaging>jar</packaging>
- <name>OpenJPA JDBC</name>
- <description>OpenJPA JDBC</description>
- <url>http://openjpa.apache.org</url>
+
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
+
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenJPA JDBC</name>
+ <description>OpenJPA JDBC</description>
+
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -86,8 +89,23 @@
<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>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Fri Aug 6 16:22:21 2010
@@ -21,18 +21,21 @@
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";>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-kernel</artifactId>
- <packaging>jar</packaging>
- <name>OpenJPA Kernel</name>
- <description>OpenJPA Kernel</description>
- <url>http://openjpa.apache.org</url>
+
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
+
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenJPA Kernel</name>
+ <description>OpenJPA Kernel</description>
+
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -63,6 +66,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -118,17 +122,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
-
<Agent-Class>org.apache.openjpa.enhance.InstrumentationFactory</Agent-Class>
- </manifestEntries>
- </archive>
- </configuration>
<executions>
<execution>
+ <id>default-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+
<Implementation-Build>${buildNumber}</Implementation-Build>
+
<Agent-Class>org.apache.openjpa.enhance.InstrumentationFactory</Agent-Class>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
@@ -137,6 +150,7 @@
</plugin>
</plugins>
</build>
+
<repositories>
<!--
Internal (in SVN) repository which contains jar files that are not
Modified: openjpa/trunk/openjpa-lib/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Fri Aug 6 16:22:21 2010
@@ -21,18 +21,21 @@
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";>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-lib</artifactId>
- <packaging>jar</packaging>
- <name>OpenJPA Utilities Library</name>
- <description>OpenJPA Utilities Library</description>
- <url>http://openjpa.apache.org</url>
+
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
+
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-lib</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenJPA Utilities Library</name>
+ <description>OpenJPA Utilities Library</description>
+
<dependencies>
<dependency>
<groupId>jakarta-regexp</groupId>
@@ -77,6 +80,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<!--
@@ -131,8 +135,23 @@ openjpa.enhancer.revision=${pcenhancer.r
<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>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Fri Aug 6 16:22:21 2010
@@ -723,6 +723,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -758,6 +759,23 @@
<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>
@@ -778,7 +796,6 @@
</execution>
<execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/trunk/openjpa-persistence-locking/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-locking/pom.xml Fri Aug 6 16:22:21 2010
@@ -746,7 +746,6 @@
<executions>
<execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/trunk/openjpa-persistence/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence/pom.xml Fri Aug 6 16:22:21 2010
@@ -21,18 +21,21 @@
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";>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence</artifactId>
- <packaging>jar</packaging>
- <name>OpenJPA Persistence</name>
- <description>OpenJPA Persistence</description>
- <url>http://openjpa.apache.org</url>
+
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
+
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenJPA Persistence</name>
+ <description>OpenJPA Persistence</description>
+
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -64,8 +67,23 @@
<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>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/trunk/openjpa-slice/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Fri Aug 6 16:22:21 2010
@@ -131,8 +131,23 @@
<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>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/trunk/openjpa-xmlstore/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-xmlstore/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/openjpa-xmlstore/pom.xml (original)
+++ openjpa/trunk/openjpa-xmlstore/pom.xml Fri Aug 6 16:22:21 2010
@@ -54,14 +54,28 @@
<build>
<plugins>
- <!-- create *-tests.jar -->
<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>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=983040&r1=983039&r2=983040&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Fri Aug 6 16:22:21 2010
@@ -46,7 +46,7 @@
<openjpa.version>${project.version}</openjpa.version>
<openjpa.Log>DefaultLevel=INFO</openjpa.Log>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
+
<checkstyle.config.location>${project.basedir}/../openjpa-project/checkstyle.xml</checkstyle.config.location>
<site.deploy.url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${project.version}/staging-site</site.deploy.url>
<!-- the test settings can be overridden my specific profiles -->
<test.jvm.maxpermsize>512m</test.jvm.maxpermsize>
@@ -179,7 +179,74 @@
</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>
+<!--
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+-->
+ </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>
@@ -189,8 +256,11 @@
</goals>
</execution>
<execution>
+ <id>process-javadoc</id>
<phase>process-classes</phase>
- <goals><goal>javadoc</goal></goals>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
<configuration>
<additionalparam>
${javadoc.additionalparam}
@@ -210,19 +280,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
@@ -276,6 +333,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
+<!--
<executions>
<execution>
<id>sign-artifacts</id>
@@ -285,6 +343,7 @@
</goals>
</execution>
</executions>
+-->
</plugin>
</plugins>
</build>
@@ -895,6 +954,15 @@
<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>
@@ -1085,8 +1153,23 @@
<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>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
