You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2019/07/23 09:20:35 UTC
svn commit: r1863618 - in /turbine/fulcrum/trunk/json: ./ dist/
dist/src/assembly/ jackson/src/test/org/apache/fulcrum/json/jackson/
jackson2/ jackson2/src/test/org/apache/fulcrum/json/jackson/
Author: gk
Date: Tue Jul 23 09:20:35 2019
New Revision: 1863618
URL: http://svn.apache.org/viewvc?rev=1863618&view=rev
Log:
- set excludeSubModuleDirectories false in assembly build
- update to parent 6, jackson2 version to 2.9.9
- cleanup tests, junit5..
Modified:
turbine/fulcrum/trunk/json/dist/pom.xml
turbine/fulcrum/trunk/json/dist/src/assembly/src.xml
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
turbine/fulcrum/trunk/json/jackson2/pom.xml
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
turbine/fulcrum/trunk/json/pom.xml
Modified: turbine/fulcrum/trunk/json/dist/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/pom.xml?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/dist/pom.xml (original)
+++ turbine/fulcrum/trunk/json/dist/pom.xml Tue Jul 23 09:20:35 2019
@@ -78,6 +78,7 @@
</goals>
<configuration>
<runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+ <!--outputDirectory>${file.separator}/${project.artifactId}-${project.version}</outputDirectory-->
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
<descriptor>src/assembly/src.xml</descriptor>
Modified: turbine/fulcrum/trunk/json/dist/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/src/assembly/src.xml?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/dist/src/assembly/src.xml (original)
+++ turbine/fulcrum/trunk/json/dist/src/assembly/src.xml Tue Jul 23 09:20:35 2019
@@ -31,9 +31,10 @@
<useAllReactorProjects>true</useAllReactorProjects>
<!--excludes>
<exclude>org.apache.fulcrum:fulcrum-json-dist</exclude>
- </excludes-->
+ </excludes-->
<sources>
<outputDirectoryMapping>${module.basedir.name}</outputDirectoryMapping>
+ <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
<fileSets>
<fileSet>
<excludes>
Modified: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java (original)
+++ turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/BeanMixin.java Tue Jul 23 09:20:35 2019
@@ -33,5 +33,5 @@ public abstract class BeanMixin {
String profession; // exclude
@JsonProperty
- abstract String getName();//
+ abstract String getName();
}
\ No newline at end of file
Modified: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java Tue Jul 23 09:20:35 2019
@@ -1,40 +1,12 @@
package org.apache.fulcrum.json.jackson;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import static org.junit.Assert.*;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.fulcrum.json.JsonService;
import org.apache.fulcrum.json.TestClass;
-import org.apache.fulcrum.testcontainer.BaseUnit4Test;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
@@ -43,160 +15,20 @@ import org.junit.Test;
* @author gk
* @version $Id$
*/
-public class DefaultServiceTest extends BaseUnit4Test {
+public class DefaultServiceTest extends BaseUnit5Test {
private JsonService sc = null;
- private final String preDefinedOutput = "{\"container\":{\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}";
+ private final String preDefinedOutput =
+ "{\"container\":{\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}";
- @Before
+ @BeforeEach
public void setUp() throws Exception {
sc = (JsonService) this.lookup(JsonService.ROLE);
}
@Test
public void testSerialize() throws Exception {
String serJson = sc.ser(new TestClass("mytest"));
- assertEquals("Serialization failed ", preDefinedOutput, serJson);
- }
- @Test
- public void testSerializeExcludeNothing() throws Exception {
- String serJson = sc.ser(new TestClass("mytest"));
- assertEquals(
- "Serialization failed ",
- "{\"container\":{\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}",
- serJson);
- }
- @Test
- public void ignoreTestSerializeExcludeClass() throws Exception {
- // jackson 1 could yet not exclude classes
- }
-
- public void ignoreTestSerializeExcludeClassAndField() throws Exception {
- // no deep exclude
- }
-
- public void ignoreTestSerializeExcludeClassAndFields() throws Exception {
- // no deep exclude
- }
-
- public void ignoreTestSerializeExcludeField() throws Exception {
-
- // no deep ignore??
- }
- @Test
- public void testSerializeDate() throws Exception {
- final SimpleDateFormat MMddyyyy = new SimpleDateFormat("MM/dd/yyyy");
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("date", Calendar.getInstance().getTime());
-
- sc.setDateFormat(MMddyyyy);
- String serJson = sc.ser(map);
- System.out.println("serJson:" + serJson);
- assertTrue("Serialize with Adapter failed ",
- serJson.matches("\\{\"date\":\"\\d\\d/\\d\\d/\\d{4}\"\\}"));
- }
- @Test
- // jackson serializes size too
- public void testSerializeCollection() throws Exception {
- List<org.apache.fulcrum.json.Rectangle> rectList = new ArrayList<org.apache.fulcrum.json.Rectangle>();
- for (int i = 0; i < 10; i++) {
- org.apache.fulcrum.json.Rectangle filteredRect = new org.apache.fulcrum.json.Rectangle(i, i, "rect" + i);
- rectList.add(filteredRect);
- }
- String adapterSer = sc.ser(rectList);
- assertEquals(
- "collect ser",
- "[{'w':0,'h':0,'name':'rect0','size':0},{'w':1,'h':1,'name':'rect1','size':1},{'w':2,'h':2,'name':'rect2','size':4},{'w':3,'h':3,'name':'rect3','size':9},{'w':4,'h':4,'name':'rect4','size':16},{'w':5,'h':5,'name':'rect5','size':25},{'w':6,'h':6,'name':'rect6','size':36},{'w':7,'h':7,'name':'rect7','size':49},{'w':8,'h':8,'name':'rect8','size':64},{'w':9,'h':9,'name':'rect9','size':81}]",
- adapterSer.replace('"', '\''));
- }
- @Test
- public void testSerializationCollectioPrimitiveWrapper() throws Exception {
- List<Integer> intList = new ArrayList<Integer>();
- for (int i = 0; i < 10; i++) {
- Integer integer = new Integer(i*i);
- intList.add(integer);
- }
- String result = sc.serializeOnlyFilter(intList, Integer.class, null);
- assertEquals(
- "Serialization of beans failed ",
- "[0,1,4,9,16,25,36,49,64,81]",
- result);
- }
-
-// public void testSerializeTypeAdapterForCollection() throws Exception {
-// TestSerializer tser = new TestSerializer();
-// CustomModuleWrapper<List> cmw = new CustomModuleWrapper<List>(tser, null);
-// sc.addAdapter("Collection Adapter", ArrayList.class, cmw);
-// List<Rectangle> rectList = new ArrayList<Rectangle>();
-// for (int i = 0; i < 10; i++) {
-// Rectangle filteredRect = new Rectangle(i, i, "rect" + i);
-// rectList.add(filteredRect);
-// }
-// String adapterSer = sc.ser(rectList);
-// assertEquals(
-// "collect ser",
-// "{'rect0':0,'rect1':1,'rect2':4,'rect3':9,'rect4':16,'rect5':25,'rect6':36,'rect7':49,'rect8':64,'rect9':81}",
-// adapterSer.replace('"', '\''));
-// }
-
-// public void testMixinAdapter() throws Exception {
-// TestJsonSerializer tser = new TestJsonSerializer();
-// CustomModuleWrapper<TestClass> cmw = new CustomModuleWrapper<TestClass>(
-// tser, null);
-// sc.addAdapter("Collection Adapter", TestClass.class, cmw);
-// String adapterSer = sc.ser(new TestClass("mytest"));
-// assertEquals("failed adapter serialization:",
-// "{\"n\":\"mytest\",\"p\":\"Config.xml\",\"c\":[]}", adapterSer);
-// }
- @Test
- public void testDeSerialize() throws Exception {
- String serJson = sc.ser(new TestClass("mytest"));
- Object deson = sc.deSer(serJson, TestClass.class);
- assertEquals("Serialization failed ", TestClass.class, deson.getClass());
- }
-
- @Test
- public void testDeserializationCollection() throws Exception {
- List<Rectangle> rectList = new ArrayList<Rectangle>();
- for (int i = 0; i < 10; i++) {
- Rectangle filteredRect = new Rectangle(i, i, "rect" + i);
- rectList.add(filteredRect);
- }
- String serColl = sc.ser(rectList);
- // we need to set size to Ignore -> UnrecognizedPropertyException
- Collection<Rectangle> resultList0 = sc.deSerCollection(serColl, new ArrayList<Rectangle>(), Rectangle.class);
- for (int i = 0; i < 10; i++) {
- Rectangle rect = ((List<Rectangle>)resultList0)
- .get(i);
- assertEquals("deser reread size failed", (i * i), rect.getSize());
- }
+ assertEquals(preDefinedOutput, serJson,
+ "Serialization of preDefinedOutput failed ");
}
-
- public void testDeserializationTypeAdapterForCollection() throws Exception {
- // not implemented
- }
- @Test
- public void testSerializeWithMixinAndFilter() throws Exception {
- Bean filteredBean = new Bean();
- filteredBean.setName("joe");
- //
- sc.addAdapter("M4RBeanMixin", Bean.class,
- BeanMixin.class);
- // profession was already set to ignore, does not change
- String bean = sc.serializeOnlyFilter(filteredBean, Bean.class, "profession");
- assertEquals(
- "Ser filtered Bean failed ",
- "{}",
- bean);
- }
- @Test
- public void testSerializeWithOnlyFilter() throws Exception {
- // no deep include ??
- Bean filteredBean = new Bean();
- filteredBean.setName("joe");
- String bean = sc.serializeOnlyFilter(filteredBean, Bean.class, "profession");
- assertEquals(
- "Ser filtered Bean failed ",
- "{\"profession\":null}",
- bean);
- }
-
-}
+
+}
\ No newline at end of file
Modified: turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java Tue Jul 23 09:20:35 2019
@@ -1,5 +1,8 @@
package org.apache.fulcrum.json.jackson;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,8 +22,6 @@ package org.apache.fulcrum.json.jackson;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Calendar;
@@ -34,11 +35,11 @@ import org.apache.avalon.framework.logge
import org.apache.fulcrum.json.JsonService;
import org.apache.fulcrum.json.Rectangle;
import org.apache.fulcrum.json.TestClass;
-import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Jackson1 JSON Test
@@ -46,12 +47,12 @@ import org.junit.Test;
* @author gk
* @version $Id$
*/
-public class JacksonMapperTest extends BaseUnit4Test {
+public class JacksonMapperTest extends BaseUnit5Test {
private JsonService sc = null;
private final String preDefinedOutput = "{\"container\":{\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}";
Logger logger;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
sc = (JsonService) this.lookup(JsonService.ROLE);
logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
@@ -59,15 +60,15 @@ public class JacksonMapperTest extends B
@Test
public void testSerialize() throws Exception {
String serJson = sc.ser(new TestClass("mytest"));
- assertEquals("Serialization failed ", preDefinedOutput, serJson);
+ assertEquals(preDefinedOutput, serJson, "Serialization failed ");
}
@Test
public void testSerializeDateWithDefaultDateFormat() throws Exception {
Map<String, Date> map = new HashMap<String, Date>();
map.put("date", Calendar.getInstance().getTime());
String serJson = sc.ser(map);
- assertTrue("Serialize with Adapater failed ",
- serJson.matches("\\{\"date\":\"\\d\\d/\\d\\d/\\d{4}\"\\}"));
+ assertTrue(serJson.matches("\\{\"date\":\"\\d\\d/\\d\\d/\\d{4}\"\\}"),
+ "Serialize with Adapater failed");
}
@Test
@@ -76,14 +77,14 @@ public class JacksonMapperTest extends B
Map<String, Integer> map = new HashMap<String, Integer>();
map.put("name", 5001);
Map deserMap = (Map) sc.deSer(sc.ser(map), Map.class);
- assertEquals("Integer DeSer failed ", 5001, deserMap.get("name"));
+ assertEquals(5001, deserMap.get("name"), "Integer DeSer failed");
}
@Test
public void testSerializeSingleObjectExcludeWithMixins() throws Exception {
sc.addAdapter("M4RMixin", Rectangle.class, Mixin.class);
String serRect = sc.ser(new Rectangle(25, 3));
- assertEquals("DeSer failed ", "{\"width\":25}", serRect);
+ assertEquals("{\"width\":25}", serRect, "DeSer failed");
}
@Test
@@ -92,15 +93,15 @@ public class JacksonMapperTest extends B
Bean filteredBean = new Bean();
filteredBean.setName("joe");
String bean = sc.serializeOnlyFilter(filteredBean, Bean.class, "name");
- assertEquals("Ser filtered Bean failed ", "{\"name\":\"joe\"}", bean);
+ assertEquals("{\"name\":\"joe\"}", bean, "Ser filtered Bean failed ");
logger.debug("bean: " + bean);
Rectangle filteredRectangle = new Rectangle(5, 10);
filteredRectangle.setName("jim");
String rectangle = sc.serializeOnlyFilter(filteredRectangle,
Rectangle.class, "w", "name");
- assertEquals("Ser filtered Rectangle failed ",
- "{\"w\":5,\"name\":\"jim\"}", rectangle);
+ assertEquals( "{\"w\":5,\"name\":\"jim\"}", rectangle,
+ "Ser filtered Rectangle failed ");
logger.debug("rectangle: " + rectangle);
}
@@ -108,7 +109,7 @@ public class JacksonMapperTest extends B
public void testDeSerialize() throws Exception {
String serJson = sc.ser(new TestClass("mytest"));
Object deson = sc.deSer(serJson, TestClass.class);
- assertEquals("DeSer failed ", TestClass.class, deson.getClass());
+ assertEquals(TestClass.class, deson.getClass(), "DeSer failed ");
}
// public void testDeserializationCollection() throws Exception {
@@ -136,7 +137,7 @@ public class JacksonMapperTest extends B
String serRect = sc
.addAdapter("M4RMixin", Rectangle.class, Mixin.class).ser(
filteredRectangle);
- assertEquals("Ser failed ", "{\"width\":5}", serRect);
+ assertEquals("{\"width\":5}", serRect, "Ser failed ");
}
@Test
public void testMixis2() throws Exception {
@@ -147,10 +148,12 @@ public class JacksonMapperTest extends B
String serRect = sc.addAdapter("M4RMixin2", Rectangle.class,
Mixin2.class).ser(filteredRectangle);
- assertEquals("Ser failed ", "{\"name\":\"jim\",\"width\":5}", serRect);
+ assertEquals("{\"name\":\"jim\",\"width\":5}", serRect,
+ "Ser failed ");
String bean = sc.serializeOnlyFilter(filteredBean, Bean.class, "name");
- assertEquals("Ser filtered Bean failed ", "{\"name\":\"joe\"}", bean);
+ assertEquals("{\"name\":\"joe\"}", bean,
+ "Ser filtered Bean failed ");
}
@Test
public void testFilteredCollectionOfBeans() throws Exception {
@@ -167,8 +170,8 @@ public class JacksonMapperTest extends B
Object objResult = ((JacksonMapperService) sc).deSer(result,
List.class, Bean.class);
List<Bean> beanList2 = (List<Bean>) objResult;
- assertTrue("DeSer failed ", beanList2 instanceof List);
- assertTrue("DeSer failed ", beanList2.size() == 10);
+ assertTrue(beanList2 instanceof List, "DeSer Type failed ");
+ assertTrue(beanList2.size() == 10, "DeSer size failed ");
for (Bean bean : beanList2) {
logger.debug("deser bean: " + bean.getName() + " is "
+ bean.getAge());
@@ -189,8 +192,8 @@ public class JacksonMapperTest extends B
Object objResult = ((JacksonMapperService) sc).deSer(result,
List.class, Bean.class);
List<Bean> beanList2 = (List<Bean>) objResult;
- assertTrue("DeSer failed ", beanList2 instanceof List);
- assertTrue("DeSer failed ", beanList2.size() == 10);
+ assertTrue(beanList2 instanceof List, "DeSer failed ");
+ assertTrue(beanList2.size() == 10, "DeSer failed ");
for (Bean bean : beanList2) {
logger.debug("deser bean: " + bean.getName() + " is "
+ bean.getAge());
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Tue Jul 23 09:20:35 2019
@@ -126,6 +126,6 @@
<properties>
<!-- 2.7.x hase Java 7 baseline, but is compiled with Java 6 support, cft. https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.7.
With Jackson 2.8, Java 7 languages features will be allowed -->
- <jackson2.version>2.9.7</jackson2.version>
+ <jackson2.version>2.9.9</jackson2.version>
</properties>
</project>
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java Tue Jul 23 09:20:35 2019
@@ -20,7 +20,6 @@ package org.apache.fulcrum.json.jackson;
*/
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Log4JLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.fulcrum.json.JsonService;
@@ -29,7 +28,6 @@ import org.apache.fulcrum.json.jackson.e
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
import org.apache.log4j.LogManager;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.runner.RunWith;
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java Tue Jul 23 09:20:35 2019
@@ -18,6 +18,7 @@ package org.apache.fulcrum.json.jackson;
* specific language governing permissions and limitations
* under the License.
*/
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java Tue Jul 23 09:20:35 2019
@@ -18,8 +18,8 @@ package org.apache.fulcrum.json.jackson;
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.Calendar;
Modified: turbine/fulcrum/trunk/json/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1863618&r1=1863617&r2=1863618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Tue Jul 23 09:20:35 2019
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,19 +34,18 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/</url>
+ <url>https://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/</url>
</scm>
<!-- Required for staging to work -->
- <distributionManagement>
- <site>
- <id>turbine.apache.org</id>
- <name>Fulcrum JSON Website</name>
- <url>http://turbine.apache.org/fulcrum/fulcrum-json/</url>
- </site>
- </distributionManagement>
-
-
+ <distributionManagement>
+ <site>
+ <id>turbine.apache.org</id>
+ <name>Fulcrum JSON Website</name>
+ <url>https://turbine.apache.org/fulcrum/fulcrum-json/</url>
+ </site>
+ </distributionManagement>
+
<developers>
<developer>
<id>gk</id>
@@ -92,6 +91,7 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -99,31 +99,28 @@
<version>1.0.8</version>
<scope>test</scope>
</dependency>
- <!-- Log4j2 should be used by default , remved optional -->
+ <!-- Log4j2 should be used by default, removed optional -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
</dependency>
<!-- log4j1.2 bridge instead of log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
</dependency>
</dependencies>
-
- <properties>
- <turbine.site.path>fulcrum/fulcrum-json</turbine.site.path>
- <turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/json</turbine.scmPubCheckoutDirectory>
- <turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache>
- <siteContent.path>${project.build.directory}/staging</siteContent.path><!-- default stagingSiteURL -->
- <log4j2.version>2.11.1</log4j2.version>
- </properties>
+
+ <properties>
+ <turbine.site.path>fulcrum/fulcrum-json</turbine.site.path>
+ <turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/json</turbine.scmPubCheckoutDirectory>
+ </properties>
</project>