svn commit: r766118 - in /camel/branches/camel-1.x: ./ components/camel-jcr/ platforms/ platforms/karaf/ platforms/karaf/features/ platforms/karaf/features/src/ platforms/karaf/features/src/main/ platforms/karaf/features/src/main/resources/

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r766118 - in /camel/branches/camel-1.x: ./ components/camel-jcr/ platforms/ platforms/karaf/ platforms/karaf/features/ platforms/karaf/features/src/ platforms/karaf/features/src/main/ platforms/karaf/features/src/main/resources/

gertv-2
Author: gertv
Date: Fri Apr 17 19:00:47 2009
New Revision: 766118

URL: http://svn.apache.org/viewvc?rev=766118&view=rev
Log:
Merged revisions 766016 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk

........
  r766016 | gertv | 2009-04-17 16:03:15 +0200 (Fri, 17 Apr 2009) | 1 line
 
  CAMEL-1526: Add a ServiceMix Kernel features descriptor to Camel
........

Added:
    camel/branches/camel-1.x/platforms/   (props changed)
      - copied from r766016, camel/trunk/platforms/
    camel/branches/camel-1.x/platforms/karaf/   (props changed)
      - copied from r766016, camel/trunk/platforms/karaf/
    camel/branches/camel-1.x/platforms/karaf/features/   (props changed)
      - copied from r766016, camel/trunk/platforms/karaf/features/
    camel/branches/camel-1.x/platforms/karaf/features/pom.xml
      - copied, changed from r766016, camel/trunk/platforms/karaf/features/pom.xml
    camel/branches/camel-1.x/platforms/karaf/features/src/
      - copied from r766016, camel/trunk/platforms/karaf/features/src/
    camel/branches/camel-1.x/platforms/karaf/features/src/main/
      - copied from r766016, camel/trunk/platforms/karaf/features/src/main/
    camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/
      - copied from r766016, camel/trunk/platforms/karaf/features/src/main/resources/
    camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/bundles.properties
      - copied unchanged from r766016, camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
    camel/branches/camel-1.x/platforms/karaf/pom.xml
      - copied, changed from r766016, camel/trunk/platforms/karaf/pom.xml
    camel/branches/camel-1.x/platforms/pom.xml
      - copied, changed from r766016, camel/trunk/platforms/pom.xml
Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-jcr/pom.xml
    camel/branches/camel-1.x/pom.xml

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 19:00:47 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-1.x/components/camel-jcr/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jcr/pom.xml?rev=766118&r1=766117&r2=766118&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-jcr/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-jcr/pom.xml Fri Apr 17 19:00:47 2009
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>1.4.5</version>
+      <version>1.5.3</version>
     </dependency>
     <dependency>
       <groupId>javax.jcr</groupId>

Propchange: camel/branches/camel-1.x/platforms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 17 19:00:47 2009
@@ -0,0 +1 @@
+target

Propchange: camel/branches/camel-1.x/platforms/karaf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 17 19:00:47 2009
@@ -0,0 +1 @@
+target

Propchange: camel/branches/camel-1.x/platforms/karaf/features/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 17 19:00:47 2009
@@ -0,0 +1 @@
+target

Copied: camel/branches/camel-1.x/platforms/karaf/features/pom.xml (from r766016, camel/trunk/platforms/karaf/features/pom.xml)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?p2=camel/branches/camel-1.x/platforms/karaf/features/pom.xml&p1=camel/trunk/platforms/karaf/features/pom.xml&r1=766016&r2=766118&rev=766118&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Fri Apr 17 19:00:47 2009
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>karaf</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.karaf</groupId>
     <artifactId>features</artifactId>
     <packaging>pom</packaging>
-    <version>2.0-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <name>Camel :: Platforms :: Apache Karaf :: Features</name>
 
     <properties>
@@ -82,29 +82,48 @@
 
     <repositories>
       <!-- repo for the spring integration jars -->
-    <repository>
-      <id>com.springsource.repository.bundles.external</id>
-      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>uface.m2</id>
-      <url>http://uface.googlecode.com/svn/maven/</url>
-      <name>UFace Maven Repository</name>
-    </repository>
+      <repository>
+        <id>com.springsource.repository.bundles.external</id>
+        <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+        <url>http://repository.springsource.com/maven/bundles/external</url>
+      </repository>
+      <repository>
+        <id>uface.m2</id>
+        <url>http://uface.googlecode.com/svn/maven/</url>
+        <name>UFace Maven Repository</name>
+      </repository>
+      <repository>
+        <id>uface.m2</id>
+        <url>http://uface.googlecode.com/svn/maven/</url>
+        <name>UFace Maven Repository</name>
+      </repository>
+
+      <!-- TODO we can remove this when the commons-csv release syncs to the main repo -->
+      <repository>
+        <id>open.iona.m2</id>
+        <name>IONA Open Source Community Release Repository</name>
+        <url>http://repo.open.iona.com/maven2</url>
+        <snapshots>
+          <enabled>true</enabled>
+        </snapshots>
+        <releases>
+          <enabled>true</enabled>
+        </releases>
+      </repository>
+
+      <!-- holds the Scala bundle -->
+      <repository>
+          <id>servicemix-m2-repo</id>
+          <name>Servicemix Maven2 Repository</name>
+          <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
+          <releases>
+              <enabled>true</enabled>
+          </releases>
+          <snapshots>
+              <enabled>false</enabled>
+          </snapshots>
+      </repository>
 
-    <!-- TODO we can remove this when the commons-csv release syncs to the main repo -->
-    <repository>
-      <id>open.iona.m2</id>
-      <name>IONA Open Source Community Release Repository</name>
-      <url>http://repo.open.iona.com/maven2</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
 
     </repositories>
 

Copied: camel/branches/camel-1.x/platforms/karaf/pom.xml (from r766016, camel/trunk/platforms/karaf/pom.xml)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/pom.xml?p2=camel/branches/camel-1.x/platforms/karaf/pom.xml&p1=camel/trunk/platforms/karaf/pom.xml&r1=766016&r2=766118&rev=766118&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/pom.xml Fri Apr 17 19:00:47 2009
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>platforms</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel</groupId>
     <artifactId>karaf</artifactId>
     <packaging>pom</packaging>
-    <version>2.0-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
     <name>Camel :: Platforms :: Apache Karaf</name>
 
     <properties>
@@ -41,6 +41,17 @@
     <modules>
       <module>features</module>
     </modules>
+
+    <pluginRepositories>
+      <pluginRepository>
+        <snapshots>
+          <enabled>true</enabled>
+        </snapshots>
+        <id>apache.snapshots</id>
+        <name>Apache Snapshot Repository</name>
+        <url>http://repository.apache.org/snapshots</url>
+      </pluginRepository>
+    </pluginRepositories>
 
     <build>
       <pluginManagement>

Copied: camel/branches/camel-1.x/platforms/pom.xml (from r766016, camel/trunk/platforms/pom.xml)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/pom.xml?p2=camel/branches/camel-1.x/platforms/pom.xml&p1=camel/trunk/platforms/pom.xml&r1=766016&r2=766118&rev=766118&view=diff
==============================================================================
--- camel/trunk/platforms/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/pom.xml Fri Apr 17 19:00:47 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>

Modified: camel/branches/camel-1.x/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/pom.xml?rev=766118&r1=766117&r2=766118&view=diff
==============================================================================
--- camel/branches/camel-1.x/pom.xml (original)
+++ camel/branches/camel-1.x/pom.xml Fri Apr 17 19:00:47 2009
@@ -43,6 +43,7 @@
     <!-- Note that activemq dependency is only used for testing! -->
     <activemq-version>5.2.0</activemq-version>
     <apacheds-version>1.5.4</apacheds-version>
+    <axiom-version>1.2.8</axiom-version>
     <cxf-version>2.2</cxf-version>
     <felix-version>1.4.1</felix-version>
     <felix-osgi-version>1.2.0</felix-osgi-version>
@@ -75,8 +76,8 @@
     <guiceyfruit-version>2.0-beta-4</guiceyfruit-version>
     <junit-version>3.8.2</junit-version>
     <saxon-version>9.1.0.1</saxon-version>
-    <scala-version>2.7.2-rc1</scala-version>
-    <scala-plugin-version>2.7.1</scala-plugin-version>
+    <scala-version>2.7.3</scala-version>
+    <scala-plugin-version>2.9.1</scala-plugin-version>
     <testng-version>5.8</testng-version>
     <xbean-spring-version>3.4</xbean-spring-version>
 
@@ -172,6 +173,7 @@
     <module>camel-core</module>
     <module>components</module>
     <module>examples</module>
+    <module>platforms</module>
     <module>tooling</module>
     <module>tests</module>
     <module>apache-camel</module>
@@ -673,7 +675,7 @@
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jpa_3.0_spec</artifactId>
-        <version>1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <!-- Optional Spring Support -->
@@ -944,6 +946,12 @@
         <version>1.2</version>
       </dependency>
 
+      <!-- optional Axiom -->
+      <dependency>
+        <groupId>org.apache.ws.commons.axiom</groupId>
+        <artifactId>axiom-impl</artifactId>
+        <version>1.2.8</version>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>