servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1435411 - in /servicemix/smx4/bundles/trunk: hadoop-core-0.20.203.0/pom.xml hadoop-core-1.0.0/pom.xml hadoop-core-1.0.3/pom.xml hadoop-core-1.0.4/pom.xml hadoop-core-1.1.0/pom.xml pom.xml
Date Fri, 18 Jan 2013 23:15:56 GMT
Author: jbonofre
Date: Fri Jan 18 23:15:56 2013
New Revision: 1435411

URL: http://svn.apache.org/viewvc?rev=1435411&view=rev
Log:
[SMX4-1270] Fix import version range in hadoop-core bundles

Modified:
    servicemix/smx4/bundles/trunk/hadoop-core-0.20.203.0/pom.xml
    servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml
    servicemix/smx4/bundles/trunk/hadoop-core-1.0.3/pom.xml
    servicemix/smx4/bundles/trunk/hadoop-core-1.0.4/pom.xml
    servicemix/smx4/bundles/trunk/hadoop-core-1.1.0/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/hadoop-core-0.20.203.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hadoop-core-0.20.203.0/pom.xml?rev=1435411&r1=1435410&r2=1435411&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hadoop-core-0.20.203.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hadoop-core-0.20.203.0/pom.xml Fri Jan 18 23:15:56 2013
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>9</version>
+        <version>10</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -66,14 +66,14 @@
             sun.security*;resolution:=optional,
             org.apache.commons.cli;resolution:=optional,
             org.apache.commons.logging*;resolution:=optional,
-            org.apache.jasper.runtime;resolution:=optional,
+            org.apache.jasper.runtime;version="[5,7)";resolution:=optional,
             org.apache.log4j*;resolution:=optional,
             org.apache.tools.ant;resolution:=optional,
             org.apache.tools.ant.types;resolution:=optional,
             org.jets3t.service*;resolution:=optional,
             org.kosmix*;resolution:=optional,
             org.znerd.xmlenc;resolution:=optional,
-            org.mortbay*;resolution:=optional
+            org.mortbay*;version="[6,8)";resolution:=optional
         </servicemix.osgi.import.pkg>
     </properties>
 

Modified: servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml?rev=1435411&r1=1435410&r2=1435411&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml Fri Jan 18 23:15:56 2013
@@ -63,13 +63,13 @@
             org.apache.commons.math.util,
             org.apache.commons.net.ftp,
             org.codehaus.jackson*,
-            org.mortbay*,
+            org.mortbay*;version="[6,8)",
             com.sun.security.auth*;resolution:=optional,
             sun.net*;resolution:=optional,
             sun.security*;resolution:=optional,
             org.apache.commons.cli;resolution:=optional,
             org.apache.commons.logging*;resolution:=optional,
-            org.apache.jasper.runtime;resolution:=optional,
+            org.apache.jasper.runtime;version="[5,7)";resolution:=optional,
             org.apache.log4j*;resolution:=optional,
             org.apache.tools.ant*;resolution:=optional,
             org.ietf.jgss;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/hadoop-core-1.0.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hadoop-core-1.0.3/pom.xml?rev=1435411&r1=1435410&r2=1435411&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hadoop-core-1.0.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hadoop-core-1.0.3/pom.xml Fri Jan 18 23:15:56 2013
@@ -64,12 +64,12 @@
             org.apache.commons.net.ftp,
             org.apache.commons.io;resolution:=optional,
             org.codehaus.jackson*,
-            org.mortbay*,
+            org.mortbay*;version="[6,8)",
             com.sun.security*;resolution:=optional,
             sun.net*;resolution:=optional,
             org.apache.commons.cli;resolution:=optional,
             org.apache.commons.logging*;resolution:=optional,
-            org.apache.jasper.runtime;resolution:=optional,
+            org.apache.jasper.runtime;version="[5,7)";resolution:=optional,
             org.apache.log4j*;resolution:=optional,
             org.apache.tools.ant*;resolution:=optional,
             org.ietf.jgss;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/hadoop-core-1.0.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hadoop-core-1.0.4/pom.xml?rev=1435411&r1=1435410&r2=1435411&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hadoop-core-1.0.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hadoop-core-1.0.4/pom.xml Fri Jan 18 23:15:56 2013
@@ -64,12 +64,12 @@
             org.apache.commons.net.ftp,
             org.apache.commons.io;resolution:=optional,
             org.codehaus.jackson*,
-            org.mortbay*,
+            org.mortbay*;version="[6,8)",
             sun.net*;resolution:=optional,
             com.sun.security*;resolution:=optional,
             org.apache.commons.cli;resolution:=optional,
             org.apache.commons.logging*;resolution:=optional,
-            org.apache.jasper.runtime;resolution:=optional,
+            org.apache.jasper.runtime;version="[5,7)";resolution:=optional,
             org.apache.log4j*;resolution:=optional,
             org.apache.tools.ant*;resolution:=optional,
             org.ietf.jgss;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/hadoop-core-1.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hadoop-core-1.1.0/pom.xml?rev=1435411&r1=1435410&r2=1435411&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hadoop-core-1.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hadoop-core-1.1.0/pom.xml Fri Jan 18 23:15:56 2013
@@ -64,12 +64,12 @@
             org.apache.commons.net*,
             org.apache.commons.io;resolution:=optional,
             org.codehaus.jackson*,
-            org.mortbay*,
+            org.mortbay*;version="[6,8)",
             com.sun.security*;resolution:=optional,
             sun.net*;resolution:=optional,
             org.apache.commons.cli;resolution:=optional,
             org.apache.commons.logging*;resolution:=optional,
-            org.apache.jasper.runtime;resolution:=optional,
+            org.apache.jasper.runtime;version="[5,7)";resolution:=optional,
             org.apache.log4j*;resolution:=optional,
             org.apache.tools.ant*;resolution:=optional,
             org.ietf.jgss;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1435411&r1=1435410&r2=1435411&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Fri Jan 18 23:15:56 2013
@@ -69,6 +69,11 @@
         <module>hbase-0.90.5</module>
         <module>hbase-0.94</module>
         <module>hbase-0.94.2</module>
+        <module>hadoop-core-0.20.203.0</module>
+        <module>hadoop-core-1.0.0</module>
+        <module>hadoop-core-1.0.3</module>
+        <module>hadoop-core-1.0.4</module>
+        <module>hadoop-core-1.1.0</module>
     </modules>
 
 </project>



Mime
View raw message