servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r919011 - in /servicemix/smx4/features/trunk: assembly/pom.xml deps/pom.xml
Date Thu, 04 Mar 2010 14:59:31 GMT
Author: gertv
Date: Thu Mar  4 14:59:31 2010
New Revision: 919011

URL: http://svn.apache.org/viewvc?rev=919011&view=rev
Log:
Ensure build works fine even with a clean local repo

Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/deps/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=919011&r1=919010&r2=919011&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Mar  4 14:59:31 2010
@@ -559,11 +559,6 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-            <version>${commons-pool.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
             <version>${commons-pool.activemq.version}</version>
         </dependency>
         <dependency>
@@ -881,11 +876,6 @@
             <version>${scriptengines.version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-            <version>${commons-pool.camel.version}</version>
-        </dependency>
-        <dependency>
             <groupId>commons-dbcp</groupId>
             <artifactId>commons-dbcp</artifactId>
             <version>${commons-dbcp.camel.version}</version>

Modified: servicemix/smx4/features/trunk/deps/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/deps/pom.xml?rev=919011&r1=919010&r2=919011&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/deps/pom.xml (original)
+++ servicemix/smx4/features/trunk/deps/pom.xml Thu Mar  4 14:59:31 2010
@@ -1,52 +1,57 @@
 <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">
+         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.
-	-->
-
-    <!-- 
-        ATTENTION:
-        This project is an ugly workaround to pull in some duplicated dependencies
-        which otherwise would be ignored by maven and make the build fail.
-        The reason is that those deps only differ in the version numbers to 
-        deps used in the assembly.
-     -->
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.servicemix.features</groupId>
-		<artifactId>features</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.servicemix.features</groupId>
-	<artifactId>org.apache.servicemix.features.deps</artifactId>
-	<packaging>pom</packaging>
-	<version>4.1.0-SNAPSHOT</version>
-	<name>Apache ServiceMix Dependencies</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.antlr</artifactId>
-			<version>${antlr2.version}</version>
-		</dependency>
-	</dependencies>
+      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.
+  -->
+
+  <!--
+     ATTENTION:
+     This project is an ugly workaround to pull in some duplicated dependencies
+     which otherwise would be ignored by maven and make the build fail.
+     The reason is that those deps only differ in the version numbers to
+     deps used in the assembly.
+  -->
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.servicemix.features</groupId>
+    <artifactId>features</artifactId>
+    <version>4.1.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.servicemix.features</groupId>
+  <artifactId>org.apache.servicemix.features.deps</artifactId>
+  <packaging>pom</packaging>
+  <version>4.1.0-SNAPSHOT</version>
+  <name>Apache ServiceMix Dependencies</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.antlr</artifactId>
+      <version>${antlr2.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+      <version>${commons-pool.version}</version>
+    </dependency>
+  </dependencies>
 
 </project>
-  
\ No newline at end of file



Mime
View raw message