Merge branch 'develop' into release-5u16

nablarch · Mar 17, 2020 · 32a127d · 32a127d
2 parents 0467db7 + 5fa9c7d
commit 32a127d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 120 deletions.
diff --git a/nablarch-jackson-adaptor/pom.xml b/nablarch-jackson-adaptor/pom.xml
@@ -19,12 +19,6 @@
       <artifactId>jackson-databind</artifactId>
       <version>2.10.3</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.13</version>
-      <scope>provided</scope>
-    </dependency>
 
     <dependency>
       <groupId>com.nablarch.framework</groupId>

diff --git a/...ckson-adaptor/src/main/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverter.java b/...ckson-adaptor/src/main/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverter.java
diff --git a/...n-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverterTest.java b/...n-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverterTest.java
diff --git a/...tor/src/test/java/nablarch/integration/jaxrs/jackson/JacksonBodyConverterTestSupport.java b/...tor/src/test/java/nablarch/integration/jaxrs/jackson/JacksonBodyConverterTestSupport.java
@@ -1,7 +1,7 @@
 package nablarch.integration.jaxrs.jackson;
 
-import mockit.Mocked;
 import mockit.Expectations;
+import mockit.Mocked;
 import nablarch.fw.ExecutionContext;
 import nablarch.fw.jaxrs.BodyConverterSupport;
 import nablarch.fw.jaxrs.JaxRsContext;
@@ -11,8 +11,6 @@
 import nablarch.fw.web.servlet.NablarchHttpServletRequestWrapper;
 import nablarch.fw.web.servlet.ServletExecutionContext;
 import nablarch.test.support.log.app.OnMemoryLogWriter;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.SerializationConfig.Feature;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -27,7 +25,9 @@
 import java.nio.charset.UnsupportedCharsetException;
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;