svn commit: r769351 - in /camel/branches/camel-1.x: ./ platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml pom.xml

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

svn commit: r769351 - in /camel/branches/camel-1.x: ./ platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml pom.xml

gertv-2
Author: gertv
Date: Tue Apr 28 11:59:24 2009
New Revision: 769351

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

........
  r769346 | gertv | 2009-04-28 13:50:52 +0200 (Tue, 28 Apr 2009) | 1 line
 
  CAMEL-1526: Using resource filtering instead of the generator
........

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

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 11:59:24 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,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239
+/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,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346

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

Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=769351&r1=769350&r2=769351&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Tue Apr 28 11:59:24 2009
@@ -39,16 +39,23 @@
       <antlr-bundle-version>3.0.1_1</antlr-bundle-version>
       <asm-bundle-version>2.2.3_1</asm-bundle-version>
       <dom4j-bundle-version>1.6_1</dom4j-bundle-version>
-      <commons-beanutils-version>1.7.0_1</commons-beanutils-version>
+      <commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-bundle-version>
       <commons-dbcp-bundle-version>1.2.2_3</commons-dbcp-bundle-version>
-      <commons-csv-bundle-version>1.0-r706899_1</commons-csv-bundle-version>
+      <commons-csv-version>1.0-r706899_1</commons-csv-version>
       <commons-httpclient-bundle-version>3.1_1</commons-httpclient-bundle-version>
       <commons-io-bundle-version>1.3.2_1</commons-io-bundle-version>
+      <commons-jxpath-version>1.3</commons-jxpath-version>
+      <commons-lang-version>2.4</commons-lang-version>
+      <commons-net-version>2.0</commons-net-version>
       <flatpack-bundle-version>3.1.1_1</flatpack-bundle-version>
       <geronimo-el-version>1.0.1</geronimo-el-version>
+      <geronimo-jaxws-spec-version>1.1.2</geronimo-jaxws-spec-version>
       <geronimo-jsp-version>1.0.1</geronimo-jsp-version>
+      <geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
       <hamcrest-bundle-version>1.2-dev1_1</hamcrest-bundle-version>
       <ibatis-bundle-version>2.3.4.726_1</ibatis-bundle-version>
+      <jackrabbit-version>1.5.3</jackrabbit-version>
+      <jaxb-bundle-version>2.1.6_1</jaxb-bundle-version>
       <jexcelapi-bundle-version>2.4.2_1</jexcelapi-bundle-version>
       <httpcore-bundle-version>4.0-alpha6_1</httpcore-bundle-version>
       <irclib-bundle-version>1.10_1</irclib-bundle-version>
@@ -62,6 +69,7 @@
       <jsch-bundle-version>0.1.31_1</jsch-bundle-version>
       <juel-bundle-version>2.1.0_1</juel-bundle-version>
       <junit-bundle-version>4.4_1</junit-bundle-version>
+      <neethi-version>2.0.4</neethi-version>
       <ognl-bundle-version>2.7.3_1</ognl-bundle-version>
       <oscache-bundle-version>2.4_1</oscache-bundle-version>
       <quartz-bundle-version>1.6.1_1</quartz-bundle-version>
@@ -69,9 +77,11 @@
       <saxon-bundle-version>9.1.0.1_1</saxon-bundle-version>
       <servicemix-specs-version>1.3.0</servicemix-specs-version>
       <smack-bundle-version>3.0.4_1</smack-bundle-version>
+      <spring-javaconfig-version>1.0.0.BUILD-SNAPSHOT</spring-javaconfig-version>
       <stringtemplate-bundle-version>3.2_1</stringtemplate-bundle-version>
       <velocity-bundle-version>1.5_1</velocity-bundle-version>
       <xmlbeans-bundle-version>2.4.0_2</xmlbeans-bundle-version>
+      <xmlschema-version>1.4.4</xmlschema-version>
       <xmlsec-bundle-version>1.3.0_1</xmlsec-bundle-version>
       <xmlresolver-bundle-version>1.2_1</xmlresolver-bundle-version>
       <xpp3-bundle-version>1.1.4c_1</xpp3-bundle-version>
@@ -80,53 +90,6 @@
       <wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
     </properties>
 
-    <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>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>
-
-
-    </repositories>
-
     <build>
       <resources>
         <resource>
@@ -139,275 +102,38 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
           <executions>
-            <execution>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>resources</goal>
-              </goals>
-            </execution>
+             <execution>
+                <id>filter</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>resources</goal>
+                </goals>
+             </execution>
           </executions>
         </plugin>
         <plugin>
-          <groupId>org.apache.servicemix.tooling</groupId>
-          <artifactId>features-maven-plugin</artifactId>
-          <executions>
-            <execution>
-              <phase>compile</phase>
-              <goals>
-                <goal>generate-features-xml</goal>
-              </goals>
-              <configuration>
-                <bundles>target/classes/bundles.properties</bundles>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
+          <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-artifacts</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>attach-artifact</goal>
+                </goals>
+                <configuration>
+                  <artifacts>
+                    <artifact>
+                      <file>target/classes/features.xml</file>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+                     </artifact>
+                   </artifacts>
+                 </configuration>
+               </execution>
+           </executions>
+         </plugin>
       </plugins>
     </build>
 
-   <dependencies>
-     <!-- Apache ServiceMix Kernel -->
-     <dependency>
-       <groupId>org.apache.servicemix.kernel</groupId>
-       <artifactId>apache-servicemix-kernel</artifactId>
-       <version>1.1.0</version>
-       <type>pom</type>
-       <scope>provided</scope>
-       <exclusions>
-         <exclusion>
-           <groupId>org.apache.servicemix.bundles</groupId>
-           <artifactId>org.apache.servicemix.bundles.asm</artifactId>
-         </exclusion>
-       </exclusions>
-     </dependency>
-     <!-- some Camel components have to built in a specific order -->
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-core</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-spring</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-osgi</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-cxf</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-http</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-mina</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jetty</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jms</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <!-- the rest of them are just built alpabetically -->
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-amqp</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-atom</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-bam</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-csv</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-flatpack</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-ftp</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-groovy</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-hamcrest</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-ibatis</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-irc</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jaxb</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jcr</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jhc</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jing</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jdbc</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-josql</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jpa</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jxpath</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jpa</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-juel</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-jpa</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <!-- Moved quartz before mail to have commons-collections auto-discovered, cfr. SMX4KNL-260 -->
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-quartz</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-mail</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-msv</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-ognl</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-rmi</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-saxon</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-scala</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-script</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-spring-integration</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-sql</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-stream</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-stringtemplate</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <!-- skipping camel-swing/camel-uface -->
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-velocity</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-xmlbeans</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-xmpp</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.camel</groupId>
-       <artifactId>camel-xstream</artifactId>
-       <version>${pom.version}</version>
-     </dependency>
-   </dependencies>
 </project>

Modified: camel/branches/camel-1.x/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/pom.xml?rev=769351&r1=769350&r2=769351&view=diff
==============================================================================
--- camel/branches/camel-1.x/pom.xml (original)
+++ camel/branches/camel-1.x/pom.xml Tue Apr 28 11:59:24 2009
@@ -47,6 +47,9 @@
     <cxf-version>2.2</cxf-version>
     <felix-version>1.4.1</felix-version>
     <felix-osgi-version>1.2.0</felix-osgi-version>
+    <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
+    <geronimo-jpa-spec-version>1.1.1</geronimo-jpa-spec-version>
+    <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
     <httpcore-version>4.0-beta3</httpcore-version>
     <httpcore-niossl-version>4.0-alpha6</httpcore-niossl-version>
     <jetty-version>6.1.14</jetty-version>
@@ -633,13 +636,13 @@
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>1.1.1</version>
+        <version>${geronimo-jms-spec-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jta_1.1_spec</artifactId>
-        <version>1.1.1</version>
+        <version>${geronimo-jta-spec-version}</version>
       </dependency>
 
       <dependency>
@@ -675,7 +678,7 @@
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jpa_3.0_spec</artifactId>
-        <version>1.1.1</version>
+        <version>${geronimo-jpa-spec-version}</version>
       </dependency>
 
       <!-- Optional Spring Support -->