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 2021/06/08 14:08:48 UTC
svn commit: r1890604 - in /turbine/fulcrum/trunk/json: ./ gson/ jackson2/
jackson2/src/test/org/apache/fulcrum/json/jackson/
jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/ src/changes/
Author: gk
Date: Tue Jun 8 14:08:48 2021
New Revision: 1890604
URL: http://svn.apache.org/viewvc?rev=1890604&view=rev
Log:
- update versions, see changes.xml
- fix javadoc errors
Modified:
turbine/fulcrum/trunk/json/gson/pom.xml
turbine/fulcrum/trunk/json/jackson2/pom.xml
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/json/src/changes/changes.xml
Modified: turbine/fulcrum/trunk/json/gson/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/pom.xml?rev=1890604&r1=1890603&r2=1890604&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/gson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/gson/pom.xml Tue Jun 8 14:08:48 2021
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.9</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
- <version>2.3.0</version>
+ <version>2.6.0</version>
<optional>true</optional>
<!-- as we are using gson -->
<exclusions>
@@ -100,12 +100,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.21</version>
+ <version>1.7.30</version>
<optional>true</optional>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
- <gson.version>2.8.5</gson.version>
+ <gson.version>2.8.7</gson.version>
</properties>
</project>
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1890604&r1=1890603&r2=1890604&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Tue Jun 8 14:08:48 2021
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.9</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
@@ -99,7 +99,7 @@
<artifactId>jackson-datatype-json-org</artifactId>
<version>${jackson2.version}</version>
<optional>true</optional>
- <!-- v 2.8.11 had still geronimo as dependency, since 2.9.6 update to org.json 201718, 20180813, which have still incompatible license: https://www.apache.org/legal/resolved.html#json:
+ <!-- v 2.8.11 had still geronimo as dependency, since 2.9.6 update to org.json ... 20190722, which has still incompatible license: https://www.apache.org/legal/resolved.html#json:
exclude it and include geronimo json alternatively -->
<exclusions>
<exclusion>
@@ -117,7 +117,7 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
- <version>2.3.0</version>
+ <version>2.6.0</version>
<optional>true</optional>
<!-- as we are using jackson -->
<exclusions>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.25</version>
+ <version>1.7.30</version>
<optional>true</optional>
<scope>test</scope>
</dependency>
@@ -138,27 +138,14 @@
<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.12.2</jackson2.version>
+ <jackson2.version>2.12.3</jackson2.version>
</properties>
<profiles>
<profile>
<id>jkd-12-compile</id>
<activation>
- <jdk>12</jdk>
+ <jdk>[12,)</jdk>
</activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <release>8</release>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
<dependencies>
<!-- removal of jaxb in java 12: https://docs.oracle.com/en/java/javase/12/migrate/index.html -->
<dependency>
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java?rev=1890604&r1=1890603&r2=1890604&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java Tue Jun 8 14:08:48 2021
@@ -307,7 +307,9 @@ public class DefaultServiceTest extends
}
/**
- * @throws Exception generic exception
+ *
+ * @param testReporter to report test infos (may propagate)
+ * @throws Exception custom from ser
*/
@Test
public void testSerializationCollectioPrimitiveWrapper(TestReporter testReporter) throws Exception {
@@ -544,12 +546,14 @@ public class DefaultServiceTest extends
// filter
assertEquals("{\"name\":\"bean0\"}", sc.serializeOnlyFilter(bean, Object.class, true, "name"));
}
-
+
/**
- * @throws Exception generic exception
+ *
+ * @param testReporter to report test infos (may propagate)
+ * @throws Exception from ser/deser
*/
@Test
- public void testSerializeCollectionWithOnlyFilterAndParentClass(TestReporter testReporter) throws Exception {
+ public void testSerializeCollectionWithOnlyFilterAndParentClass(TestReporter testReporter) throws Exception {
List<BeanChild> beanList = new ArrayList<BeanChild>();
for (int i = 0; i < 3; i++) {
BeanChild bean = new BeanChild();
@@ -570,7 +574,9 @@ public class DefaultServiceTest extends
}
/**
- * @throws Exception generic exception
+ *
+ * @param testReporter to report test infos (may propagate)
+ * @throws Exception generic type from ser/deser
*/
@Test
public void testSerializeCollectionWithOnlyFilterAndExactClass(TestReporter testReporter) throws Exception {
@@ -591,7 +597,9 @@ public class DefaultServiceTest extends
}
/**
- * @throws Exception generic exception
+ *
+ * @param testReporter to report test infos (may propagate)
+ * @throws Exception generic type from ser/deser
*/
@Test
public void testSerializeCollectionWithOnlyFilterWithChildClass(TestReporter testReporter) throws Exception {
@@ -631,13 +639,14 @@ public class DefaultServiceTest extends
}
/**
- * @throws Exception generic exception
*
* This test was a workaround for no type cft. https://github.com/FasterXML/jackson-databind/issues/303
*
- * and is not supported in v > 10.2 (assign a type to Object). Use e.g. type references
+ * and is not supported in v > 10.2 (assign a type to Object). Use e.g. type references
+ *
+ * {@link #testSerializeCollectionWithTypedReference(TestReporter)} or write a custom serializer
*
- * {@link #testSerializeCollectionWithTypedReference(TestReporter)} or write a custom serializer
+ * @throws Exception generic type
*/
@Deprecated
public void testSerializeCollectionWithOnlyFilterAndMixin() throws Exception {
@@ -657,7 +666,9 @@ public class DefaultServiceTest extends
}
/**
- * @throws Exception generic exception
+ *
+ * @param testReporter to report test infos (may propagate)
+ * @throws Exception generic type from ser/deser
*/
@Test
public void testSerializeCollectionWithTypedReference(TestReporter testReporter) throws Exception {
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java?rev=1890604&r1=1890603&r2=1890604&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java Tue Jun 8 14:08:48 2021
@@ -46,7 +46,6 @@ import org.apache.fulcrum.testcontainer.
import org.apache.log4j.LogManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
@@ -59,8 +58,6 @@ import com.fasterxml.jackson.databind.Ob
*
* cft. http://wiki.fasterxml.com/JacksonPolymorphicDeserialization
*
- * adding {@literal @}{@link RunWith} annotation with {@link JUnitPlatform} allows intellij/eclipse IDE recognize it's a test
- *
* @author gk
* @version $Id$
*/
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java?rev=1890604&r1=1890603&r2=1890604&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java Tue Jun 8 14:08:48 2021
@@ -223,6 +223,10 @@ public class JSONConcurrentJunit5Test ex
}
}
+ /**
+ * Repeated Test
+ * @param testReporter to report
+ */
@RepeatedTest(10)
public void testsRunInParallel(TestReporter testReporter) {
// Parallel among methods in a class in one thread pool
@@ -245,6 +249,10 @@ public class JSONConcurrentJunit5Test ex
// assertThat(fOne, is(not(fThree)));
}
+ /**
+ *
+ * @param testReporter to reportfrom assets
+ */
@RepeatedTest(3)
public void testsRunInSameThread(TestReporter testReporter) {
// Parallel among methods in a class in one thread pool
@@ -270,6 +278,11 @@ public class JSONConcurrentJunit5Test ex
return listener.getSummary();
}
+ /**
+ *
+ * @param testReporter to report summary, threads and failures
+ * @param summary to get failures and test count
+ */
private void defaultAsserts(TestReporter testReporter, TestExecutionSummary summary) {
List<Failure> failures = summary.getFailures();
assertNotNull(summary.getTestsFoundCount() > 0, "No Tests found");
Modified: turbine/fulcrum/trunk/json/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1890604&r1=1890603&r2=1890604&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Tue Jun 8 14:08:48 2021
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
- <version>1.7.1</version>
+ <version>1.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/json/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/src/changes/changes.xml?rev=1890604&r1=1890603&r2=1890604&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/json/src/changes/changes.xml Tue Jun 8 14:08:48 2021
@@ -24,6 +24,28 @@
</properties>
<body>
+ <release version="2.0.1" date="in SVN">
+
+
+ <action type="update" dev="gk">
+ Update Jackson to v2.12.3, GSON to 2.8.7, commons-lang3 to 3.12.0, json-path to 2.6.0, slf4j-noop to 1.7.30
+ </action>
+ <action type="update" dev="gk">
+ Security Update Jackson version 2.10.5.1 (CVE-2020-25649)
+ </action>
+ <action type="update" dev="gk">
+ - Deprecate test (DefaultServiceTest#testSerializeCollectionWithOnlyFilterAndMixin) for unresolved issue (https://github.com/FasterXML/jackson-databind/issues/303)
+ - remove jackson module from module build (it's not supported any more with java 8 and parent module dependencies)
+</action>
+ <action type="update" dev="painter">
+ - update commons-lang3, add notice and update copyright
+ </action>
+ <action type="update" dev="gk">
+ - add jaxb dependency for jackson2 module as it is not in java12,
+ - fix dateformat test
+ - include jackson-datatype-json-org, but exclude incompatible org.json and it's license.
+ </action>
+ </release>
<release version="2.0.0" date="in SVN">
<action type="update" dev="gk">
Java 8 compatiblity, updated SNAPSHOT version 1.1.2-SNAPSHOT to 2.0.0-SNAPSHOT.