integrate jsonp 1.1.4 (#22597)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
javaee · Nov 7, 2018 · 04c0348 · 04c0348
1 parent 1cdd989
commit 04c0348
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 34 deletions.
diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml
@@ -427,12 +427,6 @@
         <artifactId>javax.json</artifactId>
       </dependency>
 
-      <dependency>
-        <scope>runtime</scope>
-        <groupId>javax.json</groupId>
-        <artifactId>javax.json-api</artifactId>
-      </dependency>
-
       <dependency>
         <scope>runtime</scope>
         <groupId>org.eclipse</groupId>

diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
@@ -1581,11 +1581,6 @@
             <artifactId>javax.json</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jsonp-jaxrs</artifactId>

diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
@@ -1361,11 +1361,6 @@
         <artifactId>javax.json</artifactId>
         <optional>true</optional>
     </dependency>
-    <dependency>
-        <groupId>javax.json</groupId>
-        <artifactId>javax.json-api</artifactId>
-        <optional>true</optional>
-    </dependency>
     <dependency>
         <groupId>org.glassfish</groupId>
         <artifactId>jsonp-jaxrs</artifactId>

diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml
@@ -58,7 +58,7 @@
                 <configuration>
                     <archive>
 	                <manifestEntries>
-				<Class-Path>../modules/javax.servlet-api.jar ../modules/endorsed/javax.annotation-api.jar ../modules/javax.ejb-api.jar ../modules/javax.transaction-api.jar ../modules/javax.enterprise.deploy-api.jar ../modules/javax.management.j2ee-api.jar ../modules/javax.resource-api.jar ../modules/javax.security.auth.message-api.jar ../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar ../modules/javax.faces.jar ../modules/javax.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/javax.persistence.jar ../modules/javax.jms-api.jar ../modules/bean-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar ../modules/javax.json-api.jar ../modules/javax.json.bind-api.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar ../modules/javax.inject.jar</Class-Path>
+				<Class-Path>../modules/javax.servlet-api.jar ../modules/endorsed/javax.annotation-api.jar ../modules/javax.ejb-api.jar ../modules/javax.transaction-api.jar ../modules/javax.enterprise.deploy-api.jar ../modules/javax.management.j2ee-api.jar ../modules/javax.resource-api.jar ../modules/javax.security.auth.message-api.jar ../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar ../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar ../modules/javax.faces.jar ../modules/javax.servlet.jsp-api.jar ../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar ../modules/javax.persistence.jar ../modules/javax.jms-api.jar ../modules/bean-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar ../modules/javax.json.jar ../modules/javax.json.bind-api.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/javax.batch-api.jar ../modules/javax.inject.jar</Class-Path>
 	                    <GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
 	                </manifestEntries>
                     </archive>

diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
@@ -1715,16 +1715,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jsonp-jaxrs</artifactId>

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -116,9 +116,9 @@
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <websocket-api.version>1.1</websocket-api.version>
         <tyrus.version>1.14</tyrus.version>
-        <jsonp-api.version>1.1.3</jsonp-api.version>
-        <jsonp-ri.version>1.1.3</jsonp-ri.version>
-        <jsonp-jaxrs.version>1.1.3</jsonp-jaxrs.version>
+        <jsonp-api.version>1.1.4</jsonp-api.version>
+        <jsonp-ri.version>1.1.4</jsonp-ri.version>
+        <jsonp-jaxrs.version>1.1.4</jsonp-jaxrs.version>
         <json.bind-api.version>1.0</json.bind-api.version>
         <yasson.version>1.0.2</yasson.version>
         <concurrent-api.version>1.1</concurrent-api.version>
@@ -206,12 +206,12 @@
                         </spec>
                         <spec>
                             <artifact>
-                                <groupId>javax.json</groupId>
-                                <artifactId>javax.json-api</artifactId>
-                                <version>${jsonp-api.version}</version>
+                                <groupId>org.glassfish</groupId>
+                                <artifactId>javax.json</artifactId>
+                                <version>${jsonp-ri.version}</version>
                             </artifact>
                             <nonFinal>false</nonFinal>
-                            <jarType>api</jarType>
+                            <jarType>impl</jarType>
                             <specVersion>1.1</specVersion>
                             <implVersion>${jsonp-ri.version}</implVersion>
                             <apiPackage>javax.json</apiPackage>