servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1308945 - in /servicemix/smx4/bundles/trunk: avro-1.6.1/pom.xml pom.xml
Date Tue, 03 Apr 2012 14:30:48 GMT
Author: jbonofre
Date: Tue Apr  3 14:30:48 2012
New Revision: 1308945

URL: http://svn.apache.org/viewvc?rev=1308945&view=rev
Log:
[SMX4-1119] Fix warning messages in avro 1.6.1 bundle
[SMX4-1122] Upgrade to bundles-pom 9-SNAPSHOT

Modified:
    servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml?rev=1308945&r1=1308944&r2=1308945&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml Tue Apr  3 14:30:48 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>8</version>
+        <version>9-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -41,12 +41,11 @@
         <pkgVersion>1.6.1</pkgVersion>
         <servicemix.osgi.export>
             !org.apache.avro.ipc;version="${project.version}",
-            org.apache.avro*;version="${project.version}";-noimport:=true
+            org.apache.avro*;version="${project.version}";-noimport:=true;-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.apache.avro*,
             com.thoughtworks.paranamer;version="[2.3,3)",
-            org.codehaus.jackson;version="[1.8,2)",
+            org.codehaus.jackson*;version="[1.8,2)",
             org.xerial.snappy;version="[1.0,2)",
             *
         </servicemix.osgi.import.pkg>
@@ -104,4 +103,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1308945&r1=1308944&r2=1308945&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Tue Apr  3 14:30:48 2012
@@ -66,6 +66,7 @@
         <module>atlassian-xmlrpc-0.11</module>
         <module>avalon-framework-4.3.1</module>
         <module>avro-1.5.3</module>
+        <module>avro-1.6.1</module>
     </modules>
 
 </project>



Mime
View raw message