Author: cmueller
Date: Wed Oct  3 21:18:03 2012
New Revision: 1393768

URL: http://svn.apache.org/viewvc?rev=1393768&view=rev
Log:
CAMEL-5578: Polish our pom's to be as DRY as possible - work in progress

Modified:
    camel/trunk/components/camel-restlet/pom.xml
    camel/trunk/components/camel-rmi/pom.xml
    camel/trunk/components/camel-routebox/pom.xml
    camel/trunk/components/camel-rss/pom.xml
    camel/trunk/components/camel-ruby/pom.xml
    camel/trunk/components/camel-saxon/pom.xml
    camel/trunk/components/camel-script/pom.xml
    camel/trunk/components/camel-servlet/pom.xml
    camel/trunk/components/camel-shiro/pom.xml
    camel/trunk/components/camel-sip/pom.xml
    camel/trunk/components/camel-sjms/pom.xml
    camel/trunk/components/camel-soap/pom.xml
    camel/trunk/components/camel-solr/pom.xml
    camel/trunk/components/camel-spring-batch/pom.xml
    camel/trunk/components/camel-spring-javaconfig/pom.xml
    camel/trunk/components/camel-spring/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/components/camel-restlet/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Wed Oct  3 21:18:03 2012
@@ -56,7 +56,7 @@
       <version>${restlet-version}</version>
     </dependency>
 
-    <!-- test artifacts -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-spring</artifactId>      

Modified: camel/trunk/components/camel-rmi/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-rmi/pom.xml (original)
+++ camel/trunk/components/camel-rmi/pom.xml Wed Oct  3 21:18:03 2012
@@ -40,12 +40,12 @@
       <artifactId>camel-core</artifactId>
     </dependency>
 
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>      
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: camel/trunk/components/camel-routebox/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/pom.xml (original)
+++ camel/trunk/components/camel-routebox/pom.xml Wed Oct  3 21:18:03 2012
@@ -41,7 +41,7 @@
                        <artifactId>camel-core</artifactId>
                </dependency>
 
-               <!-- testing -->
+               <!-- test dependencies -->
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-test</artifactId>
@@ -52,8 +52,6 @@
                        <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
-
-               <!-- logging -->
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-log4j12</artifactId>

Modified: camel/trunk/components/camel-rss/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/pom.xml (original)
+++ camel/trunk/components/camel-rss/pom.xml Wed Oct  3 21:18:03 2012
@@ -35,7 +35,6 @@
   </properties>
  
   <dependencies>
-    <!-- runtime -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
@@ -56,7 +55,7 @@
       <version>${rome-version}</version>
     </dependency>
     
-    <!-- testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>      

Modified: camel/trunk/components/camel-ruby/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/pom.xml (original)
+++ camel/trunk/components/camel-ruby/pom.xml Wed Oct  3 21:18:03 2012
@@ -44,13 +44,12 @@
       <artifactId>jruby</artifactId>
     </dependency>
 
-    <!-- testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>      
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>

Modified: camel/trunk/components/camel-saxon/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/pom.xml (original)
+++ camel/trunk/components/camel-saxon/pom.xml Wed Oct  3 21:18:03 2012
@@ -54,7 +54,7 @@
       <artifactId>saxon9he</artifactId>
     </dependency>
     
-    <!-- testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-spring</artifactId>      

Modified: camel/trunk/components/camel-script/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-script/pom.xml (original)
+++ camel/trunk/components/camel-script/pom.xml Wed Oct  3 21:18:03 2012
@@ -65,55 +65,46 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- ServiceMix Repo Script Engines -->
-
+        <!-- test dependencies -->
         <dependency>
             <groupId>com.sun.script</groupId>
             <artifactId>jython-engine</artifactId>
-            <version>20080611</version>
+            <version>${jython-engine-version}</version>
             <scope>test</scope>
         </dependency>
-
-        <!-- testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-spring</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>rhino</groupId>
             <artifactId>js</artifactId>
-            <version>1.6R7</version>
+            <version>${rhino-version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython</artifactId>
-            <version>2.2.1</version>
+            <version>${jython-version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.jruby</groupId>
             <artifactId>jruby</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.beanshell</groupId>
             <artifactId>bsh</artifactId>
-            <version>2.0b5</version>
+            <version>${bsh-version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: camel/trunk/components/camel-servlet/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/pom.xml (original)
+++ camel/trunk/components/camel-servlet/pom.xml Wed Oct  3 21:18:03 2012
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
@@ -15,7 +14,6 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
     <modelVersion>4.0.0</modelVersion>
@@ -41,7 +39,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>1.2.0</version>
+      <version>${felix-compendium-version}</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -76,6 +74,7 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
@@ -110,7 +109,7 @@
      <dependency>
       <groupId>rhino</groupId>
       <artifactId>js</artifactId>
-      <version>1.7R1</version>
+      <version>${rhino-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: camel/trunk/components/camel-shiro/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-shiro/pom.xml (original)
+++ camel/trunk/components/camel-shiro/pom.xml Wed Oct  3 21:18:03 2012
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
@@ -15,7 +14,6 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
        <modelVersion>4.0.0</modelVersion>
@@ -45,6 +43,8 @@
                        <artifactId>shiro-core</artifactId>
                        <version>${shiro-version}</version>
                </dependency>
+
+        <!-- test dependencies -->
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-test</artifactId>
@@ -55,8 +55,6 @@
                        <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
-
-               <!-- logging -->
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-log4j12</artifactId>

Modified: camel/trunk/components/camel-sip/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/pom.xml (original)
+++ camel/trunk/components/camel-sip/pom.xml Wed Oct  3 21:18:03 2012
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
@@ -15,7 +14,6 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
@@ -54,7 +52,7 @@
                <version>${jain-sip-ri-bundle-version}</version>
            </dependency>
                       
-               <!-- testing -->
+               <!-- test dependencies -->
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-test</artifactId>
@@ -65,8 +63,6 @@
                        <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
-
-               <!-- logging -->
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-log4j12</artifactId>

Modified: camel/trunk/components/camel-sjms/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/pom.xml (original)
+++ camel/trunk/components/camel-sjms/pom.xml Wed Oct  3 21:18:03 2012
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project
     xmlns="http://maven.apache.org/POM/4.0.0";
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-            http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -53,13 +52,6 @@
         
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     </properties>
     <dependencies>
-    <!-- =============================== -->
-    <!-- Required Dependencies -->
-    <!-- =============================== -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core</artifactId>
@@ -67,12 +59,11 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1.1</version>
+            <version>${geronimo-annotation-spec-version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>1.1.1</version>
         </dependency>
 
     <!-- for testing -->
@@ -103,19 +94,11 @@
             <version>${atomikos-transactions-version}</version>
             <scope>test</scope>
         </dependency>
-
-        <!-- logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <optional>true</optional>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -123,15 +106,6 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkMode>pertest</forkMode>

Modified: camel/trunk/components/camel-soap/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Wed Oct  3 21:18:03 2012
@@ -55,7 +55,7 @@
         </dependency>
 
 
-        <!-- for testing -->
+        <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
@@ -125,7 +125,6 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>${cxf-version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources-wsdl</id>

Modified: camel/trunk/components/camel-solr/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/pom.xml (original)
+++ camel/trunk/components/camel-solr/pom.xml Wed Oct  3 21:18:03 2012
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
@@ -15,7 +14,6 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
@@ -53,7 +51,7 @@
       <version>${solr-version}</version>
     </dependency>
 
-    <!-- testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core-xml</artifactId>
@@ -102,10 +100,12 @@
         <artifactId>httpmime</artifactId>
         <version>${httpclient4-version}</version>
      </dependency>
+     
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.24</version>
+      <version>${jetty6-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -128,7 +128,6 @@
       <artifactId>groovy-all</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- logging -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>

Modified: camel/trunk/components/camel-spring-batch/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-batch/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-batch/pom.xml (original)
+++ camel/trunk/components/camel-spring-batch/pom.xml Wed Oct  3 21:18:03 2012
@@ -35,20 +35,17 @@
     </properties>
 
     <dependencies>
-        <!-- Camel -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core</artifactId>
         </dependency>
-
-        <!-- Spring Batch -->
         <dependency>
             <groupId>org.springframework.batch</groupId>
             <artifactId>spring-batch-core</artifactId>
             <version>${spring-batch-version}</version>
         </dependency>
 
-        <!-- Tests -->
+        <!-- test dependencies -->
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>

Modified: camel/trunk/components/camel-spring-javaconfig/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/pom.xml (original)
+++ camel/trunk/components/camel-spring-javaconfig/pom.xml Wed Oct  3 21:18:03 
2012
@@ -65,10 +65,10 @@
     <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-      <version>2.1_3_6</version>
+      <version>${cglib-bundle-version}</version>
     </dependency>
 
-    <!-- testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: camel/trunk/components/camel-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Wed Oct  3 21:18:03 2012
@@ -166,25 +166,25 @@
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjrt</artifactId>
-        <version>1.6.2</version>
+        <version>${aspectj-version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjweaver</artifactId>
-        <version>1.6.2</version>
+        <version>${aspectj-version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib</artifactId>
-        <version>2.2</version>
+        <version>${cglib-version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>asm</groupId>
         <artifactId>asm</artifactId>
-        <version>3.1</version>
+        <version>${asm-version}</version>
         <scope>test</scope>
       </dependency>
 

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Oct  3 21:18:03 2012
@@ -48,7 +48,9 @@
     
<arquillian-junit-container-version>1.0.0.CR7</arquillian-junit-container-version>
     
<arquillian-weld-ee-embedded-version>1.0.0.CR3</arquillian-weld-ee-embedded-version>
     <asm-bundle-version>3.3_2</asm-bundle-version>
+    <asm-version>3.1</asm-version>
     <asm2-bundle-version>2.2.3_5</asm2-bundle-version>
+    <aspectj-version>1.6.2</aspectj-version>
     <atomikos-transactions-version>3.8.0</atomikos-transactions-version>
     <avalon-bundle-version>4.3.1_1</avalon-bundle-version>
     <avro-version>1.6.2</avro-version>
@@ -59,9 +61,11 @@
     <bcel-bundle-version>5.2_4</bcel-bundle-version>
     <bcpg-jdk16-bundle-version>1.46_2</bcpg-jdk16-bundle-version>
     <beanio-version>2.0.1</beanio-version>
+    <bsh-version>2.0b5</bsh-version>
     <bouncycastle-version>1.46</bouncycastle-version>
     <castor-bundle-version>1.3.1_2</castor-bundle-version>
-    <cglib-version>2.1_3_7</cglib-version>
+    <cglib-bundle-version>2.1_3_7</cglib-bundle-version>
+    <cglib-version>2.2</cglib-version>
     <cmis-version>0.7.0</cmis-version>
     <cometd-bayeux-version>6.1.11</cometd-bayeux-version>
     
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
@@ -105,6 +109,7 @@
     <exec-maven-plugin-version>1.1.1</exec-maven-plugin-version>
     <ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
     <fastinfoset-version>1.2.7_4</fastinfoset-version>
+    <felix-compendium-version>1.2.0</felix-compendium-version>
     <felix-configadmin-version>1.2.4</felix-configadmin-version>
     <felix-framework-version>2.0.5</felix-framework-version>
     <flatpack-bundle-version>3.2.0_2</flatpack-bundle-version>
@@ -179,6 +184,7 @@
     <jdom-version>1.1.3</jdom-version>
     <jetty-version>7.6.7.v20120910</jetty-version>
     <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
+    <jetty6-version>6.1.26</jetty6-version>
     <jettison-version>1.3.2</jettison-version>
     <jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version>
     <jexcelapi-version>2.4.2</jexcelapi-version>
@@ -205,6 +211,8 @@
     <juel-version>2.1.3</juel-version>
     <junit-bundle-version>4.10_1</junit-bundle-version>
     <junit-version>4.10</junit-version>
+    <jython-engine-version>20080611</jython-engine-version>
+    <jython-version>2.2.1</jython-version>
     <karaf-version>2.2.9</karaf-version>
     <krati-version>0.4.6</krati-version>
     <kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
@@ -214,7 +222,6 @@
     <lucene-version>3.6.1</lucene-version>
     <lightcouch-version>0.0.4</lightcouch-version>
     <!-- needed from tooling/archetypes -->
-    <maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version>
     <maven-reporting-api-version>2.2.1</maven-reporting-api-version>
     <maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
     <maven-version>2.0</maven-version>
@@ -262,6 +269,7 @@
     <relaxngDatatype-version>20020414</relaxngDatatype-version>
     <restlet-version>2.0.15</restlet-version>
     <rhino-bundle-version>1.7R2_3</rhino-bundle-version>
+    <rhino-version>1.7R2</rhino-version>
     <rome-bundle-version>1.0_3</rome-bundle-version>
     <rome-version>1.0</rome-version>
     <saaj-impl-version>1.3.2_2</saaj-impl-version>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1393768&r1=1393767&r2=1393768&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed 
Oct  3 21:18:03 2012
@@ -230,7 +230,7 @@
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
@@ -434,7 +434,7 @@
     <bundle 
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-ibatis/${project.version}</bundle>
   </feature>
@@ -601,7 +601,7 @@
     <bundle 
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.mybatis/mybatis/${mybatis-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-mybatis/${project.version}</bundle>
   </feature>
@@ -761,7 +761,7 @@
     
<bundle>mvn:org.apache.camel/camel-spring-integration/${project.version}</bundle>
   </feature>
   <feature name='camel-spring-javaconfig' version='${project.version}' 
resolver='(obr)' start-level='50'>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
     <feature version='${project.version}'>camel-spring</feature>
     <feature version='[3,4)'>spring-test</feature>
     
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>


Reply via email to