You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by st...@apache.org on 2019/05/13 09:07:12 UTC
svn commit: r1859179 - in /geronimo/specs/branches/jakarta:
geronimo-jakarta-activation_spec/ geronimo-jakarta-ejb_spec/
geronimo-jakarta-jaxb_spec/ geronimo-jakarta-jaxrpc_spec/
geronimo-jakarta-jaxrs_spec/ geronimo-jakarta-jaxws_spec/ geronimo-jakart...
Author: struberg
Date: Mon May 13 09:07:12 2019
New Revision: 1859179
URL: http://svn.apache.org/viewvc?rev=1859179&view=rev
Log:
try to fix osgi as good as I can
+ fix an old import
Modified:
geronimo/specs/branches/jakarta/geronimo-jakarta-activation_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-ejb_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-jaxb_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrpc_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrs_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-jaxws_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-jsonb_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-jsp_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-jta_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-saaj_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/jakarta/servlet/resources/j2ee_1_4.xsd
geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/pom.xml
geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/src/main/java/jakarta/xml/XMLConstants.java
geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-activation_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-activation_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-activation_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-activation_spec/pom.xml Mon May 13 09:07:12 2019
@@ -109,7 +109,7 @@
<Private-Package>org.apache.geronimo.osgi.locator,org.apache.geronimo.specs.activation</Private-Package>
<Bundle-Activator>org.apache.geronimo.specs.activation.Activator</Bundle-Activator>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaActivation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+ osgi.contract;osgi.contract=JavaActivation;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='1.1'
]]></Provide-Capability>
</instructions>
</configuration>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-ejb_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-ejb_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-ejb_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-ejb_spec/pom.xml Mon May 13 09:07:12 2019
@@ -104,12 +104,12 @@
<Specification-Title>JSR-318 Enterprise Java Beans 3.2</Specification-Title>
<Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
<Specification-Version>3.2</Specification-Version>
- <Export-Package>javax.ejb*;version=3.2</Export-Package>
+ <Export-Package>jakarta.ejb*;version=3.2</Export-Package>
<Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
<Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
<Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaEJB;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.2,3.1,3.0,2.1'
+ osgi.contract;osgi.contract=JavaEJB;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='3.2,3.1,3.0,2.1'
]]></Provide-Capability>
<_contract>JavaJTA, JavaInterceptor, JavaAnnotation, JavaJAXRPC</_contract>
</instructions>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-jaxb_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-jaxb_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-jaxb_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-jaxb_spec/pom.xml Mon May 13 09:07:12 2019
@@ -90,7 +90,7 @@
<Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
<Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaJAXB;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.2,2.1,2.0'
+ osgi.contract;osgi.contract=JavaJAXB;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='2.2,2.1,2.0'
]]></Provide-Capability>
<_contract>JavaActivation, JavaSTAX</_contract>
</instructions>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrpc_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrpc_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrpc_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrpc_spec/pom.xml Mon May 13 09:07:12 2019
@@ -96,7 +96,7 @@
<Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
<Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaJAXRPC;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+ osgi.contract;osgi.contract=JavaJAXRPC;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='1.1'
]]></Provide-Capability>
<_contract>JavaSAAJ, JavaServlet</_contract>
</instructions>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrs_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrs_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrs_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-jaxrs_spec/pom.xml Mon May 13 09:07:12 2019
@@ -75,7 +75,7 @@
<Specification-Version>1.1</Specification-Version>
<Export-Package>jakarta.ws.rs*;version=2.1</Export-Package>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaJAXRS;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.1,2.0,1.1'
+ osgi.contract;osgi.contract=JavaJAXRS;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='2.1,2.0,1.1'
]]></Provide-Capability>
<Require-Capability><![CDATA[
osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.client.ClientBuilder)";cardinality:=multiple,
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-jaxws_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-jaxws_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-jaxws_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-jaxws_spec/pom.xml Mon May 13 09:07:12 2019
@@ -109,7 +109,7 @@
<Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
<Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaJAXWS;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.2,2.1.1,2.1'
+ osgi.contract;osgi.contract=JavaJAXWS;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='2.2,2.1.1,2.1'
]]></Provide-Capability>
<_contract>JavaSAAJ, JavaSTAX, JavaActivation, JavaJAXB</_contract>
</instructions>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-jsonb_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-jsonb_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-jsonb_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-jsonb_spec/pom.xml Mon May 13 09:07:12 2019
@@ -91,16 +91,16 @@
<configuration>
<instructions>
<Export-Package>
- javax.json.bind*;version=1.0
+ jakarta.json.bind*;version=1.0
</Export-Package>
<Import-Package>
- javax.json.*
+ jakarta.json.*
</Import-Package>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaJSONB;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+ osgi.contract;osgi.contract=JavaJSONB;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='1.0'
]]></Provide-Capability>
<Require-Capability><![CDATA[
- osgi.serviceloader;filter:="(osgi.serviceloader=javax.json.bind.spi.JsonbProvider)";cardinality:=multiple,
+ osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.json.bind.spi.JsonbProvider)";cardinality:=multiple,
osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)"
]]></Require-Capability>
<_contract>JavaJSONP</_contract>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-jsp_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-jsp_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-jsp_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-jsp_spec/pom.xml Mon May 13 09:07:12 2019
@@ -80,7 +80,7 @@
<instructions>
<Export-Package>jakarta.servlet.jsp*;version=2.2</Export-Package>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaJSP;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.2,2.1,2.0'
+ osgi.contract;osgi.contract=JavaJSP;uses:="${packages;NAMED;jakartak.*}";version:List<Version>='2.2,2.1,2.0'
]]></Provide-Capability>
<_contract>JavaServlet, JavaEL</_contract>
</instructions>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-jta_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-jta_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-jta_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-jta_spec/pom.xml Mon May 13 09:07:12 2019
@@ -79,9 +79,9 @@
<version>3.5.0</version>
<configuration>
<instructions>
- <Export-Package>javax.transaction*;version=1.2</Export-Package>
+ <Export-Package>jakarta.transaction*;version=1.2</Export-Package>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaJTA;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.2,1.1'
+ osgi.contract;osgi.contract=JavaJTA;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='1.2,1.1'
]]></Provide-Capability>
<_contract>JavaInterceptor, JavaCDI</_contract>
</instructions>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-saaj_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-saaj_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-saaj_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-saaj_spec/pom.xml Mon May 13 09:07:12 2019
@@ -87,7 +87,7 @@
<Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
<Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaSAAJ;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.3'
+ osgi.contract;osgi.contract=JavaSAAJ;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='1.3'
]]></Provide-Capability>
<_contract>JavaActivation</_contract>
</instructions>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/pom.xml Mon May 13 09:07:12 2019
@@ -97,12 +97,12 @@
necessarily with the Java EE versions. Servlet 3.1 needs to
be exported as 2.7 -->
<Export-Package>
- javax.servlet;version=2.7,
+ jakarta.servlet;version=2.7,
jakarta.servlet.annotation;version=2.7,
jakarta.servlet.descriptor;version=2.7,
jakarta.servlet.http;version=2.7,
jakarta.servlet.resources;version=2.7,
- javax.servlet;version=3.1,
+ jakarta.servlet;version=3.1,
jakarta.servlet.annotation;version=3.1,
jakarta.servlet.descriptor;version=3.1,
jakarta.servlet.http;version=3.1,
@@ -110,14 +110,14 @@
</Export-Package>
<!-- Because of the duplicate exports, explicit imports are required -->
<Import-Package>
- javax.servlet;version=2.7,
+ jakarta.servlet;version=2.7,
jakarta.servlet.annotation;version=2.7,
jakarta.servlet.descriptor;version=2.7,
jakarta.servlet.http;version=2.7,
jakarta.servlet.resources;version=2.7,
</Import-Package>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaServlet;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.1,3.0,2.5'
+ osgi.contract;osgi.contract=JavaServlet;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='3.1,3.0,2.5'
]]></Provide-Capability>
</instructions>
</configuration>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/jakarta/servlet/resources/j2ee_1_4.xsd
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/jakarta/servlet/resources/j2ee_1_4.xsd?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/jakarta/servlet/resources/j2ee_1_4.xsd (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/jakarta/servlet/resources/j2ee_1_4.xsd Mon May 13 09:07:12 2019
@@ -813,7 +813,7 @@ Deployment File may indicate one of the
<message-destination-ref>
<message-destination-ref-name>jms/StockQueue
</message-destination-ref-name>
- <message-destination-type>javax.jms.Queue
+ <message-destination-type>jakarta.jms.Queue
</message-destination-type>
<message-destination-usage>Consumes
</message-destination-usage>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/pom.xml Mon May 13 09:07:12 2019
@@ -82,7 +82,7 @@
<Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
<Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaSTAX;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.2,1.0'
+ osgi.contract;osgi.contract=JavaSTAX;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='1.2,1.0'
]]></Provide-Capability>
</instructions>
</configuration>
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/src/main/java/jakarta/xml/XMLConstants.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/src/main/java/jakarta/xml/XMLConstants.java?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/src/main/java/jakarta/xml/XMLConstants.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-stax_spec/src/main/java/jakarta/xml/XMLConstants.java Mon May 13 09:07:12 2019
@@ -17,7 +17,7 @@
** specific language governing permissions and limitations
** under the License.
*/
-package javax.xml;
+package jakarta.xml;
public class XMLConstants {
public static final java.lang.String DEFAULT_NS_PREFIX = "";
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml?rev=1859179&r1=1859178&r2=1859179&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-websockets_spec/pom.xml Mon May 13 09:07:12 2019
@@ -66,11 +66,11 @@
<configuration>
<instructions>
<Export-Package>
- javax.websocket;version=1.0,
+ jakarta.websocket;version=1.0,
jakarta.websocket.server;version=1.0
</Export-Package>
<Provide-Capability><![CDATA[
- osgi.contract;osgi.contract=JavaWebSockets;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+ osgi.contract;osgi.contract=JavaWebSockets;uses:="${packages;NAMED;jakarta.*}";version:List<Version>='1.0'
]]></Provide-Capability>
</instructions>
</configuration>