camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmuel...@apache.org
Subject svn commit: r1393600 - in /camel/trunk: components/camel-jclouds/ components/camel-jcr/ components/camel-jetty/ components/camel-jibx/ components/camel-jing/ components/camel-jmx/ components/camel-josql/ components/camel-jpa/ components/camel-jsch/ com...
Date Wed, 03 Oct 2012 16:37:31 GMT
Author: cmueller
Date: Wed Oct  3 16:37:30 2012
New Revision: 1393600

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

Modified:
    camel/trunk/components/camel-jclouds/pom.xml
    camel/trunk/components/camel-jcr/pom.xml
    camel/trunk/components/camel-jetty/pom.xml
    camel/trunk/components/camel-jibx/pom.xml
    camel/trunk/components/camel-jing/pom.xml
    camel/trunk/components/camel-jmx/pom.xml
    camel/trunk/components/camel-josql/pom.xml
    camel/trunk/components/camel-jpa/pom.xml
    camel/trunk/components/camel-jsch/pom.xml
    camel/trunk/components/camel-jt400/pom.xml
    camel/trunk/components/camel-juel/pom.xml
    camel/trunk/components/camel-jxpath/pom.xml
    camel/trunk/components/camel-kestrel/pom.xml
    camel/trunk/components/camel-krati/pom.xml
    camel/trunk/components/camel-lucene/pom.xml
    camel/trunk/components/camel-mongodb/pom.xml
    camel/trunk/components/camel-mqtt/pom.xml
    camel/trunk/components/camel-msv/pom.xml
    camel/trunk/components/camel-mvel/pom.xml
    camel/trunk/components/camel-nagios/pom.xml
    camel/trunk/components/camel-neo4j/pom.xml
    camel/trunk/components/camel-netty/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/components/camel-jclouds/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/pom.xml (original)
+++ camel/trunk/components/camel-jclouds/pom.xml Wed Oct  3 16:37:30 2012
@@ -54,17 +54,15 @@
             <version>${jclouds-version}</version>
         </dependency>
 
-        <!-- logging -->
+        <!-- test -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-spring</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!-- for testing -->
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
 

Modified: camel/trunk/components/camel-jcr/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/pom.xml (original)
+++ camel/trunk/components/camel-jcr/pom.xml Wed Oct  3 16:37:30 2012
@@ -46,8 +46,9 @@
     <dependency>
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>
-      <version>2.0</version>
+      <version>${jcr-version}</version>
     </dependency>
+    
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>

Modified: camel/trunk/components/camel-jetty/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/pom.xml (original)
+++ camel/trunk/components/camel-jetty/pom.xml Wed Oct  3 16:37:30 2012
@@ -79,7 +79,8 @@
             <artifactId>jetty-jmx</artifactId>
             <version>${jetty-version}</version>
         </dependency>
-        <!-- testing -->
+        
+        <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-spring</artifactId>

Modified: camel/trunk/components/camel-jibx/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jibx/pom.xml (original)
+++ camel/trunk/components/camel-jibx/pom.xml Wed Oct  3 16:37:30 2012
@@ -45,7 +45,7 @@
             <version>${jibx-version}</version>
         </dependency>
 
-        <!-- testing -->
+        <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-spring</artifactId>

Modified: camel/trunk/components/camel-jing/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jing/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jing/pom.xml (original)
+++ camel/trunk/components/camel-jing/pom.xml Wed Oct  3 16:37:30 2012
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>thaiopensource</groupId>
             <artifactId>jing</artifactId>
-            <version>20030619</version>
+            <version>${jing-version}</version>
         </dependency>
 
         <!-- for testing -->

Modified: camel/trunk/components/camel-jmx/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jmx/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jmx/pom.xml (original)
+++ camel/trunk/components/camel-jmx/pom.xml Wed Oct  3 16:37:30 2012
@@ -38,6 +38,8 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core</artifactId>
         </dependency>
+        
+        <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test</artifactId>

Modified: camel/trunk/components/camel-josql/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-josql/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/pom.xml (original)
+++ camel/trunk/components/camel-josql/pom.xml Wed Oct  3 16:37:30 2012
@@ -66,14 +66,15 @@
     <dependency>
       <groupId>net.sf.josql</groupId>
       <artifactId>josql</artifactId>
-      <version>1.5</version>
+      <version>${josql-version}</version>
     </dependency>
     <dependency>
       <groupId>net.sf.josql</groupId>
       <artifactId>gentlyweb-utils</artifactId>
-      <version>1.5</version>
+      <version>${josql-version}</version>
     </dependency>
 
+    <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: camel/trunk/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/pom.xml (original)
+++ camel/trunk/components/camel-jpa/pom.xml Wed Oct  3 16:37:30 2012
@@ -68,7 +68,8 @@
       <artifactId>geronimo-jpa_2.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
-    <!-- testing -->
+    
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>

Modified: camel/trunk/components/camel-jsch/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jsch/pom.xml (original)
+++ camel/trunk/components/camel-jsch/pom.xml Wed Oct  3 16:37:30 2012
@@ -54,26 +54,15 @@
       <version>${jsch-version}</version>
     </dependency>
 
-    <!-- logging -->
+    <!-- test dependencies -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>      
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId> 
-      <artifactId>log4j</artifactId> 
-      <scope>test</scope> 
-    </dependency>
-
-    <!-- for testing -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -95,8 +84,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <defaultGoal>install</defaultGoal>
-  </build>
 </project>

Modified: camel/trunk/components/camel-jt400/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jt400/pom.xml (original)
+++ camel/trunk/components/camel-jt400/pom.xml Wed Oct  3 16:37:30 2012
@@ -43,6 +43,7 @@
       <artifactId>jt400</artifactId>
       <version>${jt400-version}</version>
     </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>

Modified: camel/trunk/components/camel-juel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/pom.xml (original)
+++ camel/trunk/components/camel-juel/pom.xml Wed Oct  3 16:37:30 2012
@@ -50,7 +50,7 @@
       <version>${juel-version}</version>
     </dependency>
 
-    <!-- testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>

Modified: camel/trunk/components/camel-jxpath/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/pom.xml (original)
+++ camel/trunk/components/camel-jxpath/pom.xml Wed Oct  3 16:37:30 2012
@@ -42,16 +42,15 @@
     <dependency>
       <groupId>commons-jxpath</groupId>
       <artifactId>commons-jxpath</artifactId>
-      <version>1.3</version>
+      <version>${commons-jxpath-version}</version>
     </dependency>
 
-    <!-- testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-spring</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>

Modified: camel/trunk/components/camel-kestrel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-kestrel/pom.xml (original)
+++ camel/trunk/components/camel-kestrel/pom.xml Wed Oct  3 16:37:30 2012
@@ -59,7 +59,7 @@
             <version>${spymemcached-version}</version>
         </dependency>
 
-        <!-- testing -->
+        <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-spring</artifactId>

Modified: camel/trunk/components/camel-krati/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/pom.xml (original)
+++ camel/trunk/components/camel-krati/pom.xml Wed Oct  3 16:37:30 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>
@@ -38,22 +36,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sna-projects.krati</groupId>
-            <artifactId>krati</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.sna-projects.krati</groupId>
+            <artifactId>krati</artifactId>
+        </dependency>
 
-        <!-- for testing -->
+        <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-spring</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>

Modified: camel/trunk/components/camel-lucene/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/pom.xml (original)
+++ camel/trunk/components/camel-lucene/pom.xml Wed Oct  3 16:37:30 2012
@@ -1,21 +1,19 @@
 <?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.
-	-->
-
+<!--
+	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">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -55,7 +53,7 @@
 			<version>${lucene-version}</version>
 		</dependency>
 
-		<!-- testing -->
+		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-test</artifactId>
@@ -66,8 +64,6 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>

Modified: camel/trunk/components/camel-mongodb/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-mongodb/pom.xml (original)
+++ camel/trunk/components/camel-mongodb/pom.xml Wed Oct  3 16:37:30 2012
@@ -56,7 +56,7 @@
       <version>${mongo-java-driver-version}</version>
     </dependency>
 
-    <!-- testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-spring</artifactId>

Modified: camel/trunk/components/camel-mqtt/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-mqtt/pom.xml (original)
+++ camel/trunk/components/camel-mqtt/pom.xml Wed Oct  3 16:37:30 2012
@@ -43,7 +43,8 @@
             <artifactId>mqtt-client</artifactId>
             <version>${mqtt-client-version}</version>
         </dependency>
-        <!-- testing -->
+
+        <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test</artifactId>

Modified: camel/trunk/components/camel-msv/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-msv/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-msv/pom.xml (original)
+++ camel/trunk/components/camel-msv/pom.xml Wed Oct  3 16:37:30 2012
@@ -62,30 +62,30 @@
     <dependency>
       <groupId>org.iso_relax.verifier.jaxp.validation</groupId>
       <artifactId>isorelax-jaxp-bridge</artifactId>
-      <version>1.0</version>
+      <version>${isorelax-jaxp-bridge-version}</version>
     </dependency>
     <dependency>
       <groupId>msv</groupId>
       <artifactId>isorelax</artifactId>
-      <version>20050913</version>
+      <version>${isorelax-version}</version>
     </dependency>
     <dependency>
       <groupId>msv</groupId>
       <artifactId>msv</artifactId>
-      <version>20050913</version>
+      <version>${isorelax-version}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.msv.datatype.xsd</groupId>
       <artifactId>xsdlib</artifactId>
-      <version>20060615</version>
+      <version>${xsdlib-version}</version>
     </dependency>
     <dependency>
       <groupId>relaxngDatatype</groupId>
       <artifactId>relaxngDatatype</artifactId>
-      <version>20020414</version>
+      <version>${relaxngDatatype-version}</version>
     </dependency>
 
-    <!-- for testing -->
+    <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: camel/trunk/components/camel-mvel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-mvel/pom.xml (original)
+++ camel/trunk/components/camel-mvel/pom.xml Wed Oct  3 16:37:30 2012
@@ -46,7 +46,7 @@
 	<version>${mvel-version}</version>
     </dependency>
 
-    <!-- testing -->
+    <!-- test dependency -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>

Modified: camel/trunk/components/camel-nagios/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-nagios/pom.xml (original)
+++ camel/trunk/components/camel-nagios/pom.xml Wed Oct  3 16:37:30 2012
@@ -15,70 +15,71 @@
   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>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>2.11-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-nagios</artifactId>
-    <packaging>bundle</packaging>
-    <name>Camel :: Nagios</name>
-    <description>Camel Nagios support</description>
-
-    <properties>
-        <camel.osgi.export.pkg>
-            org.apache.camel.component.nagios.*
-        </camel.osgi.export.pkg>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>fusesource.m2</id>
-            <name>Fusesource Dependency Repository</name>
-            <url>http://repo.fusesource.com/maven2</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.googlecode</groupId>
-            <artifactId>jsendnsca-core</artifactId>
-            <version>1.3.1</version>
-        </dependency>
-
-        <!-- testing -->
-        <dependency>
-            <groupId>com.googlecode</groupId>
-            <artifactId>jsendnsca-test</artifactId>
-            <scope>test</scope>
-            <version>1.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
-            <optional>true</optional>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+<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>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components</artifactId>
+    <version>2.11-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-nagios</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: Nagios</name>
+  <description>Camel Nagios support</description>
+
+  <properties>
+    <camel.osgi.export.pkg>
+      org.apache.camel.component.nagios.*
+    </camel.osgi.export.pkg>
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>fusesource.m2</id>
+      <name>Fusesource Dependency Repository</name>
+      <url>http://repo.fusesource.com/maven2</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.googlecode</groupId>
+      <artifactId>jsendnsca-core</artifactId>
+      <version>${jsendnsca-version}</version>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>com.googlecode</groupId>
+      <artifactId>jsendnsca-test</artifactId>
+      <scope>test</scope>
+      <version>${jsendnsca-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test</artifactId>
+      <optional>true</optional>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>

Modified: camel/trunk/components/camel-neo4j/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-neo4j/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-neo4j/pom.xml (original)
+++ camel/trunk/components/camel-neo4j/pom.xml Wed Oct  3 16:37:30 2012
@@ -15,84 +15,85 @@
   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>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>2.11-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-neo4j</artifactId>
-    <packaging>bundle</packaging>
-    <name>Camel :: Neo4j</name>
-    <description>Camel Neo4j support</description>
-
-	<properties>
-		<camel.osgi.export.pkg>org.apache.camel.component.neo4j.*</camel.osgi.export.pkg>
-	</properties>
-
-    <dependencies>
-
-	<dependency>
-		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-neo4j-rest</artifactId>
-		<version>${spring-neo4j-version}</version>
-	</dependency>
-		
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- testing -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-	<dependency>
-		<groupId>org.mockito</groupId>
-		<artifactId>mockito-all</artifactId>
-		<version>${mockito-version}</version>
-		<scope>test</scope>
-	</dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+<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>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components</artifactId>
+    <version>2.11-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-neo4j</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: Neo4j</name>
+  <description>Camel Neo4j support</description>
+
+  <properties>
+    <camel.osgi.export.pkg>org.apache.camel.component.neo4j.*</camel.osgi.export.pkg>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-neo4j-rest</artifactId>
+      <version>${spring-neo4j-version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test-spring</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>${mockito-version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>pertest</forkMode>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>

Modified: camel/trunk/components/camel-netty/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/pom.xml (original)
+++ camel/trunk/components/camel-netty/pom.xml Wed Oct  3 16:37:30 2012
@@ -1,21 +1,19 @@
 <?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.
-	-->
-
+<!--
+	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">
 	<modelVersion>4.0.0</modelVersion>
 

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1393600&r1=1393599&r2=1393600&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Oct  3 16:37:30 2012
@@ -87,6 +87,7 @@
     <commons-math-version>2.2</commons-math-version>
     <commons-net-version>3.1</commons-net-version>
     <commons-pool-version>1.6</commons-pool-version>
+    <commons-jxpath-version>1.3</commons-jxpath-version>
     <concurrentlinkedhashmap.version>1.3.1</concurrentlinkedhashmap.version>
     <cxf-version>2.6.2</cxf-version>
     <cxf-version-range>[2.4,2.8)</cxf-version-range>
@@ -156,6 +157,8 @@
     <irclib-bundle-version>1.10_5</irclib-bundle-version>
     <irclib-version>1.10</irclib-version>
     <isorelax-bundle-version>20050913_4</isorelax-bundle-version>
+    <isorelax-jaxp-bridge-version>1.0</isorelax-jaxp-bridge-version>
+    <isorelax-version>20050913</isorelax-version>
     <jini-version>2.1</jini-version>
     <jackson-version>1.9.10</jackson-version>
     <jackrabbit-version>2.2.12</jackrabbit-version>
@@ -171,6 +174,7 @@
     <jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
     <jclouds-version>1.5.0</jclouds-version>
     <jclouds-feature-version>1.5.0</jclouds-feature-version>
+    <jcr-version>2.0</jcr-version>
     <jdom-bundle-version>1.1_4</jdom-bundle-version>
     <jdom-version>1.1.3</jdom-version>
     <jetty-version>7.6.7.v20120910</jetty-version>
@@ -180,10 +184,13 @@
     <jexcelapi-version>2.4.2</jexcelapi-version>
     <jibx-version>1.2.4.5</jibx-version>
     <jing-bundle-version>20030619_5</jing-bundle-version>
+    <jing-version>20030619</jing-version>
     <jodatime-bundle-version>1.6.2</jodatime-bundle-version>
     <jodatime2-bundle-version>2.1</jodatime2-bundle-version>
     <josql-bundle-version>1.5_5</josql-bundle-version>
+    <josql-version>1.5</josql-version>
     <jruby-version>1.6.7.2</jruby-version>
+    <jsendnsca-version>1.3.1</jsendnsca-version>
     <jsmpp-version>2.1.0_4</jsmpp-version>
     <jsch-bundle-version>0.1.48_1</jsch-bundle-version>
     <jsch-version>0.1.48</jsch-version>
@@ -252,6 +259,7 @@
     <quickfix-bundle-version>1.5.2_1</quickfix-bundle-version>
     <quickfix-version>1.5.2-bd</quickfix-version>
     <regexp-bundle-version>1.3_3</regexp-bundle-version>
+    <relaxngDatatype-version>20020414</relaxngDatatype-version>
     <restlet-version>2.0.15</restlet-version>
     <rhino-bundle-version>1.7R2_3</rhino-bundle-version>
     <rome-bundle-version>1.0_3</rome-bundle-version>
@@ -318,6 +326,7 @@
     <xmlsec-version>1.5.1</xmlsec-version>
     <xmlunit-version>1.3</xmlunit-version>
     <xpp3-bundle-version>1.1.4c_6</xpp3-bundle-version>
+    <xsdlib-version>20060615</xsdlib-version>
     <xstream-bundle-version>1.4.3_1</xstream-bundle-version>
     <xstream-version>1.4.3</xstream-version>
     <xom-version>1.2.5</xom-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=1393600&r1=1393599&r2=1393600&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 16:37:30
2012
@@ -599,8 +599,8 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-msv/${project.version}</bundle>
     <feature version='${project.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-msv/${project.version}</bundle>
   </feature>
   <feature name='camel-mvel' version='${project.version}' resolver='(obr)' start-level='50'>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>



Mime
View raw message