You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2018/07/01 13:22:38 UTC
svn commit: r1834791 - in /openwebbeans/meecrowave/trunk:
meecrowave-core/src/main/java/org/apache/meecrowave/cxf/ConfigurableBus.java
pom.xml
Author: rmannibucau
Date: Sun Jul 1 13:22:38 2018
New Revision: 1834791
URL: http://svn.apache.org/viewvc?rev=1834791&view=rev
Log:
MEECROWAVE-122 Johnzon 1.1.8
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/ConfigurableBus.java
openwebbeans/meecrowave/trunk/pom.xml
Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/ConfigurableBus.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/ConfigurableBus.java?rev=1834791&r1=1834790&r2=1834791&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/ConfigurableBus.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/ConfigurableBus.java Sun Jul 1 13:22:38 2018
@@ -18,6 +18,7 @@
*/
package org.apache.meecrowave.cxf;
+import static java.util.Collections.singletonList;
import static java.util.Optional.of;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.toList;
@@ -28,7 +29,6 @@ import java.io.Reader;
import java.io.Writer;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -174,7 +174,7 @@ public class ConfigurableBus extends Ext
final JsonProvider provider) {
// ATTENTION this is only a workaround for MEECROWAVE-49 and shall get removed after Johnzon has a fix for it!
// We add byte[] to the ignored types.
- super(Arrays.asList("[B"));
+ super(singletonList("[B"));
this.provider = provider;
ofNullable(encoding).ifPresent(this::setEncoding);
ofNullable(namingStrategy).ifPresent(this::setPropertyNamingStrategy);
@@ -185,10 +185,7 @@ public class ConfigurableBus extends Ext
setPretty(pretty);
}
- public Jsonb getProvider() {
- return delegate.get();
- }
-
+ @Override
protected Jsonb createJsonb() {
return JsonbBuilder.newBuilder()
.withProvider(provider)
Modified: openwebbeans/meecrowave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1834791&r1=1834790&r2=1834791&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Sun Jul 1 13:22:38 2018
@@ -52,7 +52,7 @@
<tomcat.version>9.0.10</tomcat.version>
<openwebbeans.version>2.0.6</openwebbeans.version>
<cxf.version>3.2.5</cxf.version>
- <johnzon.version>1.1.7</johnzon.version>
+ <johnzon.version>1.1.8</johnzon.version>
<log4j2.version>2.11.0</log4j2.version>
<deltaspike.version>1.8.1</deltaspike.version>
<jaxb.version>2.2.11</jaxb.version>