From bcfadcff1beb2ce2723ab79b817b90c77c6cc6d3 Mon Sep 17 00:00:00 2001 From: Donald Woods Date: Fri, 6 Aug 2010 16:22:21 +0000 Subject: [PATCH] OPENJPA-1712 Fix creation of test artifacts, so they get signed during -Papache-release deploys to nexus repo git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@983040 13f79535-47bb-0310-9956-ffa450edef68 --- openjpa-integration/daytrader/pom.xml | 1 - openjpa-integration/jmx/pom.xml | 135 +++++++++++-------------- openjpa-integration/slf4j/pom.xml | 9 +- openjpa-integration/validation/pom.xml | 21 ++-- openjpa-jdbc/pom.xml | 32 ++++-- openjpa-kernel/pom.xml | 42 +++++--- openjpa-lib/pom.xml | 33 ++++-- openjpa-persistence-jdbc/pom.xml | 19 +++- openjpa-persistence-locking/pom.xml | 1 - openjpa-persistence/pom.xml | 32 ++++-- openjpa-slice/pom.xml | 17 +++- openjpa-xmlstore/pom.xml | 18 +++- pom.xml | 115 ++++++++++++++++++--- 13 files changed, 324 insertions(+), 151 deletions(-) diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml index 5efb25145..ecfb9281f 100644 --- a/openjpa-integration/daytrader/pom.xml +++ b/openjpa-integration/daytrader/pom.xml @@ -100,7 +100,6 @@ attach-tests - verify test-jar diff --git a/openjpa-integration/jmx/pom.xml b/openjpa-integration/jmx/pom.xml index 698c5d795..b1f354cea 100644 --- a/openjpa-integration/jmx/pom.xml +++ b/openjpa-integration/jmx/pom.xml @@ -22,7 +22,8 @@ the release plugin. --> - 4.0.0 + + 4.0.0 org.apache.openjpa @@ -37,17 +38,6 @@ ${project.basedir}/../../openjpa-project/checkstyle.xml - 10 - 5 - 2 - 10000 - MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait} - org.apache.derby.jdbc.EmbeddedDriver - jdbc:derby:target/database/openjpa-derby-database;create=true - - - 256m - 1024m com.sun.management.jmxremote @@ -88,72 +78,11 @@ - - - org.apache.maven.plugins - maven-jar-plugin - 2.3 - - - - true - true - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.4.3 - - ${surefire.jvm.args} - false - false - true - - - openjpa.Log - ${openjpa.Log} - - - openjpa.DynamicEnhancementAgent - false - - - openjpa.ConnectionDriverName - org.apache.commons.dbcp.BasicDataSource - - - derby.stream.error.file - target/derby.log - - - derby.locks.deadlockTimeout - 5 - - - derby.locks.waitTimeout - 6 - - - openjpa.ConnectionProperties - DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args} - - - - - - - - - + org.codehaus.mojo openjpa-maven-plugin - 1.1 org/apache/openjpa/integration/jmx/*.class true @@ -176,7 +105,61 @@ ${project.version} - - + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${surefire.jvm.args} + + + openjpa.Log + ${openjpa.Log} + + + openjpa.DynamicEnhancementAgent + false + + + openjpa.ConnectionDriverName + org.apache.commons.dbcp.BasicDataSource + + + derby.stream.error.file + target/derby.log + + + derby.locks.deadlockTimeout + ${derby.locks.deadlockTimeout} + + + derby.locks.waitTimeout + ${derby.locks.waitTimeout} + + + openjpa.ConnectionProperties + DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args} + + + tests.openjpa.allowfailure + ${tests.openjpa.allowfailure} + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + attach-tests + + test-jar + + + + + diff --git a/openjpa-integration/slf4j/pom.xml b/openjpa-integration/slf4j/pom.xml index fda225dac..2562a5be8 100644 --- a/openjpa-integration/slf4j/pom.xml +++ b/openjpa-integration/slf4j/pom.xml @@ -84,7 +84,6 @@ attach-tests - verify test-jar @@ -165,16 +164,20 @@ derby.locks.deadlockTimeout - 5 + ${derby.locks.deadlockTimeout} derby.locks.waitTimeout - 6 + ${derby.locks.waitTimeout} openjpa.ConnectionProperties DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args} + + tests.openjpa.allowfailure + ${tests.openjpa.allowfailure} + diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml index c70be4b5d..264f54858 100644 --- a/openjpa-integration/validation/pom.xml +++ b/openjpa-integration/validation/pom.xml @@ -35,18 +35,6 @@ OpenJPA Integration Tests - Bean Validation OpenJPA Integration Tests - Bean Validation - - 10 - 5 - 2 - 10000 - MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait} - org.apache.derby.jdbc.EmbeddedDriver - jdbc:derby:target/database/openjpa-derby-database;create=true - - - - @@ -220,7 +208,6 @@ attach-tests - verify test-jar @@ -286,16 +273,20 @@ derby.locks.deadlockTimeout - 5 + ${derby.locks.deadlockTimeout} derby.locks.waitTimeout - 6 + ${derby.locks.waitTimeout} openjpa.ConnectionProperties DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args} + + tests.openjpa.allowfailure + ${tests.openjpa.allowfailure} + diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml index 369672e99..0197653c2 100644 --- a/openjpa-jdbc/pom.xml +++ b/openjpa-jdbc/pom.xml @@ -21,18 +21,21 @@ Maven release plugin requires the project tag to be on a single line. --> + 4.0.0 - org.apache.openjpa - openjpa-jdbc - jar - OpenJPA JDBC - OpenJPA JDBC - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 2.1.0-SNAPSHOT + + org.apache.openjpa + openjpa-jdbc + jar + OpenJPA JDBC + OpenJPA JDBC + org.apache.openjpa @@ -85,9 +88,24 @@ org.apache.maven.plugins maven-jar-plugin + + default-jar + + jar + + + + + true + + + ${buildNumber} + + + + attach-tests - verify test-jar diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index 0733aa038..2364817db 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -21,18 +21,21 @@ Maven release plugin requires the project tag to be on a single line. --> + 4.0.0 - org.apache.openjpa - openjpa-kernel - jar - OpenJPA Kernel - OpenJPA Kernel - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 2.1.0-SNAPSHOT + + org.apache.openjpa + openjpa-kernel + jar + OpenJPA Kernel + OpenJPA Kernel + org.apache.openjpa @@ -63,6 +66,7 @@ provided + @@ -118,17 +122,26 @@ org.apache.maven.plugins maven-jar-plugin - - - - org.apache.openjpa.enhance.InstrumentationFactory - - - + + default-jar + + jar + + + + + true + + + ${buildNumber} + org.apache.openjpa.enhance.InstrumentationFactory + + + + attach-tests - verify test-jar @@ -137,6 +150,7 @@ + + 4.0.0 - org.apache.openjpa - openjpa-lib - jar - OpenJPA Utilities Library - OpenJPA Utilities Library - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 2.1.0-SNAPSHOT + + org.apache.openjpa + openjpa-lib + jar + OpenJPA Utilities Library + OpenJPA Utilities Library + jakarta-regexp @@ -77,6 +80,7 @@ provided + + 4.0.0 - org.apache.openjpa - openjpa-persistence - jar - OpenJPA Persistence - OpenJPA Persistence - http://openjpa.apache.org + org.apache.openjpa openjpa-parent 2.1.0-SNAPSHOT + + org.apache.openjpa + openjpa-persistence + jar + OpenJPA Persistence + OpenJPA Persistence + org.apache.openjpa @@ -63,9 +66,24 @@ org.apache.maven.plugins maven-jar-plugin + + default-jar + + jar + + + + + true + + + ${buildNumber} + + + + attach-tests - verify test-jar diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml index 475a4fe90..7e9a05bc9 100644 --- a/openjpa-slice/pom.xml +++ b/openjpa-slice/pom.xml @@ -130,9 +130,24 @@ org.apache.maven.plugins maven-jar-plugin + + default-jar + + jar + + + + + true + + + ${buildNumber} + + + + attach-tests - verify test-jar diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml index f719f8cfc..667f3b27e 100644 --- a/openjpa-xmlstore/pom.xml +++ b/openjpa-xmlstore/pom.xml @@ -54,14 +54,28 @@ - org.apache.maven.plugins maven-jar-plugin + + default-jar + + jar + + + + + true + + + ${buildNumber} + + + + attach-tests - verify test-jar diff --git a/pom.xml b/pom.xml index 3b4e8ba9d..467c48964 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ ${project.version} DefaultLevel=INFO UTF-8 - ../openjpa-project/checkstyle.xml + ${project.basedir}/../openjpa-project/checkstyle.xml scp://people.apache.org/home/${user.name}/public_html/openjpa/${project.version}/staging-site 512m @@ -177,9 +177,76 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + org.apache.apache.resources + apache-source-release-assembly-descriptor + 1.0.2 + + + + + source-release-assembly + package + + single + + + true + + ${sourceReleaseAssemblyDescriptor} + + gnu + + + + + + true + org.apache.maven.plugins + maven-gpg-plugin + + + + true + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + true + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + org.apache.maven.plugins maven-javadoc-plugin + + ${project.build.sourceEncoding} + attach-javadoc @@ -189,8 +256,11 @@ + process-javadoc process-classes - javadoc + + javadoc + ${javadoc.additionalparam} @@ -208,19 +278,6 @@ - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - org.apache.maven.plugins maven-release-plugin @@ -276,6 +333,7 @@ org.apache.maven.plugins maven-gpg-plugin + @@ -895,6 +954,15 @@ org.apache.maven.plugins maven-gpg-plugin 1.0 + + + sign-artifacts + install + + sign + + + org.apache.maven.plugins @@ -1084,9 +1152,24 @@ org.apache.maven.plugins maven-jar-plugin + + default-jar + + jar + + + + + true + + + ${buildNumber} + + + + attach-tests - verify test-jar