Merge pull request #3969 from JaroslavTulach/ApacheHtmlJavaJsonPersistanceEE4J

Apache html java json persistance ee4 j

incubator/html-json/pom.xml

diff --git a/incubator/html-json/pom.xml b/incubator/html-json/pom.xml
index 882bb46..1ae64ca 100644
--- a/incubator/html-json/pom.xml
+++ b/incubator/html-json/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.incubator</groupId>
         <artifactId>project</artifactId>
-        <version>2.26-SNAPSHOT</version>
+        <version>2.28-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.jersey.media</groupId>
@@ -39,7 +39,7 @@
     </description>
 
     <properties>
-        <net.java.html.version>1.0</net.java.html.version>
+        <net.java.html.version>1.5.1</net.java.html.version>
     </properties>
 
     <repositories>

incubator/pom.xml

diff --git a/incubator/pom.xml b/incubator/pom.xml
index 484edcb..018270a 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -38,7 +38,7 @@
     <modules>
         <module>declarative-linking</module>
         <module>gae-integration</module>
-        <!--<module>html-json</module>-->
+        <module>html-json</module>
         <module>kryo</module>
         <module>open-tracing</module>
     </modules>