Author: schor
Date: Tue Nov 28 13:41:30 2017
New Revision: 1816543
URL: http://svn.apache.org/viewvc?rev=1816543&view=rev
Log:
[UIMA-5655]
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-json/pom.xml
uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java
uima/uv3/uimaj-v3/trunk/uimaj-parent/pom.xml
Modified: uima/uv3/uimaj-v3/trunk/uimaj-json/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-json/pom.xml?rev=1816543&r1=1816542&r2=1816543&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-json/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-json/pom.xml Tue Nov 28 13:41:30 2017
@@ -49,7 +49,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.4.2</version>
+ <version>2.9.2</version>
</dependency>
<dependency>
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java?rev=1816543&r1=1816542&r2=1816543&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java
Tue Nov 28 13:41:30 2017
@@ -37,6 +37,7 @@ import com.fasterxml.jackson.core.JsonFa
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.PrettyPrinter;
+import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.FixedSpaceIndenter;
@@ -351,7 +352,12 @@ public class JsonContentHandlerJacksonWr
public void withNl() {
if (isFormattedOutput) {
-
uimaPrettyPrinter.indentObjectsWith(DefaultPrettyPrinter.Lf2SpacesIndenter.instance);
+ // upgrade from Lf2SpacesIndenter - removed in v 2.7
+
+ uimaPrettyPrinter.indentObjectsWith(
+// DefaultPrettyPrinter.Lf2SpacesIndenter.instance
+ DefaultIndenter.SYSTEM_LINEFEED_INSTANCE
+ );
}
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-parent/pom.xml?rev=1816543&r1=1816542&r2=1816543&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-parent/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-parent/pom.xml Tue Nov 28 13:41:30 2017
@@ -145,8 +145,8 @@
Local configurations within plugins should be avoided. Where plugins do
not pick up default
properties already, they should be injected manually into the plugins.
-->
- <slf4j.version>1.7.24</slf4j.version>
- <log4j.version>2.8</log4j.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <log4j.version>2.10.0</log4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -155,7 +155,7 @@
<maven.surefire.java9 />
<jacoco.argLine />
- <api_check_oldVersion>2.10.1</api_check_oldVersion>
+ <api_check_oldVersion>2.10.2</api_check_oldVersion>
</properties>
<dependencyManagement>
