Author: jbonofre
Date: Tue Nov 13 23:40:24 2012
New Revision: 1409027
URL: http://svn.apache.org/viewvc?rev=1409027&view=rev
Log:
Use released version of bundles-pom and include properties files in jaxb-*
bundles
Modified:
servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml
servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml
Modified: servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml?rev=1409027&r1=1409026&r2=1409027&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-impl-2.2.6/pom.xml Tue Nov 13 23:40:24
2012
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>10</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -135,9 +135,9 @@
<filters>
<filter>
<artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
+ <includes>
+ <include>*.properties</include>
+ </includes>
</filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
Modified: servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml?rev=1409027&r1=1409026&r2=1409027&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-xjc-2.2.6/pom.xml Tue Nov 13 23:40:24
2012
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>10</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -73,9 +73,9 @@
1.0.com.sun*,
com.sun.org.*,
com.sun.xml.dtdparser*,
- com.sun.xml.xsom*,
- org.kohsuke.rngom*,
- org.relaxng.datatype*,
+ com.sun.xml.xsom*;-split-package:=merge-first,
+ org.kohsuke.rngom*;-split-package:=merge-first,
+ org.relaxng.datatype*;-split-package:=merge-first,
META-INF;-split-package:=merge-first,
META-INF.maven.org.apache.servicemix.bundles*;-split-package:=merge-first,
META-INF.services;-split-package:=merge-first,
@@ -136,9 +136,10 @@
<filters>
<filter>
<artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
+ <includes>
+ <include>*.properties</include>
+ <include>*.rng</include>
+ </includes>
</filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
