Author: cziegeler
Date: Wed Feb 13 10:02:49 2013
New Revision: 1445527
URL: http://svn.apache.org/r1445527
Log:
SLING-2720 : Update exported versions for extension fragments to match
well-known JAX-WS, JAXB, StAX and JAF versions . Apply patch from Robert
Munteanu
Modified:
sling/trunk/bundles/extensions/framework-extension-activation/pom.xml
sling/trunk/bundles/extensions/framework-extension-ws/pom.xml
sling/trunk/bundles/extensions/framework-extension-xml/pom.xml
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/bundles/extensions/framework-extension-activation/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-activation/pom.xml?rev=1445527&r1=1445526&r2=1445527&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/framework-extension-activation/pom.xml
(original)
+++ sling/trunk/bundles/extensions/framework-extension-activation/pom.xml Wed
Feb 13 10:02:49 2013
@@ -47,7 +47,7 @@
</scm>
<properties>
-
<fragment.activation.version>0.0.0.fragment_activation</fragment.activation.version>
+ <fragment.activation.version>1.1.0</fragment.activation.version>
</properties>
<build>
Modified: sling/trunk/bundles/extensions/framework-extension-ws/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-ws/pom.xml?rev=1445527&r1=1445526&r2=1445527&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/framework-extension-ws/pom.xml (original)
+++ sling/trunk/bundles/extensions/framework-extension-ws/pom.xml Wed Feb 13
10:02:49 2013
@@ -50,6 +50,7 @@
<properties>
<fragment.ws.version>0.0.0.fragment_ws</fragment.ws.version>
+ <jaxws.version>2.1.0</jaxws.version>
</properties>
<build>
@@ -87,14 +88,14 @@
javax.jws.soap;version="${fragment.ws.version}",
javax.jws;version="${fragment.ws.version}",
javax.xml.soap;uses:="javax.activation,javax.xml.namespace,org.w3c.dom,javax.xml.transform.dom,javax.xml.transform";version="${fragment.ws.version}",
-
javax.xml.ws.handler.soap;uses:="javax.xml.ws.handler,javax.xml.namespace,javax.xml.soap,javax.xml.bind";version="${fragment.ws.version}",
-
javax.xml.ws.handler;uses:="javax.xml.ws,javax.xml.namespace";version="${fragment.ws.version}",
-
javax.xml.ws.http;uses:="javax.xml.ws";version="${fragment.ws.version}",
-
javax.xml.ws.soap;uses:="javax.xml.ws.spi,javax.xml.ws,javax.xml.soap";version="${fragment.ws.version}",
-
javax.xml.ws.spi.http;version="${fragment.ws.version}",
-
javax.xml.ws.spi;uses:="javax.xml.ws,javax.xml.ws.wsaddressing,javax.xml.transform,org.w3c.dom,javax.xml.namespace,javax.xml.ws.handler,javax.xml.bind";version="${fragment.ws.version}",
-
javax.xml.ws.wsaddressing;uses:="javax.xml.bind.annotation,javax.xml.namespace,org.w3c.dom,javax.xml.transform,javax.xml.bind,javax.xml.ws,javax.xml.ws.spi";version="${fragment.ws.version}",
-
javax.xml.ws;uses:="javax.xml.ws.handler,javax.xml.ws.spi,javax.xml.ws.spi.http,javax.xml.transform,org.w3c.dom,javax.xml.bind.annotation,javax.xml.transform.stream,javax.xml.bind,javax.xml.namespace";version="${fragment.ws.version}"
+
javax.xml.ws.handler.soap;uses:="javax.xml.ws.handler,javax.xml.namespace,javax.xml.soap,javax.xml.bind";version="${jaxws.version}",
+
javax.xml.ws.handler;uses:="javax.xml.ws,javax.xml.namespace";version="${jaxws.version}",
+
javax.xml.ws.http;uses:="javax.xml.ws";version="${jaxws.version}",
+
javax.xml.ws.soap;uses:="javax.xml.ws.spi,javax.xml.ws,javax.xml.soap";version="${jaxws.version}",
+
javax.xml.ws.spi.http;version="${jaxws.version}",
+
javax.xml.ws.spi;uses:="javax.xml.ws,javax.xml.ws.wsaddressing,javax.xml.transform,org.w3c.dom,javax.xml.namespace,javax.xml.ws.handler,javax.xml.bind";version="${jaxws.version}",
+
javax.xml.ws.wsaddressing;uses:="javax.xml.bind.annotation,javax.xml.namespace,org.w3c.dom,javax.xml.transform,javax.xml.bind,javax.xml.ws,javax.xml.ws.spi";version="${jaxws.version}",
+
javax.xml.ws;uses:="javax.xml.ws.handler,javax.xml.ws.spi,javax.xml.ws.spi.http,javax.xml.transform,org.w3c.dom,javax.xml.bind.annotation,javax.xml.transform.stream,javax.xml.bind,javax.xml.namespace";version="${jaxws.version}"
</Export-Package>
</manifestEntries>
</archive>
Modified: sling/trunk/bundles/extensions/framework-extension-xml/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-xml/pom.xml?rev=1445527&r1=1445526&r2=1445527&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/framework-extension-xml/pom.xml (original)
+++ sling/trunk/bundles/extensions/framework-extension-xml/pom.xml Wed Feb 13
10:02:49 2013
@@ -50,6 +50,8 @@
<properties>
<fragment.xml.version>0.0.0.fragment_xml</fragment.xml.version>
+ <jaxb.version>2.1.0</jaxb.version>
+ <stax.version>1.0.0</stax.version>
</properties>
<build>
@@ -84,24 +86,24 @@
</manifestFile>
<manifestEntries>
<Export-Package>
-
javax.xml.bind.annotation.adapters;uses:="javax.xml.bind";version="${fragment.xml.version}",
-
javax.xml.bind.annotation;uses:="javax.xml.transform,javax.xml.bind,javax.xml.parsers,javax.xml.transform.dom,org.w3c.dom";version="${fragment.xml.version}",
-
javax.xml.bind.attachment;uses:="javax.activation";version="${fragment.xml.version}",
-
javax.xml.bind.helpers;uses:="javax.xml.bind.annotation.adapters,javax.xml.transform.dom,org.w3c.dom,org.xml.sax,javax.xml.bind.attachment,javax.xml.stream,javax.xml.transform,javax.xml.transform.stream,javax.xml.validation,javax.xml.transform.sax,javax.xml.bind,javax.xml.parsers";version="${fragment.xml.version}",
-
javax.xml.bind.util;uses:="javax.xml.transform.sax,javax.xml.bind,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers";version="${fragment.xml.version}",
-
javax.xml.bind;uses:="javax.xml.validation,javax.xml.namespace,javax.xml.datatype,javax.xml.transform,javax.xml.bind.annotation,javax.xml.transform.stream,org.w3c.dom,javax.xml.bind.attachment,javax.xml.stream,javax.xml.bind.annotation.adapters,org.xml.sax";version="${fragment.xml.version}",
+
javax.xml.bind.annotation.adapters;uses:="javax.xml.bind";version="${jaxb.version}",
+
javax.xml.bind.annotation;uses:="javax.xml.transform,javax.xml.bind,javax.xml.parsers,javax.xml.transform.dom,org.w3c.dom";version="${jaxb.version}",
+
javax.xml.bind.attachment;uses:="javax.activation";version="${jaxb.version}",
+
javax.xml.bind.helpers;uses:="javax.xml.bind.annotation.adapters,javax.xml.transform.dom,org.w3c.dom,org.xml.sax,javax.xml.bind.attachment,javax.xml.stream,javax.xml.transform,javax.xml.transform.stream,javax.xml.validation,javax.xml.transform.sax,javax.xml.bind,javax.xml.parsers";version="${jaxb.version}",
+
javax.xml.bind.util;uses:="javax.xml.transform.sax,javax.xml.bind,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers";version="${jaxb.version}",
+
javax.xml.bind;uses:="javax.xml.validation,javax.xml.namespace,javax.xml.datatype,javax.xml.transform,javax.xml.bind.annotation,javax.xml.transform.stream,org.w3c.dom,javax.xml.bind.attachment,javax.xml.stream,javax.xml.bind.annotation.adapters,org.xml.sax";version="${jaxb.version}",
javax.xml.crypto.dom;uses:="javax.xml.crypto,org.w3c.dom";version="${fragment.xml.version}",
javax.xml.crypto.dsig.dom;uses:="javax.xml.crypto.dsig,javax.xml.crypto,org.w3c.dom,javax.xml.crypto.dom";version="${fragment.xml.version}",
javax.xml.crypto.dsig.keyinfo;uses:="javax.xml.crypto";version="${fragment.xml.version}",
javax.xml.crypto.dsig.spec;uses:="javax.xml.crypto";version="${fragment.xml.version}",
javax.xml.crypto.dsig;uses:="javax.xml.crypto,javax.xml.crypto.dsig.spec,javax.xml.crypto.dsig.keyinfo";version="${fragment.xml.version}",
javax.xml.crypto;uses:="javax.xml.crypto.dsig.keyinfo";version="${fragment.xml.version}",
-
javax.xml.datatype;uses:="javax.xml.namespace";version="${fragment.xml.version}",
+
javax.xml.datatype;uses:="javax.xml.namespace";version="${jaxb.version}",
javax.xml.namespace;version="${fragment.xml.version}",
javax.xml.parsers;uses:="javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers";version="${fragment.xml.version}",
-
javax.xml.stream.events;uses:="javax.xml.namespace,javax.xml.stream";version="${fragment.xml.version}",
-
javax.xml.stream.util;uses:="javax.xml.stream,javax.xml.stream.events,javax.xml.namespace";version="${fragment.xml.version}",
-
javax.xml.stream;uses:="javax.xml.stream.events,javax.xml.namespace,javax.xml.stream.util,javax.xml.transform";version="${fragment.xml.version}",
+
javax.xml.stream.events;uses:="javax.xml.namespace,javax.xml.stream";version="${stax.version}",
+
javax.xml.stream.util;uses:="javax.xml.stream,javax.xml.stream.events,javax.xml.namespace";version="${stax.version}",
+
javax.xml.stream;uses:="javax.xml.stream.events,javax.xml.namespace,javax.xml.stream.util,javax.xml.transform";version="${stax.version}",
javax.xml.transform.dom;uses:="javax.xml.transform,org.w3c.dom";version="${fragment.xml.version}",
javax.xml.transform.sax;uses:="org.xml.sax.ext,javax.xml.transform,org.xml.sax,javax.xml.transform.stream";version="${fragment.xml.version}",
javax.xml.transform.stax;uses:="javax.xml.stream,javax.xml.transform,javax.xml.stream.events";version="${fragment.xml.version}",
@@ -119,6 +121,7 @@
org.w3c.dom.stylesheets;uses:="org.w3c.dom";version="${fragment.xml.version}",
org.w3c.dom.traversal;uses:="org.w3c.dom";version="${fragment.xml.version}",
org.w3c.dom.views;version="${fragment.xml.version}",
+
org.w3c.dom.xpath;version="${fragment.xml.version}",
org.w3c.dom;version="${fragment.xml.version}",
org.xml.sax.ext;uses:="org.xml.sax,org.xml.sax.helpers";version="${fragment.xml.version}",
org.xml.sax.helpers;uses:="org.xml.sax";version="${fragment.xml.version}",
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1445527&r1=1445526&r2=1445527&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Feb 13 10:02:49
2013
@@ -270,7 +270,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.fragment.xml</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
@@ -280,12 +280,12 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.fragment.activation</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.fragment.ws</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</bundle>
</startLevel>
<startLevel level="5">
