You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/09/22 10:12:58 UTC
svn commit: r1704473 - in /aries/trunk/jpa:
itests/jpa-container-itest/pom.xml
itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
itests/jpa-tck-itest/pom.xml itests/pom.xml jpa-parent/pom.xml
Author: cschneider
Date: Tue Sep 22 08:12:54 2015
New Revision: 1704473
URL: http://svn.apache.org/viewvc?rev=1704473&view=rev
Log:
Switch to new paxjdbc and org.osgi.service.jdbc
Modified:
aries/trunk/jpa/itests/jpa-container-itest/pom.xml
aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
aries/trunk/jpa/itests/jpa-tck-itest/pom.xml
aries/trunk/jpa/itests/pom.xml
aries/trunk/jpa/jpa-parent/pom.xml
Modified: aries/trunk/jpa/itests/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/pom.xml?rev=1704473&r1=1704472&r2=1704473&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-itest/pom.xml Tue Sep 22 08:12:54 2015
@@ -366,9 +366,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.jdbc</groupId>
- <artifactId>pax-jdbc-spec</artifactId>
- <version>${paxjdbc.version}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.jdbc</groupId>
Modified: aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd?rev=1704473&r1=1704472&r2=1704473&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd (original)
+++ aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd Tue Sep 22 08:12:54 2015
@@ -39,8 +39,8 @@ lib/org.eclipse.persistence.jpa-2.6.0.ja
lib/org.eclipse.persistence.antlr-2.6.0.jar;version=file, \
lib/org.eclipse.persistence.jpa.jpql-2.6.0.jar;version=file, \
lib/org.eclipse.persistence.asm-2.6.0.jar;version=file, \
-lib/org.apache.aries.jpa.eclipselink.adapter-2.1.0-SNAPSHOT.jar;version=file, \
-lib/org.apache.aries.jpa.container-2.1.0-SNAPSHOT.jar;version=file, \
+lib/org.apache.aries.jpa.eclipselink.adapter-2.2.0-SNAPSHOT.jar;version=file, \
+lib/org.apache.aries.jpa.container-2.2.0-SNAPSHOT.jar;version=file, \
lib/org.osgi.test.cases.jpa-5.0.0.jar;version=file
-runproperties = \
Modified: aries/trunk/jpa/itests/jpa-tck-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-tck-itest/pom.xml?rev=1704473&r1=1704472&r2=1704473&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-tck-itest/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-tck-itest/pom.xml Tue Sep 22 08:12:54 2015
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: aries/trunk/jpa/itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/pom.xml?rev=1704473&r1=1704472&r2=1704473&view=diff
==============================================================================
--- aries/trunk/jpa/itests/pom.xml (original)
+++ aries/trunk/jpa/itests/pom.xml Tue Sep 22 08:12:54 2015
@@ -45,7 +45,7 @@
<serp.bundle.version>1.14.1_1</serp.bundle.version>
<eclipselink.version>2.6.0</eclipselink.version>
<openjpa.version>2.3.0</openjpa.version>
- <paxjdbc.version>0.6.0</paxjdbc.version>
+ <paxjdbc.version>0.7.0</paxjdbc.version>
</properties>
<modules>
Modified: aries/trunk/jpa/jpa-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-parent/pom.xml?rev=1704473&r1=1704472&r2=1704473&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-parent/pom.xml (original)
+++ aries/trunk/jpa/jpa-parent/pom.xml Tue Sep 22 08:12:54 2015
@@ -71,6 +71,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jdbc</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>