[WFLY-7185] Add JSR 367 JSON-B 1.0 support.

wildfly · Feb 13, 2018 · f00e642 · f00e642
1 parent a6fc521
commit f00e642
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 0 deletions.
diff --git a/ee/src/main/java/org/jboss/as/ee/managedbean/processors/JavaEEDependencyProcessor.java b/ee/src/main/java/org/jboss/as/ee/managedbean/processors/JavaEEDependencyProcessor.java
@@ -52,6 +52,7 @@ public class JavaEEDependencyProcessor implements DeploymentUnitProcessor {
             ModuleIdentifier.create("javax.enterprise.concurrent.api"),
             ModuleIdentifier.create("javax.interceptor.api"),
             ModuleIdentifier.create("javax.json.api"),
+            ModuleIdentifier.create("javax.json.bind.api"),
             ModuleIdentifier.create("javax.resource.api"),
             ModuleIdentifier.create("javax.rmi.api"),
             ModuleIdentifier.create("javax.xml.bind.api"),

diff --git a/pom.xml b/pom.xml
@@ -124,6 +124,7 @@
         <version.javax.activation>1.1.1</version.javax.activation>
         <version.javax.enterprise>2.0</version.javax.enterprise>
         <version.javax.json.api>1.1.2</version.javax.json.api>
+        <version.javax.json.bind.api>1.0</version.javax.json.bind.api>
         <version.javax.jws.jsr181-api>1.0-MR1</version.javax.jws.jsr181-api>
         <version.javax.mail>1.6.0</version.javax.mail>
         <version.javax.validation>2.0.1.Final</version.javax.validation>
@@ -159,6 +160,7 @@
         <version.org.codehaus.jettison>1.3.8</version.org.codehaus.jettison>
         <version.org.cryptacular>1.2.0</version.org.cryptacular>
         <version.org.eclipse.jdt.core.compiler>4.6.1</version.org.eclipse.jdt.core.compiler>
+        <version.org.eclipse.yasson>1.0</version.org.eclipse.yasson>
         <version.org.glassfish.javax.el>3.0.1-b08-jbossorg-1</version.org.glassfish.javax.el>
         <version.org.glassfish.javax.enterprise.concurrent>1.0</version.org.glassfish.javax.enterprise.concurrent>
         <version.org.glassfish.javax.json>1.1.2</version.org.glassfish.javax.json>
@@ -1890,6 +1892,18 @@
                 <version>${version.javax.json.api}</version>
             </dependency>
 
+            <dependency>
+                <groupId>javax.json.bind</groupId>
+                <artifactId>javax.json.bind-api</artifactId>
+                <version>${version.javax.json.bind.api}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>javax.validation</groupId>
                 <artifactId>validation-api</artifactId>
@@ -5631,6 +5645,18 @@
                 <version>${version.org.eclipse.jdt.core.compiler}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.eclipse</groupId>
+                <artifactId>yasson</artifactId>
+                <version>${version.org.eclipse.yasson}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>org.jboss.spec.javax.websocket</groupId>
                 <artifactId>jboss-websocket-api_1.1_spec</artifactId>

diff --git a/servlet-feature-pack/pom.xml b/servlet-feature-pack/pom.xml
@@ -144,11 +144,21 @@
             <artifactId>javax.inject</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.json.bind</groupId>
+            <artifactId>javax.json.bind-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.eclipse.jdt.core.compiler</groupId>
             <artifactId>ecj</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>yasson</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.enterprise.concurrent</artifactId>

diff --git a/...re-pack/src/main/resources/modules/system/layers/base/javax/json/bind/api/main/module.xml b/...re-pack/src/main/resources/modules/system/layers/base/javax/json/bind/api/main/module.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2018 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<module xmlns="urn:jboss:module:1.7" name="javax.json.bind.api">
+
+    <properties>
+        <property name="jboss.api" value="public"/>
+    </properties>
+    <resources>
+        <artifact name="${javax.json.bind:javax.json.bind-api}">
+            <conditions>
+                <property-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+    </resources>
+    <dependencies>
+        <module name="javax.json.api"/>
+        <module name="org.eclipse.yasson" services="import"/>
+    </dependencies>
+</module>
diff --git a/...ure-pack/src/main/resources/modules/system/layers/base/org/eclipse/yasson/main/module.xml b/...ure-pack/src/main/resources/modules/system/layers/base/org/eclipse/yasson/main/module.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2018 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<module xmlns="urn:jboss:module:1.7" name="org.eclipse.yasson">
+
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <dependencies>
+        <module name="javax.json.api"/>
+        <module name="javax.json.bind.api" />
+    </dependencies>
+    <resources>
+        <artifact name="${org.eclipse:yasson}">
+            <conditions>
+                <property-equal  name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+    </resources>
+</module>