You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/07/27 10:32:24 UTC

svn commit: r560140 - in /activemq/camel/trunk: components/camel-jpa/pom.xml pom.xml

Author: jstrachan
Date: Fri Jul 27 01:32:23 2007
New Revision: 560140

URL: http://svn.apache.org/viewvc?view=rev&rev=560140
Log:
patched pom to avoid camel-jpa being dependent on openjpa

Modified:
    activemq/camel/trunk/components/camel-jpa/pom.xml
    activemq/camel/trunk/pom.xml

Modified: activemq/camel/trunk/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/pom.xml?view=diff&rev=560140&r1=560139&r2=560140
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jpa/pom.xml Fri Jul 27 01:32:23 2007
@@ -66,14 +66,13 @@
       <version>1.0</version>
     </dependency>
 
+
+    <!-- testing -->
     <dependency>
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa-persistence-jdbc</artifactId>
-      <!--<version>0.9.7-incubating-SNAPSHOT</version>-->
-      <!-- mandatory dependency for the enhancer! -->
-      <!--<scope>test</scope>-->
+      <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
@@ -91,8 +90,6 @@
       <version>3.2</version>
       <scope>test</scope>
     </dependency>
-
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -107,6 +104,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-persistence-jdbc</artifactId>
+            <version>${openjpa-version}</version>
+          </dependency>
+        </dependencies>
 
         <executions>
           <execution>

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?view=diff&rev=560140&r1=560139&r2=560140
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Jul 27 01:32:23 2007
@@ -36,13 +36,13 @@
   <properties>
     <camel-version>1.1-SNAPSHOT</camel-version>
     <compiler.fork>false</compiler.fork>
-    <release-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
-    </release-repo-url>
-    <snapshot-repo-url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</snapshot-repo-url>
+    <cxf-version>2.0-incubator</cxf-version>
     <m1-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-repo-url>
+    <openjpa-version>0.9.6-incubating</openjpa-version>
+    <release-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</release-repo-url>
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/camel/maven/</site-repo-url>
     <slf4j-version>1.3.0</slf4j-version>
-    <cxf-version>2.0-incubator</cxf-version>
+    <snapshot-repo-url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</snapshot-repo-url>
   </properties>
 
   <url>http://apache.apache.org/camel/</url>
@@ -562,7 +562,7 @@
       <dependency>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-persistence-jdbc</artifactId>
-        <version>0.9.6-incubating</version>
+        <version>${openjpa-version}</version>
       </dependency>
 
       <dependency>