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/11/12 11:08:53 UTC
svn commit: r1869691 - in /turbine/fulcrum/trunk: ./ commonsemail/ crypto/
hsqldb/ hsqldb/src/java/org/apache/fulcrum/hsqldb/ hsqldb/src/test/
hsqldb/src/test/org/apache/fulcrum/hsqldb/
json/jackson2/src/test/org/apache/fulcrum/json/jackson/ parser/src...
Author: gk
Date: Tue Nov 12 11:08:53 2019
New Revision: 1869691
URL: http://svn.apache.org/viewvc?rev=1869691&view=rev
Log:
- update turbine-parent 6 (hsqldb, template)
- commons-codec 1.13 (crypto, xmlrpc)
- formatting javadoc, xml
- owasp 5.2.2 (pom.xml)
- commons-fileupload 1.4 (upload)
- hsqldb update to 2.5.0
Modified:
turbine/fulcrum/trunk/commonsemail/pom.xml
turbine/fulcrum/trunk/crypto/pom.xml
turbine/fulcrum/trunk/hsqldb/pom.xml
turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java
turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java
turbine/fulcrum/trunk/hsqldb/src/test/test.properties
turbine/fulcrum/trunk/hsqldb/src/test/test.script
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/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
turbine/fulcrum/trunk/pom.xml
turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml
turbine/fulcrum/trunk/template/pom.xml
turbine/fulcrum/trunk/upload/pom.xml
turbine/fulcrum/trunk/xmlrpc/pom.xml
Modified: turbine/fulcrum/trunk/commonsemail/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/commonsemail/pom.xml?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/commonsemail/pom.xml (original)
+++ turbine/fulcrum/trunk/commonsemail/pom.xml Tue Nov 12 11:08:53 2019
@@ -76,7 +76,7 @@
<version>1.0.8</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${turbine.log4j2.version}</version>
Modified: turbine/fulcrum/trunk/crypto/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/crypto/pom.xml?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/crypto/pom.xml (original)
+++ turbine/fulcrum/trunk/crypto/pom.xml Tue Nov 12 11:08:53 2019
@@ -81,7 +81,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.11</version>
+ <version>1.13</version>
</dependency>
<!-- testing dependencies -->
Modified: turbine/fulcrum/trunk/hsqldb/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/pom.xml?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/pom.xml (original)
+++ turbine/fulcrum/trunk/hsqldb/pom.xml Tue Nov 12 11:08:53 2019
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
+ <version>2.5.0</version>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java (original)
+++ turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java Tue Nov 12 11:08:53 2019
@@ -27,8 +27,8 @@ import org.apache.avalon.framework.confi
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.hsqldb.Server;
-import org.hsqldb.ServerConstants;
import org.hsqldb.persist.HsqlProperties;
+import org.hsqldb.server.ServerConstants;
/**
* The original implementation was taken from
@@ -169,7 +169,7 @@ public class HSQLServiceImpl
/////////////////////////////////////////////////////////////////////////
public boolean isOnline() {
- return server.getState() == ServerConstants.SERVER_STATE_ONLINE;
+ return server.getState() == org.hsqldb.server.ServerConstants.SERVER_STATE_ONLINE;
}
Modified: turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java (original)
+++ turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java Tue Nov 12 11:08:53 2019
@@ -129,7 +129,10 @@ public class HSQLServiceTest extends Bas
{
Connection conn = this.getConnection("test");
Statement stmt = conn.createStatement();
- stmt.execute("SHUTDOWN;");
- assertFalse("Server is still running", (service).isOnline());
+ stmt.execute("SHUTDOWN;"); // IMMEDIATELY does not change time
+ // sql shutdown seems to return immediately and not to wait: https://sourceforge.net/p/hsqldb/bugs/1400/ ?
+ Thread.sleep(250);
+ assertFalse("Server is still running "+ service.toString(), (service).isOnline());
}
+
}
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.properties
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.properties?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/test/test.properties (original)
+++ turbine/fulcrum/trunk/hsqldb/src/test/test.properties Tue Nov 12 11:08:53 2019
@@ -1,17 +1,5 @@
-#HSQL Database Engine 1.8.0.10
-#Mon Nov 05 11:19:51 EST 2018
-hsqldb.script_format=0
-runtime.gc_interval=0
-sql.enforce_strict_size=false
-hsqldb.cache_size_scale=8
-readonly=false
-hsqldb.nio_data_file=true
-hsqldb.cache_scale=14
-version=1.8.0
-hsqldb.default_table_type=memory
-hsqldb.cache_file_scale=1
-hsqldb.log_size=200
+#HSQL Database Engine 2.5.0
+#Tue Nov 12 12:04:29 CET 2019
+version=2.5.0
modified=no
-hsqldb.cache_version=1.7.0
-hsqldb.original_version=1.8.0
-hsqldb.compatible_version=1.8.0
+tx_timestamp=0
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.script
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.script?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
Binary files - no diff available.
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=1869691&r1=1869690&r2=1869691&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 Nov 12 11:08:53 2019
@@ -36,7 +36,7 @@ import org.junit.runner.RunWith;
/**
* More Jackson2 JSON Test
*
- * Test with clearing mixins
+ * Test without defaultTyping with clearing mixins
* @author gk
* @version $Id$
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=1869691&r1=1869690&r2=1869691&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 Nov 12 11:08:53 2019
@@ -51,7 +51,10 @@ import com.fasterxml.jackson.core.type.T
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
/**
- * Jackson2 JSON Test with EnabledDefaultTyping {@link DefaultTyping#NON_FINAL} the most verbose type information.
+ *
+ * Test with defaultTyping activated.
+ *
+ * Jackson2 JSON Test with EnabledDefaultTyping {@link DefaultTyping#NON_FINAL} the most verbose type information.
*
* cft. http://wiki.fasterxml.com/JacksonPolymorphicDeserialization
*
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=1869691&r1=1869690&r2=1869691&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 Nov 12 11:08:53 2019
@@ -53,6 +53,9 @@ import com.fasterxml.jackson.databind.Ob
/**
+ *
+ * Test with defaultTyping activated.
+ *
* Jackson2 JSON Test with EnabledDefaultTyping {@link DefaultTyping#OBJECT_AND_NON_CONCRETE}
*
* cft. http://wiki.fasterxml.com/JacksonPolymorphicDeserialization
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=1869691&r1=1869690&r2=1869691&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 Nov 12 11:08:53 2019
@@ -85,14 +85,14 @@ public class JacksonMapperTest extends B
}
@Test
public void testSerializeDateWithDefaultDateFormat() throws Exception {
- Map<String, Date> map = new HashMap<String, Date>();
+ Map<String, Date> map = new HashMap<>();
map.put("date", Calendar.getInstance().getTime());
String serJson = sc.ser(map);
assertTrue(serJson.matches("\\{\"date\":\"\\d\\d/\\d\\d/\\d{4}\"\\}"), "Serialize with Adapater failed ");
}
@Test
public void testDeSerializeDate() throws Exception {
- Map<String, Date> map = new HashMap<String, Date>();
+ Map<String, Date> map = new HashMap<>();
map.put("date", Calendar.getInstance().getTime());
String serJson = ((Jackson2MapperService) sc).ser(map, Map.class);
Map serDate = sc.deSer(serJson, Map.class);
@@ -118,7 +118,7 @@ public class JacksonMapperTest extends B
@Test
public void testSerializationCollectionWithFilter() throws Exception {
- List<Bean> beanList = new ArrayList<Bean>();
+ List<Bean> beanList = new ArrayList<>();
for (int i = 0; i < 10; i++) {
Bean filteredBean = new Bean();
filteredBean.setName("joe" + i);
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java Tue Nov 12 11:08:53 2019
@@ -45,7 +45,7 @@ import com.fasterxml.jackson.datatype.js
/**
* Jackson2 JSON Test
*
- * Test without type setting
+ * Test without type setting with {@link JsonOrgModule} adapter activated.
*
* @author gk
* @version $Id: JacksonMapperTest.java 1800753 2017-07-04 11:00:03Z gk $
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java Tue Nov 12 11:08:53 2019
@@ -53,7 +53,7 @@ import com.jayway.jsonpath.spi.json.Jack
/**
* Jackson2 JSON Test
*
- * Test without type setting
+ * Test without type setting using {@link JsonPath}.
*
* @author gk
* @version $Id$
Modified: turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java (original)
+++ turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java Tue Nov 12 11:08:53 2019
@@ -185,6 +185,7 @@ public class BaseValueParser
/**
* Disposes the parser.
*/
+ @Override
public void dispose()
{
clear();
Modified: turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java (original)
+++ turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java Tue Nov 12 11:08:53 2019
@@ -78,6 +78,7 @@ public class DefaultCookieParser
public void dispose()
{
this.request = null;
+ this.response = null;
super.dispose();
}
Modified: turbine/fulcrum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pom.xml?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pom.xml (original)
+++ turbine/fulcrum/trunk/pom.xml Tue Nov 12 11:08:53 2019
@@ -79,7 +79,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>3.3.2</version>
+ <version>5.2.2</version>
<executions>
<execution>
<goals>
Modified: turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/resourcemanager/xdocs/index.xml Tue Nov 12 11:08:53 2019
@@ -50,7 +50,7 @@
</p>
<p>
- The key motiviation is reuse the automatic location of a resource since I
+ The key motivation is reuse the automatic location of a resource since I
implemented it a few times over the last two years. A couple services benefit
from that behaviour, e.g. the fulcrum-dom4jxslt-service and fulcrum-groovy-service.
Using a context and traversing up the file system allows to invoke different
Modified: turbine/fulcrum/trunk/template/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/template/pom.xml?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/template/pom.xml (original)
+++ turbine/fulcrum/trunk/template/pom.xml Tue Nov 12 11:08:53 2019
@@ -19,9 +19,9 @@
-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
- <artifactId>fulcrum-parent</artifactId>
- <groupId>org.apache.fulcrum</groupId>
- <version>1</version>
+ <artifactId>turbine-parent</artifactId>
+ <groupId>org.apache.turbine</groupId>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/upload/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/upload/pom.xml?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/upload/pom.xml (original)
+++ turbine/fulcrum/trunk/upload/pom.xml Tue Nov 12 11:08:53 2019
@@ -101,7 +101,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
+ <version>1.4</version>
</dependency>
<!-- testing dependencies -->
Modified: turbine/fulcrum/trunk/xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/pom.xml?rev=1869691&r1=1869690&r2=1869691&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xmlrpc/pom.xml (original)
+++ turbine/fulcrum/trunk/xmlrpc/pom.xml Tue Nov 12 11:08:53 2019
@@ -92,7 +92,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.11</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>xmlrpc</groupId>