diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml index 99c543388..de3dc1d5f 100644 --- a/openjpa-all/pom.xml +++ b/openjpa-all/pom.xml @@ -17,10 +17,11 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 openjpa jar @@ -48,11 +49,10 @@ process-classes - + - - + + @@ -61,18 +61,18 @@ resources so they are aggregated --> - + Building service: @{servicename} - + - - - + + + diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml index c5ca9995c..d8c5ecb10 100644 --- a/openjpa-examples/pom.xml +++ b/openjpa-examples/pom.xml @@ -17,9 +17,11 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 org.apache.openjpa openjpa-examples @@ -81,21 +83,19 @@ - - - + + + - - + + - - + + - - + + diff --git a/openjpa-integration/examples/pom.xml b/openjpa-integration/examples/pom.xml index b0aea8f72..b3b8e5849 100644 --- a/openjpa-integration/examples/pom.xml +++ b/openjpa-integration/examples/pom.xml @@ -26,10 +26,11 @@ mvn integration-test -Pexamples-profile --> - + + 4.0.0 examples pom @@ -55,29 +56,23 @@ Running OpenJPA Examples - - + + - + - + - + Could not extract assembly. - + @@ -101,4 +96,3 @@ - diff --git a/openjpa-integration/pom.xml b/openjpa-integration/pom.xml index 2414ccb94..d3e448a73 100644 --- a/openjpa-integration/pom.xml +++ b/openjpa-integration/pom.xml @@ -17,10 +17,11 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 openjpa-integration pom diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml index 246219622..eea19644d 100644 --- a/openjpa-integration/tck/pom.xml +++ b/openjpa-integration/tck/pom.xml @@ -49,10 +49,11 @@ 5. Run the TCK script 6. Parse the TCK result log to determine whether to fail the build or not --> - + + 4.0.0 tck pom @@ -78,57 +79,49 @@ Running Sun JPA TCK - - + + The TCK file ${tck.zip} does not exist. This file must be downloaded separately in order to be able to run the JPA TCK - + The TCK file specific in the "tck.zip" system property (${tck.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA TCK - - + + - + - + - + - - + + - - + + - + - - - - - + + + + + - + - - + + - - + + - + @@ -146,8 +139,7 @@ openjpa.jdbc.SchemaFactory: native(ForeignKeys=true) - + @@ -177,20 +169,18 @@ databaseName=${db.name} - + - + - + - - + + AGENT: ${agent}${agent.properties} - + - - + + - - - - - - - - - + + + + + + + + + - - + + - - + + - + - + - + @@ -253,32 +233,26 @@ databaseName=${db.name} Logging JPA TCK output to ${tck.log} - + - + - + - + Some tests failed JPA TCK Passed 100%! - - + + Results archive at: ${tck.results.archive} @@ -323,4 +297,3 @@ databaseName=${db.name} - diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml index 608d7e258..47b1896d4 100644 --- a/openjpa-jdbc/pom.xml +++ b/openjpa-jdbc/pom.xml @@ -17,9 +17,10 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 org.apache.openjpa openjpa-jdbc diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index f39bab9ca..9b897e174 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -17,9 +17,10 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 org.apache.openjpa openjpa-kernel @@ -52,14 +53,14 @@ commons-pool commons-pool - compile - - - com.ibm.websphere - websphere_uow_api - 0.0.1 - provided - + compile + + + com.ibm.websphere + websphere_uow_api + 0.0.1 + provided + @@ -124,8 +125,7 @@ process-classes - + @@ -137,9 +137,8 @@ process-classes - - + + @@ -148,27 +147,27 @@ - - - maven-jar-plugin - 2.2 - - - **/com/ibm/** - - + + + maven-jar-plugin + 2.2 + + + **/com/ibm/** + + - - - - openjpa-internal - Internal repository - file://${basedir}/internal-repository - - + + + + openjpa-internal + Internal repository + file://${basedir}/internal-repository + + diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml index 0ff99ec17..967012117 100644 --- a/openjpa-lib/pom.xml +++ b/openjpa-lib/pom.xml @@ -17,9 +17,10 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 org.apache.openjpa openjpa-lib @@ -96,8 +97,7 @@ process-classes - + @@ -109,33 +109,25 @@ compile - - - + + + - + - - - + + + - + Revision: ${subversion.revision} OpenJPA version: ${project.version} - + revision.number=${subversion.revision} openjpa.version=${project.version} - + diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml index 0f32b1946..c1a82bc25 100644 --- a/openjpa-persistence-jdbc/pom.xml +++ b/openjpa-persistence-jdbc/pom.xml @@ -17,9 +17,10 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 org.apache.openjpa openjpa-persistence-jdbc @@ -58,8 +59,8 @@ org.apache.derby.jdbc.EmbeddedDriver jdbc:derby:target/database/openjpa-derby-database;create=true - - + + @@ -79,7 +80,7 @@ org.hsqldb.jdbcDriver jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true sa - + @@ -282,25 +283,13 @@ test-compile - - - - - - - - + + + + + + + diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml index f2f970d0b..5994c054e 100644 --- a/openjpa-persistence/pom.xml +++ b/openjpa-persistence/pom.xml @@ -17,9 +17,10 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 org.apache.openjpa openjpa-persistence diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml index 184d47508..6fdcecb64 100644 --- a/openjpa-project/pom.xml +++ b/openjpa-project/pom.xml @@ -17,10 +17,11 @@ specific language governing permissions and limitations under the License. --> - + + - - + + - - + + @@ -220,34 +220,29 @@ - + - + - - + + - + - - + + - + - - + + @@ -272,11 +267,10 @@ - + - - + + @@ -308,84 +302,6 @@ - - - - sign-release - - - - maven-antrun-plugin - - - verify - - - Signing release files... - - - - - - - - - - - - - - - - - - - - - run - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-signature-artifacts - verify - - attach-artifact - - - - - ${openjpa.assembly.binaryFile}.asc - ${openjpa.assembly.binarySuffix}.zip - asc - - - ${openjpa.assembly.sourceFile}.asc - ${openjpa.assembly.sourceSuffix}.zip - asc - - - - - - - - - - - sign - true - - - diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml index 39d4e14e3..0c1e54b74 100644 --- a/openjpa-slice/pom.xml +++ b/openjpa-slice/pom.xml @@ -1,25 +1,26 @@ - + + 4.0.0 org.apache.openjpa openjpa-slice @@ -88,8 +89,8 @@ jdbc:derby:target/database/slice-derby-One;create=true - - + + @@ -139,19 +140,12 @@ test-compile - - - - - - + + + + + + diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml index a065172d4..0302591bc 100644 --- a/openjpa-xmlstore/pom.xml +++ b/openjpa-xmlstore/pom.xml @@ -17,9 +17,10 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 org.apache.openjpa openjpa-xmlstore diff --git a/pom.xml b/pom.xml index c6fa82f2a..77b9763b9 100644 --- a/pom.xml +++ b/pom.xml @@ -17,10 +17,10 @@ specific language governing permissions and limitations under the License. --> - + + 4.0.0 2.0.4 @@ -131,7 +131,73 @@ jar - + + process-classes + javadoc + + + ${javadoc.additionalparam} + + true + org.apache.openjpa + false + 512m + + http://java.sun.com/j2se/1.5.0/docs/api + http://java.sun.com/javaee/5/docs/api + http://jakarta.apache.org/commons/collections/api-release + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.0-alpha-3 + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.0-beta-7 + + false + deploy + -Prelease + true + + + + org.codehaus.mojo + rat-maven-plugin + 1.0-alpha-1 + + + verify + + check + + + + + + + **/internal-repository/** + **/target/** + + @@ -476,4 +542,9 @@ scpexe://${user.name}@people.apache.org/www/openjpa.apache.org/builds/${pom.version} + + scm:svn:http://svn.apache.org/repos/asf/openjpa/trunk + scm:svn:https://svn.apache.org/repos/asf/openjpa/trunk + http://svn.apache.org/repos/asf/openjpa/trunk +