You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/02/06 04:26:33 UTC
svn commit: r907164 - in /geronimo/plugins/openjpa2/branches/2.2:
geronimo-persistence-jpa20-builder/pom.xml openjpa2/pom.xml
persistence-jpa20-deployer/pom.xml pom.xml
Author: dwoods
Date: Sat Feb 6 03:26:32 2010
New Revision: 907164
URL: http://svn.apache.org/viewvc?rev=907164&view=rev
Log:
updates from 2.1 branch
Modified:
geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml
geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
geronimo/plugins/openjpa2/branches/2.2/pom.xml
Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml?rev=907164&r1=907163&r2=907164&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml Sat Feb 6 03:26:32 2010
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-persistence-jpa20</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
Modified: geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml?rev=907164&r1=907163&r2=907164&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml Sat Feb 6 03:26:32 2010
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openjpa2</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<!-- OpenJPA depends -->
@@ -113,17 +113,17 @@
<config-xml-content server="default" />
<config-xml-content server="offline" />
<!-- handle upgrading prior openjpa2 2.2-M3 CAR -->
- <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
- <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.2-beta-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.2-beta-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.2-beta-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.2-beta-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
<!-- handle openjpa to openjpa2 CAR alias -->
- <artifact-alias key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
- <artifact-alias key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
- <artifact-alias key="org.apache.geronimo.configs/openjpa/2.2.1-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.2.1-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/openjpa/2.2.1-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.2.1-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
<!-- handle geronimo-jpa_3.0 to 2.0 JAR alias -->
<artifact-alias key="org.apache.geronimo.specs/geronimo-jpa_3.0_spec//jar">org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${jpa2specVersion}/jar</artifact-alias>
<artifact-alias key="org.apache.geronimo.specs/geronimo-jpa_3.0_spec/1.1.1/jar">org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${jpa2specVersion}/jar</artifact-alias>
Modified: geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml?rev=907164&r1=907163&r2=907164&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml Sat Feb 6 03:26:32 2010
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-persistence-jpa20-builder</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
@@ -137,24 +137,24 @@
</gbean>
</config-xml-content>
<!-- handle upgrading persistence-jpa20-deployer -->
- <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
- <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-beta-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-beta-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-beta-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-M3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.2-beta-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
<!-- handle persistence-jpa10-deployer to jpa20 -->
- <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
- <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
- <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.2.1-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.2.1-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.2.1-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.2.1-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
<!-- handle geronimo-persistence-jpa10 to jpa20 -->
- <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10//jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${version}/jar</artifact-alias>
- <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/${geronimoVersion}/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${version}/jar</artifact-alias>
- <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.2.1-SNAPSHOT/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${version}/jar</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10//jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${version}/jar</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/${geronimoVersion}/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${version}/jar</artifact-alias>
- <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.2.1-SNAPSHOT/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${version}/jar</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10//jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/${geronimoVersion}/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.2.1-SNAPSHOT/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10//jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/${geronimoVersion}/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+ <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.2.1-SNAPSHOT/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/plugins/openjpa2/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/pom.xml?rev=907164&r1=907163&r2=907164&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/pom.xml Sat Feb 6 03:26:32 2010
@@ -76,6 +76,13 @@
<scope>import</scope>
</dependency>
-->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa2Version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- project depends -->
<dependency>
@@ -187,13 +194,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <modules>
+ <module>geronimo-openjpa2</module>
+ <module>openjpa2</module>
+ <module>geronimo-persistence-jpa20</module>
+ <module>geronimo-persistence-jpa20-builder</module>
+ <module>persistence-jpa20-deployer</module>
+ <module>jpa-tests</module>
+ </modules>
+ </profile>
+ </profiles>
+
<modules>
<module>geronimo-openjpa2</module>
<module>openjpa2</module>
<module>geronimo-persistence-jpa20</module>
<module>geronimo-persistence-jpa20-builder</module>
<module>persistence-jpa20-deployer</module>
- <module>jpa-tests</module>
</modules>
<build>
@@ -209,6 +229,14 @@
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>