Google GitGoogle Git
Sign in
gdch-oss/third_party/jakartaee/jsonp-api/3a44289cb16938a7c7d7c890e2cfd69c6015020a^!/.
commit
3a44289cb16938a7c7d7c890e2cfd69c6015020a
[log]
author
Lukas Jungmann <lukas.jungmann@oracle.com>
Sat Oct 06 23:28:23 2018 +0200
committer
Dmitry Kornilov <maiden168@gmail.com>
Sun Oct 07 00:28:23 2018 +0300
tree
fe75a0b308a8127d79a9283fc2b74a97794e921e
parent
8da55edb572165ccf524007ab3787722ad871cc8 [diff]
Sync changes from original repo and master (#120)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>

diff --git a/api/pom.xml b/api/pom.xml
index eb8716c..0187aa1 100644
--- a/api/pom.xml
+++ b/api/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-api</artifactId>
     <packaging>bundle</packaging>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
     <name>JSR 374 (JSON Processing) API</name>
     <description>API module of JSR 374:Java API for Processing JSON</description>
     <url>https://javaee.github.io/jsonp</url>

diff --git a/bundles/licensee/pom.xml b/bundles/licensee/pom.xml
index 464467e..b10610a 100755
--- a/bundles/licensee/pom.xml
+++ b/bundles/licensee/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json-bundles</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>json-licensee-bundle</artifactId>

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 3ddc1b4..8382e2f 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/bundles/ri/pom.xml b/bundles/ri/pom.xml
index 5e0f8c2..11b94bb 100755
--- a/bundles/ri/pom.xml
+++ b/bundles/ri/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json-bundles</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>json-ri-bundle</artifactId>

diff --git a/bundles/ri/src/main/resources/README.txt b/bundles/ri/src/main/resources/README.txt
index 257f3d4..7b7bda5 100644
--- a/bundles/ri/src/main/resources/README.txt
+++ b/bundles/ri/src/main/resources/README.txt

@@ -1,4 +1,4 @@
-* javax.json-1.1.3.jar contains both "JSR 374 : Java API for JSON Processing 1.1" API and its default provider implementation. Keep it in classpath for both compiling and running your application.
+* javax.json-1.1.4.jar contains both "JSR 374 : Java API for JSON Processing 1.1" API and its default provider implementation. Keep it in classpath for both compiling and running your application.
 
 * If you are running with maven, you can use the following maven coordinates:
 
@@ -6,7 +6,7 @@
   <dependency>
       <groupId>javax.json</groupId>
       <artifactId>javax.json-api</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
   </dependency>
 
 for reference implementation:
@@ -14,7 +14,7 @@
   <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.json</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
   </dependency>
 
 * GlassFish 5.x already bundles latest JSON Processing implementation and JAX-RS integration module. If you deploy an application with GlassFish 5.x, your application (war/ear) doesn't have to bundle APIs nor the ri jar.

diff --git a/demos/customprovider-jdk9/pom.xml b/demos/customprovider-jdk9/pom.xml
index 2236e46..175150e 100644
--- a/demos/customprovider-jdk9/pom.xml
+++ b/demos/customprovider-jdk9/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/demos/facebook/pom.xml b/demos/facebook/pom.xml
index a67d66c..4bfa63d 100644
--- a/demos/facebook/pom.xml
+++ b/demos/facebook/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/demos/jaxrs/pom.xml b/demos/jaxrs/pom.xml
index 84709da..6316af0 100644
--- a/demos/jaxrs/pom.xml
+++ b/demos/jaxrs/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/demos/jsonpointer/pom.xml b/demos/jsonpointer/pom.xml
index 3a883f1..779727a 100644
--- a/demos/jsonpointer/pom.xml
+++ b/demos/jsonpointer/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/demos/pom.xml b/demos/pom.xml
index c86a57b..3d68f20 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/demos/servlet/pom.xml b/demos/servlet/pom.xml
index 7f436d2..34c71c2 100644
--- a/demos/servlet/pom.xml
+++ b/demos/servlet/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index 79804ee..3b568a4 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/gf/customprovider/pom.xml b/gf/customprovider/pom.xml
index c566d36..1e7091d 100644
--- a/gf/customprovider/pom.xml
+++ b/gf/customprovider/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>providers</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/gf/defaultprovider/pom.xml b/gf/defaultprovider/pom.xml
index 484dd55..b602929 100644
--- a/gf/defaultprovider/pom.xml
+++ b/gf/defaultprovider/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>providers</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/gf/pom.xml b/gf/pom.xml
index a0bb205..ad4b73b 100644
--- a/gf/pom.xml
+++ b/gf/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/impl/pom.xml b/impl/pom.xml
index 36e9b68..e1fd5f6 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.glassfish</groupId>
     <artifactId>javax.json</artifactId>
     <packaging>bundle</packaging>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
     <name>JSR 374 (JSON Processing) Default Provider</name>
     <description>Default provider for JSR 374:Java API for Processing JSON</description>
     <url>https://javaee.github.io/jsonp</url>
@@ -138,7 +138,7 @@
                         <artifactId>maven-bundle-plugin</artifactId>
                         <configuration>
                             <instructions>
-                                <Include-Resource>target/classes/module-info.class</Include-Resource>
+                                <Include-Resource>{maven-resources},target/classes/module-info.class</Include-Resource>
                             </instructions>
                         </configuration>
                     </plugin>

diff --git a/impl/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/impl/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
new file mode 100644
index 0000000..52f1a6b
--- /dev/null
+++ b/impl/src/main/resources/META-INF/services/javax.json.spi.JsonProvider

@@ -0,0 +1 @@
+org.glassfish.json.JsonProviderImpl

diff --git a/jaxrs-1x/pom.xml b/jaxrs-1x/pom.xml
index c1c7d0c..9b29fbd 100644
--- a/jaxrs-1x/pom.xml
+++ b/jaxrs-1x/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jsonp-jaxrs-1x</artifactId>
     <packaging>bundle</packaging>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
     <name>JSR 374 (JSON Processing) Media for JAX-RS 1.1</name>
     <description>JAX-RS 1.1 MessageBodyReader and MessageBodyWriter to support JsonObject/JsonArray/JsonStructure API of JSR 374:Java API for Processing JSON</description>
     <url>https://javaee.github.io/jsonp</url>

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 6eab1df..dc2f9fc 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.glassfish</groupId>
     <artifactId>jsonp-jaxrs</artifactId>
     <packaging>bundle</packaging>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
     <name>JSR 374 (JSON Processing) Media for JAX-RS</name>
     <description>JAX-RS MessageBodyReader and MessageBodyWriter to support JsonValue API of JSR 374:Java API for Processing JSON</description>
     <url>https://javaee.github.io/jsonp</url>

diff --git a/pom.xml b/pom.xml
index 0bd7471..96d3d21 100644
--- a/pom.xml
+++ b/pom.xml

@@ -33,7 +33,7 @@
     <groupId>org.glassfish</groupId>
     <artifactId>json</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
     <name>JSR 374 (JSON Processing) RI</name>
     <description>JSR 374:Java API for Processing JSON RI</description>
     <url>https://javaee.github.io/jsonp</url>
@@ -79,8 +79,8 @@
         <impl_namespace>org.glassfish</impl_namespace>
         <spec_version>1.1</spec_version>
         <new_spec_version>1.2</new_spec_version>
-        <new_spec_impl_version>1.1.3</new_spec_impl_version>
-        <impl_version>1.1.3</impl_version>
+        <new_spec_impl_version>1.1.4</new_spec_impl_version>
+        <impl_version>1.1.4</impl_version>
         <new_impl_version>1.2</new_impl_version>
         <non.final>false</non.final>
     </properties>

diff --git a/tests/pom.xml b/tests/pom.xml
index 3466cc4..532573a 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>