You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/08/07 16:00:38 UTC
svn commit: r983230 [1/2] - in /openjpa/branches/2.0.x: ./
openjpa-all/src/main/appended-resources/META-INF/ openjpa-examples/
openjpa-integration/tck/ openjpa-integration/validation/ openjpa-jdbc/
openjpa-kernel/ openjpa-kernel/src/main/appended-resou...
Author: dwoods
Date: Sat Aug 7 14:00:37 2010
New Revision: 983230
URL: http://svn.apache.org/viewvc?rev=983230&view=rev
Log:
OPENJPA-1712 Upgrade builds to use Apache hosted Nexus repo. Backported from trunk.
Modified:
openjpa/branches/2.0.x/NOTICE.txt
openjpa/branches/2.0.x/README.txt
openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm
openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/2.0.x/openjpa-examples/pom.xml
openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml
openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml
openjpa/branches/2.0.x/openjpa-jdbc/pom.xml
openjpa/branches/2.0.x/openjpa-kernel/pom.xml
openjpa/branches/2.0.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/2.0.x/openjpa-lib/pom.xml
openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml
openjpa/branches/2.0.x/openjpa-persistence/pom.xml
openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm
openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/2.0.x/openjpa-project/BUILDING.txt
openjpa/branches/2.0.x/openjpa-project/CHANGES.txt
openjpa/branches/2.0.x/openjpa-project/NOTICE.txt
openjpa/branches/2.0.x/openjpa-project/README.txt
openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html
openjpa/branches/2.0.x/openjpa-project/pom.xml
openjpa/branches/2.0.x/openjpa-project/upload.xml
openjpa/branches/2.0.x/openjpa-slice/pom.xml
openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml
openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm
openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/2.0.x/pom.xml
Modified: openjpa/branches/2.0.x/NOTICE.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/NOTICE.txt?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/NOTICE.txt (original)
+++ openjpa/branches/2.0.x/NOTICE.txt Sat Aug 7 14:00:37 2010
@@ -1,29 +1,27 @@
-
-Apache OpenJPA
-Copyright 2006-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.
-
-
-The following copyright notice(s) were affixed to portions of this code
-with which this file is now or was at one time distributed.
-
-
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
-OpenJPA includes the persistence and orm schemas from the JPA specifications.
-Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
-OpenJPA elects to include this software in this distribution under the
-CDDL license. You can obtain a copy of the License at:
- https://glassfish.dev.java.net/public/CDDL+GPL.html
-The source code is available at:
- https://glassfish.dev.java.net/source/browse/glassfish/
-
-OpenJPA includes software written by Miroslav Nachev
-
-OpenJPA uses test code written by Charles Tillman.
-
+
+Apache OpenJPA
+Copyright 2006-2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed.
+
+
+OpenJPA includes software developed by the SERP project
+Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+
+OpenJPA includes the persistence and orm schemas from the JPA specifications.
+Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
+OpenJPA elects to include this software in this distribution under the
+CDDL license. You can obtain a copy of the License at:
+ https://glassfish.dev.java.net/public/CDDL+GPL.html
+The source code is available at:
+ https://glassfish.dev.java.net/source/browse/glassfish/
+
+OpenJPA includes software written by Miroslav Nachev
+
+OpenJPA uses test code written by Charles Tillman.
+
Modified: openjpa/branches/2.0.x/README.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/README.txt?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/README.txt (original)
+++ openjpa/branches/2.0.x/README.txt Sat Aug 7 14:00:37 2010
@@ -1,5 +1,6 @@
-Apache OpenJPA README
-=====================
+Apache OpenJPA - README.txt
+Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+--------------------------------------------------------------------------------
Thank you for downloading this release of Apache OpenJPA.
Modified: openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm (original)
+++ openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm Sat Aug 7 14:00:37 2010
@@ -1,3 +1,21 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
Apache License
Version 2.0, January 2004
Modified: openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/branches/2.0.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm Sat Aug 7 14:00:37 2010
@@ -1,5 +1,21 @@
-
-Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
openjpa-all includes software developed by the:
Apache Commons Collections project
Modified: openjpa/branches/2.0.x/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-examples/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-examples/pom.xml Sat Aug 7 14:00:37 2010
@@ -37,6 +37,11 @@
<name>OpenJPA Examples</name>
<description>OpenJPA Examples</description>
+ <properties>
+ <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
+ <checkstyle.config.location>${project.basedir}/../openjpa-project/checkstyle.xml</checkstyle.config.location>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -59,6 +64,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -74,41 +80,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>${artifactId}</Bundle-Name>
- <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
- <Bundle-DocURL>http://openjpa.apache.org/documentation.html</Bundle-DocURL>
- <Bundle-Activator>hellojpa.Main</Bundle-Activator>
- <!-- Eclipse metadata -->
- <Eclipse-Autostart>false</Eclipse-Autostart>
- <Bundle-ClassPath>.</Bundle-ClassPath>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/tck/pom.xml Sat Aug 7 14:00:37 2010
@@ -81,6 +81,19 @@
<openjpa.Log>DefaultLevel=WARN</openjpa.Log>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!-- Don't publish these artifacts to central -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<!-- JPA 2.0 TCK Profile -->
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=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/validation/pom.xml Sat Aug 7 14:00:37 2010
@@ -36,20 +36,8 @@
<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>
- <!-- Profile for testing with Agimatec validation provider -->
+ <!-- Profile for testing with Apache BVAL provider -->
<!-- See http://incubator.apache.org/projects/beanvalidation.html -->
<profile>
<id>bval</id>
@@ -66,8 +54,8 @@
</dependency>
<dependency>
<groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr303</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <artifactId>org.apache.bval.bundle</artifactId>
+ <version>0.1-incubating</version>
<scope>test</scope>
<exclusions>
<!-- force usage of the geronimo-validation_1.0_spec -->
@@ -92,6 +80,26 @@
</dependencies>
</profile>
+ <!-- Test profile for testing with Apache BVAL and Java SE 5 -->
+ <profile>
+ <id>test-java5</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.3</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<!-- Default profile for testing with Hibernate Bean Validation RI -->
<profile>
<id>hibernate</id>
@@ -155,77 +163,6 @@
</repository>
</repositories>
</profile>
-
- <!-- OLD Profile for testing with Agimatec validation provider -->
- <profile>
- <id>agimatec</id>
- <activation>
- <property>
- <name>agimatec</name>
- </property>
- </activation>
- <dependencies>
- <!-- See http://code.google.com/p/agimatec-validation/wiki/GettingStarted -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.agimatec</groupId>
- <artifactId>agimatec-jsr303</artifactId>
- <version>0.9.6</version>
- <scope>test</scope>
- <exclusions>
- <!-- force usage of the geronimo-validation_1.0_spec -->
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- <!-- use our level of the geronimo-jpa_2.0_spec -->
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.agimatec</groupId>
- <artifactId>agimatec-validation</artifactId>
- <version>0.9.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>agimatec.oss.sonatype.org</id>
- <name>Sonatype OSS Repository</name>
- <url>http://oss.sonatype.org/content/repositories/agimatec</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <checksumPolicy>ignore</checksumPolicy>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- </repository>
- </repositories>
- </profile>
</profiles>
<dependencies>
@@ -274,7 +211,6 @@
<executions>
<execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
@@ -340,16 +276,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/branches/2.0.x/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-jdbc/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-jdbc/pom.xml Sat Aug 7 14:00:37 2010
@@ -89,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/branches/2.0.x/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-kernel/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-kernel/pom.xml Sat Aug 7 14:00:37 2010
@@ -66,6 +66,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -121,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>
@@ -140,6 +150,7 @@
</plugin>
</plugins>
</build>
+
<repositories>
<!--
Internal (in SVN) repository which contains jar files that are not
Modified: openjpa/branches/2.0.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/branches/2.0.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm Sat Aug 7 14:00:37 2010
@@ -1,3 +1,21 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
openjpa-kernel includes software written by Miroslav Nachev
Modified: openjpa/branches/2.0.x/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-lib/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-lib/pom.xml Sat Aug 7 14:00:37 2010
@@ -75,6 +75,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<!--
@@ -124,8 +125,23 @@ openjpa.version=${project.version}</echo
<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/branches/2.0.x/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-persistence-jdbc/pom.xml Sat Aug 7 14:00:37 2010
@@ -160,6 +160,10 @@
<connection.url>${openjpa.postgresql.url}</connection.url>
<connection.username>${openjpa.postgresql.username}</connection.username>
<connection.password>${openjpa.postgresql.password}</connection.password>
+ <!-- DBCP overrides -->
+ <dbcp.maxIdle>0</dbcp.maxIdle>
+ <dbcp.minIdle>0</dbcp.minIdle>
+ <dbcp.maxActive>20</dbcp.maxActive>
</properties>
</profile>
@@ -719,6 +723,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -754,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>
@@ -774,7 +796,6 @@
</execution>
<execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm Sat Aug 7 14:00:37 2010
@@ -1 +1,20 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
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=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-persistence-locking/pom.xml Sat Aug 7 14:00:37 2010
@@ -746,7 +746,6 @@
<executions>
<execution>
<id>attach-tests</id>
- <phase>verify</phase>
<goals>
<goal>test-jar</goal>
</goals>
Modified: openjpa/branches/2.0.x/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-persistence/pom.xml Sat Aug 7 14:00:37 2010
@@ -67,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/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm (original)
+++ openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm Sat Aug 7 14:00:37 2010
@@ -1,3 +1,22 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
======================================
LICENSES FOR INCLUDED DEPENDENCIES
Modified: openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/branches/2.0.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm Sat Aug 7 14:00:37 2010
@@ -1,3 +1,21 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
OpenJPA includes the persistence and orm schemas from the JPA specifications.
Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
Modified: openjpa/branches/2.0.x/openjpa-project/BUILDING.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/BUILDING.txt?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/BUILDING.txt (original)
+++ openjpa/branches/2.0.x/openjpa-project/BUILDING.txt Sat Aug 7 14:00:37 2010
@@ -1,21 +1,6 @@
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
- Building OpenJPA
-===============================================================================
+Building Apache OpenJPA
+Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+--------------------------------------------------------------------------------
These instructions describe how to build OpenJPA from source code using the
Apache Maven 2 build tool. They are written for use from the console, and are
@@ -29,10 +14,10 @@ website at http://openjpa.apache.org/bui
OpenJPA requires Java 1.6 or later to build, but still supports using
Java SE 5 for runtime even though some features are only available
with Java SE 6.
- 2. Install the build tool Apache Maven 2.0.9 or later, from:
+ 2. Install the build tool Apache Maven 2.2.1 or later, from:
http://maven.apache.org/
If it is installed correctly, typing mvn -v from the console will result
- in the text "Maven version: 2.0.9"
+ in the text "Maven version: 2.2.1"
3. Extract the source archive if you have not already done so.
The source will create a new directory named:
openjpa-<version>-source. Where <version> is the openjpa
@@ -70,31 +55,30 @@ Java(TM) SE Runtime Environment (build 1
Java HotSpot(TM) 64-Bit Server VM (build 14.3-b01-101, mixed mode)
$ mvn -v
-Maven version: 2.0.10
+Maven version: 2.2.1
$ svn --version
svn, version 1.5.5 (r34862)
compiled Jan 5 2009, 12:30:39
-$ svn co https://svn.apache.org/repos/asf/openjpa/trunk/
-A trunk/openjpa-lib
-A trunk/openjpa-lib/src
-A trunk/openjpa-lib/src/test
-A trunk/openjpa-lib/src/test/java
-A trunk/openjpa-lib/src/test/java/org
-A trunk/openjpa-lib/src/test/java/org/apache
-A trunk/openjpa-lib/src/test/java/org/apache/openjpa
-A trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib
-A trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/test
-A trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.
-java
+$ svn co https://svn.apache.org/repos/asf/openjpa/tags/2.0.0
+A 2.0.0/openjpa-lib
+A 2.0.0/openjpa-lib/src
+A 2.0.0/openjpa-lib/src/test
+A 2.0.0/openjpa-lib/src/test/java
+A 2.0.0/openjpa-lib/src/test/java/org
+A 2.0.0/openjpa-lib/src/test/java/org/apache
+A 2.0.0/openjpa-lib/src/test/java/org/apache/openjpa
+A 2.0.0/openjpa-lib/src/test/java/org/apache/openjpa/lib
+A 2.0.0/openjpa-lib/src/test/java/org/apache/openjpa/lib/test
+A 2.0.0/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
...
-A trunk/openjpa-persistence/pom.xml
+A 2.0.0/openjpa-persistence/pom.xml
Checked out revision 915725.
-$ cd trunk/
+$ cd 2.0.0/
$ mvn clean install -DfailIfNoTests=false -Dtest=
@@ -156,6 +140,6 @@ $ mvn clean install -DfailIfNoTests=fals
$ ls openjpa-project/target/site/downloads/
-apache-openjpa-2.0.0-SNAPSHOT-binary.zip
-apache-openjpa-2.0.0-SNAPSHOT-source.zip
+apache-openjpa-2.0.0-binary.zip
+apache-openjpa-2.0.0-source.zip
Modified: openjpa/branches/2.0.x/openjpa-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/CHANGES.txt?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/CHANGES.txt (original)
+++ openjpa/branches/2.0.x/openjpa-project/CHANGES.txt Sat Aug 7 14:00:37 2010
@@ -1,5 +1,6 @@
- Apache OpenJPA 2.0.0
- --------------------
+Apache OpenJPA 2.0.1-SNAPSHOT
+Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+--------------------------------------------------------------------------------
Content
-------
@@ -19,7 +20,7 @@ Content
Overview
--------
- The Apache OpenJPA community is proud to release a 2.0.0 distribution of
+ The Apache OpenJPA community is proud to release a 2.0.1-SNAPSHOT distribution of
OpenJPA. This distribution is based on the final JSR 317 Java
Persistence API, Version 2.0 specification and passes the JPA 2.0 TCK,
while remaining backwards compatiable with prior releases based on the
@@ -163,6 +164,12 @@ Getting Involved
* Bugs and other issues can be posted on the project JIRA.
+Included Changes in OpenJPA 2.0.1-SNAPSHOT
+------------------------------------------
+
+ * TBD *
+
+
Included Changes in OpenJPA 2.0.0
---------------------------------
Modified: openjpa/branches/2.0.x/openjpa-project/NOTICE.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/NOTICE.txt?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/NOTICE.txt (original)
+++ openjpa/branches/2.0.x/openjpa-project/NOTICE.txt Sat Aug 7 14:00:37 2010
@@ -5,8 +5,6 @@ Copyright 2006-2010 The Apache Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.
-
The OpenJPA binary assembly includes software developed by the:
Apache Commons Collections project
Apache Commons Lang project
Modified: openjpa/branches/2.0.x/openjpa-project/README.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/README.txt?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/README.txt (original)
+++ openjpa/branches/2.0.x/openjpa-project/README.txt Sat Aug 7 14:00:37 2010
@@ -1,13 +1,14 @@
-Apache OpenJPA README
-=====================
-
-Thank you for downloading this release of Apache OpenJPA.
-
-Please refer to the following files for more information:
- BUILDING.txt
- CHANGES.txt
- RELEASE-NOTES.html
-
-For documentation and project information, please visit our project site:
- http://openjpa.apache.org/
-
+Apache OpenJPA - README.txt
+Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+--------------------------------------------------------------------------------
+
+Thank you for downloading this release of Apache OpenJPA.
+
+Please refer to the following files for more information:
+ BUILDING.txt
+ CHANGES.txt
+ RELEASE-NOTES.html
+
+For documentation and project information, please visit our project site:
+ http://openjpa.apache.org/
+
Modified: openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html (original)
+++ openjpa/branches/2.0.x/openjpa-project/RELEASE-NOTES.html Sat Aug 7 14:00:37 2010
@@ -1,7 +1,25 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE- 2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<html>
-<title>Release Notes for Apache OpenJPA 2.0.0</title>
+<title>Release Notes for Apache OpenJPA 2.0.1-SNAPSHOT</title>
<body>
-<h1>Release Notes for Apache OpenJPA 2.0.0</h1>
+<h1>Release Notes for Apache OpenJPA 2.0.1-SNAPSHOT</h1>
<p>
<ul>
<li><a href="#Overview">Overview</a></li>
@@ -12,6 +30,7 @@
<li><a href="#Notice">Notice</a></li>
<li><a href="#ReleaseNotes">Release Notes</a></li>
<ul>
+ <li><a href="#210">2.0.1-SNAPSHOT</a></li>
<li><a href="#200">2.0.0</a></li>
<li><a href="#200beta3">2.0.0 Beta 3</a></li>
<li><a href="#200beta2">2.0.0 Beta 2</a></li>
@@ -28,7 +47,7 @@
<h2><a name="Overview"></a>Overview</h2>
<P>
- The Apache OpenJPA community is proud to release a 2.0.0 distribution of
+ The Apache OpenJPA community is proud to release a 2.0.1-SNAPSHOT distribution of
OpenJPA. This distribution is based on the final JSR 317 Java
Persistence API, Version 2.0 specification and passes the JPA 2.0 TCK,
while remaining backwards compatiable with prior releases based on the
@@ -231,6 +250,11 @@ in each release of OpenJPA.</P>
<h2><a name="ReleaseNotes">Release Notes</h2>
<hr>
+<h3><a name="201">OpenJPA 2.0.1-SNAPSHOT</h3>
+<ul><li> TBD </li></ul>
+
+
+<hr>
<h3><a name="200">OpenJPA 2.0.0</h3>
<h4>Sub-task</h4>
<ul>
Modified: openjpa/branches/2.0.x/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-project/pom.xml Sat Aug 7 14:00:37 2010
@@ -26,9 +26,9 @@
mvn clean compile package -Dtest=false -DfailIfNoTests=false
- To build and deploy a full digned release with docs, run:
+ To build and deploy a fully signed release with docs, run:
- mvn clean deploy -Pjavadoc-profile,docbook-profile,sign-release
+ mvn clean deploy -Papache-release,docbook-profile
Note that to sign the release, you need to have "gpg" installed and
create a key. See http://apache.org/dev/release-signing.html
@@ -136,7 +136,9 @@
<goal>attached</goal>
</goals>
<configuration>
- <descriptor>assembly.xml</descriptor>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
<outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
<workDirectory>target/work</workDirectory>
</configuration>
@@ -399,7 +401,7 @@
<property name="nightly.user.name" value="${nightly.user.name}" />
<property name="nightly.password" value="${nightly.password}" />
<property name="nightly.version" value="${nightly.version}" />
- <property name="pom.version" value="${pom.version}" />
+ <property name="project.version" value="${project.version}" />
</ant>
</tasks>
</configuration>
@@ -419,12 +421,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- included so we can include it in the distribution -->
Modified: openjpa/branches/2.0.x/openjpa-project/upload.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-project/upload.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-project/upload.xml (original)
+++ openjpa/branches/2.0.x/openjpa-project/upload.xml Sat Aug 7 14:00:37 2010
@@ -55,17 +55,17 @@
</fileset>
</scp>
<!-- remove directories, hopefully this fails silently. mkdir does not and stops the process these exist.-->
- <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${pom.version}/docs" trust="true" />
- <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${pom.version}/downloads" trust="true" />
+ <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/docs" trust="true" />
+ <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/downloads" trust="true" />
<sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="unzip -qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" />
<sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm ${build.dir}/docs.zip" trust="true" />
- <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="mkdir ${build.dir}/apache-openjpa-${pom.version}/downloads " trust="true" />
+ <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="mkdir ${build.dir}/apache-openjpa-${project.version}/downloads " trust="true" />
- <scp todir="${nightly.user.name}:${nightly.password}@${host}:${build.dir}/apache-openjpa-${pom.version}/downloads" trust="true">
+ <scp todir="${nightly.user.name}:${nightly.password}@${host}:${build.dir}/apache-openjpa-${project.version}/downloads" trust="true">
<fileset dir="target/site/downloads" />
</scp>
- <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w ${build.dir}/apache-openjpa-${pom.version}" trust="true" />
+ <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w ${build.dir}/apache-openjpa-${project.version}" trust="true" />
<delete>
<fileset dir="target/site/tempDocs" />
Modified: openjpa/branches/2.0.x/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-slice/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-slice/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-slice/pom.xml Sat Aug 7 14:00:37 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/branches/2.0.x/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml Sat Aug 7 14:00:37 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/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm (original)
+++ openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm Sat Aug 7 14:00:37 2010
@@ -1,3 +1,22 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
======================================
LICENSES FOR INCLUDED DEPENDENCIES
Modified: openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm?rev=983230&r1=983229&r2=983230&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/branches/2.0.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm Sat Aug 7 14:00:37 2010
@@ -1,5 +1,22 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
-Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.