[johnzon] branch master updated: ensure pom does not have warnings (commenting jakartaee-tck profile which is not yet done + dropping prerequisites which is no more used) + ensure default for johnzon.support-enum-container-deserialization fits spec 3.11 (tck was wrong)

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git


The following commit(s) were added to refs/heads/master by this push:
     new cefd286  ensure pom does not have warnings (commenting jakartaee-tck profile which is not yet done + dropping prerequisites which is no more used) + ensure default for johnzon.support-enum-container-deserialization fits spec 3.11 (tck was wrong)
cefd286 is described below

commit cefd286b648d7b5a6328660cb828cdcf839dcb34
Author: Romain Manni-Bucau <rm...@apache.org>
AuthorDate: Tue Aug 27 07:11:22 2019 +0200

    ensure pom does not have warnings (commenting jakartaee-tck profile which is not yet done + dropping prerequisites which is no more used) + ensure default for johnzon.support-enum-container-deserialization fits spec 3.11 (tck was wrong)
---
 johnzon-core/pom.xml                                                  | 2 ++
 .../src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java        | 4 ++--
 pom.xml                                                               | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml
index 678d71c..5b2a8e5 100644
--- a/johnzon-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -48,6 +48,7 @@
     </plugins>
   </build>
 
+<!-- avoid warnings at build time + this is not sufficient to run anyway (edit ts.jte)
   <profiles>
     <profile>
       <id>jakartaee-tck</id>
@@ -70,4 +71,5 @@
       </dependencies>
     </profile>
   </profiles>
+-->
 </project>
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index ade815e..d092ff3 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -145,8 +145,8 @@ public class JohnzonBuilder implements JsonbBuilder {
         builder.setUseBigDecimalForObjectNumbers(
                 config.getProperty("johnzon.use-big-decimal-for-object").map(this::toBool).orElse(true));
         builder.setSupportEnumContainerDeserialization( // https://github.com/eclipse-ee4j/jakartaee-tck/issues/103
-                config.getProperty("johnzon.support-enum-container-deserialization")
-                        .map(this::toBool).orElse(false));
+                toBool(System.getProperty("johnzon.support-enum-container-deserialization", config.getProperty("johnzon.support-enum-container-deserialization")
+                        .map(String::valueOf).orElse("true"))));
 
         final boolean ijson = config.getProperty(JsonbConfig.STRICT_IJSON)
                 .map(Boolean.class::cast)
diff --git a/pom.xml b/pom.xml
index 05f4167..926748a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,10 +20,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <prerequisites>
-    <maven>3.1.0</maven>
-  </prerequisites>
-
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>