openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r421069 - in /incubator/openjpa/trunk: openjpa-kernel-5/pom.xml openjpa-kernel/pom.xml openjpa-lib/pom.xml openjpa-persistence/pom.xml openjpa-xmlstore/pom.xml pom.xml serp/
Date Wed, 12 Jul 2006 01:32:26 GMT
Author: pcl
Date: Tue Jul 11 18:32:26 2006
New Revision: 421069

URL: http://svn.apache.org/viewvc?rev=421069&view=rev
Log:
removed serp fork; replaced with new maven-based serp access. also updated poms to use the
Geronimo versions of JTA etc. until we get closure on the plan going forward with the authoritative
Glassfish jars

Removed:
    incubator/openjpa/trunk/serp/
Modified:
    incubator/openjpa/trunk/openjpa-kernel-5/pom.xml
    incubator/openjpa/trunk/openjpa-kernel/pom.xml
    incubator/openjpa/trunk/openjpa-lib/pom.xml
    incubator/openjpa/trunk/openjpa-persistence/pom.xml
    incubator/openjpa/trunk/openjpa-xmlstore/pom.xml
    incubator/openjpa/trunk/pom.xml

Modified: incubator/openjpa/trunk/openjpa-kernel-5/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel-5/pom.xml?rev=421069&r1=421068&r2=421069&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel-5/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-kernel-5/pom.xml Tue Jul 11 18:32:26 2006
@@ -22,7 +22,7 @@
 
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>0.0.1</version>
+            <version>${pom.version}</version>
             <scope>compile</scope>
 
         </dependency>

Modified: incubator/openjpa/trunk/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/pom.xml?rev=421069&r1=421068&r2=421069&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-kernel/pom.xml Tue Jul 11 18:32:26 2006
@@ -22,34 +22,38 @@
 
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
-            <version>0.0.1</version>
+            <version>${pom.version}</version>
             <scope>compile</scope>
 
         </dependency>
+
+
         <dependency>
 
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
-            <version>1.1</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <version>1.0.1</version>
             <scope>compile</scope>
 
         </dependency>
         <dependency>
 
-            <groupId>javax.resource</groupId>
-            <artifactId>connector</artifactId>
-            <version>1.0</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <version>1.0.1</version>
             <scope>compile</scope>
 
         </dependency>
+
         <dependency>
 
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.0.1B</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0.1</version>
             <scope>compile</scope>
 
         </dependency>
+
 
     </dependencies>
     <build>

Modified: incubator/openjpa/trunk/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/pom.xml?rev=421069&r1=421068&r2=421069&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-lib/pom.xml Tue Jul 11 18:32:26 2006
@@ -20,14 +20,6 @@
 
         <dependency>
 
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>serp</artifactId>
-            <version>0.0.1</version>
-            <scope>compile</scope>
-
-        </dependency>
-        <dependency>
-
             <groupId>jakarta-regexp</groupId>
             <artifactId>jakarta-regexp</artifactId>
             <version>1.4</version>
@@ -98,11 +90,12 @@
             <scope>compile</scope>
 
         </dependency>
+
         <dependency>
 
-            <groupId>jdbc</groupId>
-            <artifactId>jdbc-stdext</artifactId>
-            <version>2.0</version>
+            <groupId>net.sourceforge.serp</groupId>
+            <artifactId>serp</artifactId>
+            <version>1.11.0</version>
             <scope>compile</scope>
 
         </dependency>

Modified: incubator/openjpa/trunk/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/pom.xml?rev=421069&r1=421068&r2=421069&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-persistence/pom.xml Tue Jul 11 18:32:26 2006
@@ -22,7 +22,7 @@
 
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel-5</artifactId>
-            <version>0.0.1</version>
+            <version>${pom.version}</version>
             <scope>compile</scope>
 
         </dependency>

Modified: incubator/openjpa/trunk/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-xmlstore/pom.xml?rev=421069&r1=421068&r2=421069&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-xmlstore/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-xmlstore/pom.xml Tue Jul 11 18:32:26 2006
@@ -6,8 +6,8 @@
     <artifactId>openjpa-xmlstore</artifactId>
     <packaging>jar</packaging>
 
-    <name>JPA</name>
-    <description>JPA</description>
+    <name>XML Store</name>
+    <description>XML Store for OpenJPA</description>
     <url>http://incubator.apache.org/projects/openjpa</url>
     <parent>
 
@@ -22,7 +22,7 @@
 
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
-            <version>0.0.1</version>
+            <version>${pom.version}</version>
             <scope>compile</scope>
 
         </dependency>

Modified: incubator/openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/pom.xml?rev=421069&r1=421068&r2=421069&view=diff
==============================================================================
--- incubator/openjpa/trunk/pom.xml (original)
+++ incubator/openjpa/trunk/pom.xml Tue Jul 11 18:32:26 2006
@@ -84,7 +84,6 @@
     <modules>
 
         <module>openjpa-lib</module>
-        <module>serp</module>
         <module>openjpa-kernel</module>
         <module>openjpa-kernel-5</module>
         <module>openjpa-persistence</module>
@@ -101,17 +100,17 @@
 
 
         <repository>
-            <id>swami</id>
-            <name>Swami repository</name>
-            <url>http://m2.ngbw.org</url>
-        </repository>
-
-
-        <repository>
             <id>java-net</id>
             <name>dev.java.net repository</name>
             <url>https://maven-repository.dev.java.net/nonav/repository</url>
             <layout>legacy</layout>
+        </repository>
+
+
+        <repository>
+            <id>serp</id>
+            <name>Serp Project Repository</name>
+            <url>http://serp.sourceforge.net/m2repo</url>
         </repository>
 
     </repositories>



Mime
View raw message