Author: gertv
Date: Tue Sep 1 15:25:22 2009
New Revision: 810098
URL: http://svn.apache.org/viewvc?rev=810098&view=rev
Log:
Fix xmlsec-1.4.3 bundle -- don't mark all imports optional
Modified:
servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
servicemix/smx4/bundles/trunk/javax-mail-1.4.1/ (props changed)
servicemix/smx4/bundles/trunk/pom.xml
servicemix/smx4/bundles/trunk/xmlsec-1.4.3/ (props changed)
servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml
Modified: servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/bundles-pom/pom.xml?rev=810098&r1=810097&r2=810098&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/bundles-pom/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/bundles-pom/pom.xml Tue Sep 1 15:25:22 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
- <version>2</version>
+ <version>3</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
Propchange: servicemix/smx4/bundles/trunk/javax-mail-1.4.1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 1 15:25:22 2009
@@ -0,0 +1 @@
+target
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=810098&r1=810097&r2=810098&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Tue Sep 1 15:25:22 2009
@@ -41,8 +41,8 @@
<name>Apache ServiceMix Bundles</name>
<modules>
- <!--
<module>bundles-pom</module>
+ <!--
<module>ant-1.7.0</module>
<module>antlr-3.0.1</module>
<module>antlr-runtime-3.0.1</module>
Propchange: servicemix/smx4/bundles/trunk/xmlsec-1.4.3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 1 15:25:22 2009
@@ -0,0 +1 @@
+target
Modified: servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml?rev=810098&r1=810097&r2=810098&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml Tue Sep 1 15:25:22 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -39,11 +39,16 @@
<pkgGroupId>org.apache.santuario</pkgGroupId>
<pkgArtifactId>xmlsec</pkgArtifactId>
<pkgVersion>1.4.3</pkgVersion>
-
<servicemix.osgi.export.pkg>org.apache.xml.security*,org.jcp.xml*,javax.xml.crypto*</servicemix.osgi.export.pkg>
+ <servicemix.osgi.export.pkg>
+ org.apache.xml.security*;-split-package:=merge-first,
+ org.jcp.xml*;-split-package:=merge-first,
+ javax.xml.crypto*
+ </servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.xml.security.*,
- !org.jcp.xml.dsig.internal.*,
- *;resolution:=optional,
+ org.apache.xml.dtm*;resolution:=optional,
+ org.apache.xml.utils*;resolution:=optional,
+ org.apache.xpath*;resolution:=optional,
+ *
</servicemix.osgi.import.pkg>
</properties>
