You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2014/02/06 00:22:23 UTC
svn commit: r1564994 - in /servicemix/smx4/bundles/trunk: pom.xml
xpp3-1.1.4c/pom.xml
Author: jbonofre
Date: Wed Feb 5 23:22:23 2014
New Revision: 1564994
URL: http://svn.apache.org/r1564994
Log:
[SMX4-1667] Fix version syntax in xpp3 1.1.4c bundle
Modified:
servicemix/smx4/bundles/trunk/pom.xml
servicemix/smx4/bundles/trunk/xpp3-1.1.4c/pom.xml
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1564994&r1=1564993&r2=1564994&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Wed Feb 5 23:22:23 2014
@@ -103,6 +103,7 @@
<module>junit-4.11</module>
<module>derby-10.9.1.0</module>
<module>derby-10.10.1.1</module>
+ <module>xpp3-1.1.4c</module>
</modules>
</project>
Modified: servicemix/smx4/bundles/trunk/xpp3-1.1.4c/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xpp3-1.1.4c/pom.xml?rev=1564994&r1=1564993&r2=1564994&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xpp3-1.1.4c/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xpp3-1.1.4c/pom.xml Wed Feb 5 23:22:23 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>11</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -39,9 +39,9 @@
<pkgGroupId>xpp3</pkgGroupId>
<pkgArtifactId>xpp3</pkgArtifactId>
<pkgVersion>1.1.4c</pkgVersion>
- <servicemix.osgi.export.pkg>
- org.xmlpull
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.xmlpull*;version=1.1.4.c;-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
javax.xml.parsers,
org.w3c.dom,
@@ -55,7 +55,6 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
- <optional>true</optional>
</dependency>
<!-- sources -->
@@ -64,13 +63,21 @@
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<classifier>sources</classifier>
- <optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-Version>1.1.4.c</Bundle-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>