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/03/23 14:42:38 UTC
svn commit: r1887964 [1/3] - in /turbine/fulcrum/trunk: commonsemail/
configuration/impl/ crypto/ crypto/src/test/org/apache/fulcrum/crypto/
factory/ groovy/ hsqldb/src/test/ intake/src/changes/
intake/src/java/org/apache/fulcrum/intake/model/ intake/s...
Author: gk
Date: Tue Mar 23 14:42:37 2021
New Revision: 1887964
URL: http://svn.apache.org/viewvc?rev=1887964&view=rev
Log:
- Update Fulcrum Testcontainer 1.0.9 and Turbine Parent 7
- Fix Mock Encoding in Fulcrum Update Test
- Format Yaafi Tests
- Remove JUnitPlatform in json, crypto module
Added:
turbine/fulcrum/trunk/security/dist/suppression-owasp.xml
turbine/fulcrum/trunk/security/hibernate/suppression-owasp.xml
turbine/fulcrum/trunk/security/memory/suppression-owasp.xml (with props)
turbine/fulcrum/trunk/security/torque/schema/xsd/
turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0-strict.xsd (with props)
turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0.xsd (with props)
turbine/fulcrum/trunk/security/torque/suppression-owasp.xml (with props)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/testcontainer/BaseUnit5Test.java (with props)
Removed:
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/testcontainer/BaseUnitTest.java
Modified:
turbine/fulcrum/trunk/commonsemail/ (props changed)
turbine/fulcrum/trunk/commonsemail/pom.xml
turbine/fulcrum/trunk/configuration/impl/pom.xml
turbine/fulcrum/trunk/crypto/pom.xml (contents, props changed)
turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java (contents, props changed)
turbine/fulcrum/trunk/factory/pom.xml (contents, props changed)
turbine/fulcrum/trunk/groovy/pom.xml (contents, props changed)
turbine/fulcrum/trunk/hsqldb/src/test/test.properties
turbine/fulcrum/trunk/hsqldb/src/test/test.script (contents, props changed)
turbine/fulcrum/trunk/intake/src/changes/changes.xml (contents, props changed)
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java (contents, props changed)
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java (contents, props changed)
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DateRangeValidator.java (contents, props changed)
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java (contents, props changed)
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java (contents, props changed)
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java (contents, props changed)
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/LoginFormInterface.java (contents, props changed)
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/Jackson2MapperTest.java (contents, props changed)
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 (contents, props changed)
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 (contents, props changed)
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java (contents, props changed)
turbine/fulcrum/trunk/json/pom.xml (contents, props changed)
turbine/fulcrum/trunk/localization/pom.xml
turbine/fulcrum/trunk/mimetype/pom.xml
turbine/fulcrum/trunk/parser/pom.xml
turbine/fulcrum/trunk/parser/xdocs/index.xml (contents, props changed)
turbine/fulcrum/trunk/pool/pom.xml (contents, props changed)
turbine/fulcrum/trunk/quartz/pom.xml (contents, props changed)
turbine/fulcrum/trunk/quartz/src/changes/changes.xml (contents, props changed)
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java (contents, props changed)
turbine/fulcrum/trunk/script/pom.xml
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java (contents, props changed)
turbine/fulcrum/trunk/security/pom.xml (contents, props changed)
turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml (contents, props changed)
turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml (contents, props changed)
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml (contents, props changed)
turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml (contents, props changed)
turbine/fulcrum/trunk/security/torque/src/test/Torque.properties (contents, props changed)
turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties (contents, props changed)
turbine/fulcrum/trunk/spring/pom.xml
turbine/fulcrum/trunk/spring/src/test/org/apache/fulcrum/spring/SpringIntoAvalonTest.java
turbine/fulcrum/trunk/testcontainer/pom.xml (contents, props changed)
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java (contents, props changed)
turbine/fulcrum/trunk/upload/pom.xml (contents, props changed)
turbine/fulcrum/trunk/upload/src/test/org/apache/fulcrum/upload/UploadServiceTest.java (contents, props changed)
turbine/fulcrum/trunk/xmlrpc/pom.xml (contents, props changed)
turbine/fulcrum/trunk/xmlrpc/src/test/org/apache/fulcrum/xmlrpc/XmlRpcComponentTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/pom.xml (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/util/StopWatch.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/DependentTestComponentTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/TestComponentTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/baseservice/DerivedServiceTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/cli/MainTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/framework/container/ServiceLifecycleManagerTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/framework/factory/ServiceContainerFactoryTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/interceptor/util/ArgumentToStringBuilderTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/service/AdviceServiceTest.java (contents, props changed)
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/service/ServiceManagerServiceTest.java (contents, props changed)
Propchange: turbine/fulcrum/trunk/commonsemail/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 23 14:42:37 2021
@@ -1,10 +1,10 @@
-target
-jcoverage.ser
-.externalToolBuilders
-.settings
.classpath
+.externalToolBuilders
+.idea
.project
-maven-eclipse.xml
+.settings
fulcrum-commonsemail.iml
-
+jcoverage.ser
+maven-eclipse.xml
+target
temp
Modified: turbine/fulcrum/trunk/commonsemail/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/commonsemail/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/commonsemail/pom.xml (original)
+++ turbine/fulcrum/trunk/commonsemail/pom.xml Tue Mar 23 14:42:37 2021
@@ -23,7 +23,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/configuration/impl/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/configuration/impl/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/configuration/impl/pom.xml (original)
+++ turbine/fulcrum/trunk/configuration/impl/pom.xml Tue Mar 23 14:42:37 2021
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/crypto/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/crypto/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/crypto/pom.xml (original)
+++ turbine/fulcrum/trunk/crypto/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath />
</parent>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: turbine/fulcrum/trunk/crypto/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java (original)
+++ turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java Tue Mar 23 14:42:37 2021
@@ -1,5 +1,7 @@
package org.apache.fulcrum.crypto;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,10 +27,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
/**
@@ -39,7 +37,6 @@ import static org.junit.jupiter.api.Asse
* @version $Id$
*/
@DisplayName("Crypto Service Test")
-@RunWith(JUnitPlatform.class)
public class CryptoServiceTest extends BaseUnit5Test
{
private CryptoService sc = null;
Propchange: turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: turbine/fulcrum/trunk/factory/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/factory/pom.xml (original)
+++ turbine/fulcrum/trunk/factory/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>7</version>
<relativePath />
</parent>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: turbine/fulcrum/trunk/factory/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/groovy/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/groovy/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/groovy/pom.xml (original)
+++ turbine/fulcrum/trunk/groovy/pom.xml Tue Mar 23 14:42:37 2021
@@ -22,7 +22,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<executions>
<execution>
<id>delete-temp-txt</id> <!-- Deleting temporary files -->
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.5.8</version>
+ <version>2.5.14</version>
<type>pom</type>
</dependency>
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: turbine/fulcrum/trunk/groovy/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.properties
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.properties?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/test/test.properties (original)
+++ turbine/fulcrum/trunk/hsqldb/src/test/test.properties Tue Mar 23 14:42:37 2021
@@ -1,5 +1,5 @@
-#HSQL Database Engine 2.5.0
-#Thu Jun 25 13:50:21 CEST 2020
-version=2.5.0
+#HSQL Database Engine 2.5.1
+#Tue Mar 23 14:12:47 CET 2021
+tx_timestamp=143
modified=no
-tx_timestamp=0
+version=2.5.1
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.script
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.script?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
Binary files - no diff available.
Propchange: turbine/fulcrum/trunk/hsqldb/src/test/test.script
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/intake/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/changes/changes.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/intake/src/changes/changes.xml Tue Mar 23 14:42:37 2021
@@ -25,7 +25,15 @@
</properties>
<body>
- <release version="2.0.0" date="in Subversion">
+ <release version="2.0.1" date="in Subversion">
+ <action dev="gk" type="update">
+ Update dependencies testcontainer 1.0.9 (inherits junit)
+ </action>
+ <action dev="painter" type="update">
+ Allow Java9+ build by adding dependency
+ </action>
+ </release>
+ <release version="2.0.0" date="2019-03-25">
<action dev="painter" type="update">
Update to yaafi 1.0.8, testcontainer 1.0.8
</action>
Propchange: turbine/fulcrum/trunk/intake/src/changes/changes.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java Tue Mar 23 14:42:37 2021
@@ -27,7 +27,7 @@ import org.apache.fulcrum.intake.IntakeE
* Creates Field objects.
*
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
- * @version $Id: FieldFactory.java 1200653 2011-11-11 00:05:28Z tv $
+ * @version $Id$
*/
public class FieldAdapter extends XmlAdapter<XmlField, Field<?>>
{
Propchange: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java Tue Mar 23 14:42:37 2021
@@ -25,7 +25,7 @@ import org.apache.fulcrum.intake.validat
* Interface to define the compare operation betwen two field values
*
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
- * @version $Id: DateStringValidator.java 534527 2007-05-02 16:10:59Z tv $
+ * @version $Id$
*/
public interface CompareCallback<T>
{
Propchange: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DateRangeValidator.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DateRangeValidator.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DateRangeValidator.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DateRangeValidator.java Tue Mar 23 14:42:37 2021
@@ -61,7 +61,7 @@ import org.apache.fulcrum.intake.validat
* </table>
*
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
- * @version $Id: DateStringValidator.java 534527 2007-05-02 16:10:59Z tv $
+ * @version $Id$
*/
public class DateRangeValidator
extends DateStringValidator
Propchange: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/DateRangeValidator.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java Tue Mar 23 14:42:37 2021
@@ -57,7 +57,7 @@ import org.apache.fulcrum.intake.model.G
* </table>
*
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
- * @version $Id: DateStringValidator.java 534527 2007-05-02 16:10:59Z tv $
+ * @version $Id$
*/
public class FieldReference
{
Propchange: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java Tue Mar 23 14:42:37 2021
@@ -60,7 +60,7 @@ import org.apache.fulcrum.intake.validat
* </table>
*
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
- * @version $Id: DateStringValidator.java 534527 2007-05-02 16:10:59Z tv $
+ * @version $Id$
*/
public class IntegerRangeValidator
extends IntegerValidator
Propchange: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/IntegerRangeValidator.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java (original)
+++ turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java Tue Mar 23 14:42:37 2021
@@ -51,7 +51,7 @@ import org.junit.jupiter.api.TestInfo;
* Test the validators
*
* @author <a href="tv@apache.org">Thomas Vandahl</a>
- * @version $Id: IntakeValidatonTest.java 1851410 2019-03-199 11:17:05Z painter $
+ * @version $Id$
*/
@DisplayName("Intake Validator Test")
public class IntakeValidatonTest extends BaseUnit5Test
Propchange: turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/LoginFormInterface.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/LoginFormInterface.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/LoginFormInterface.java (original)
+++ turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/LoginFormInterface.java Tue Mar 23 14:42:37 2021
@@ -23,7 +23,7 @@ package org.apache.fulcrum.intake.test;
* Test form interface for Intake
*
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
- * @version $Id: LoginForm.java 535465 2007-05-05 06:58:06Z tv $
+ * @version $Id$
*/
public interface LoginFormInterface
Propchange: turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/LoginFormInterface.java
------------------------------------------------------------------------------
svn:keywords = Id
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=1887964&r1=1887963&r2=1887964&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 Mar 23 14:42:37 2021
@@ -50,8 +50,6 @@ import org.apache.log4j.LogManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestReporter;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -72,7 +70,6 @@ import com.fasterxml.jackson.databind.se
* @author gk
* @version $Id$
*/
-@RunWith(JUnitPlatform.class)
public class DefaultServiceTest extends BaseUnit5Test {
private JsonService sc = null;
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=1887964&r1=1887963&r2=1887964&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 Mar 23 14:42:37 2021
@@ -29,8 +29,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.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
@@ -41,7 +39,6 @@ import org.junit.runner.RunWith;
* @author gk
* @version $Id$
*/
-@RunWith(JUnitPlatform.class)
public class Jackson2MapperTest extends BaseUnit5Test {
private JsonService sc = null;
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java
------------------------------------------------------------------------------
svn:keywords = 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=1887964&r1=1887963&r2=1887964&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 Mar 23 14:42:37 2021
@@ -44,8 +44,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.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
@@ -61,8 +59,6 @@ import com.fasterxml.jackson.databind.Ob
* @author gk
* @version $Id$
*/
-//@Nested
-@RunWith(JUnitPlatform.class)
public class JacksonMapperEnabledDefaultTypingTest extends BaseUnit5Test {
public static final String preDefinedOutput = "{\"type\":\"org.apache.fulcrum.json.jackson.example.TestClass\",\"container\":{\"type\":\"java.util.HashMap\",\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}";
private JsonService sc = null;
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=1887964&r1=1887963&r2=1887964&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 Mar 23 14:42:37 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.platform.runner.JUnitPlatform;
import org.junit.runner.RunWith;
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
@@ -65,7 +64,6 @@ import com.fasterxml.jackson.databind.Ob
* @author gk
* @version $Id$
*/
-@RunWith(JUnitPlatform.class)
public class JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test extends BaseUnit5Test {
private JsonService sc = null;
private final String preDefinedOutput = "{\"container\":{\"type\":\"java.util.HashMap\",\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}";
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
------------------------------------------------------------------------------
svn:keywords = Id
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=1887964&r1=1887963&r2=1887964&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 Mar 23 14:42:37 2021
@@ -46,8 +46,6 @@ import org.json.JSONObject;
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;
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
@@ -59,7 +57,6 @@ import com.fasterxml.jackson.datatype.js
* @author gk
* @version $Id$
*/
-@RunWith(JUnitPlatform.class)
public class JacksonMapperTest extends BaseUnit5Test {
private final String preDefinedOutput = "{\"container\":{\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}";
private JsonService sc = null;
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=1887964&r1=1887963&r2=1887964&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 Mar 23 14:42:37 2021
@@ -37,8 +37,6 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
@@ -48,9 +46,8 @@ import com.fasterxml.jackson.datatype.js
* Test without type setting with {@link JsonOrgModule} adapter activated.
*
* @author gk
- * @version $Id: JacksonMapperTest.java 1800753 2017-07-04 11:00:03Z gk $
+ * @version $Id$
*/
-@RunWith(JUnitPlatform.class)
public class JsonOrgJacksonMapperTest extends BaseUnit5Test {
private JsonService sc = null;
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java
------------------------------------------------------------------------------
svn:keywords = Id
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=1887964&r1=1887963&r2=1887964&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 Mar 23 14:42:37 2021
@@ -41,8 +41,6 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
import com.jayway.jsonpath.Configuration;
@@ -58,7 +56,6 @@ import com.jayway.jsonpath.spi.json.Jack
* @author gk
* @version $Id$
*/
-@RunWith(JUnitPlatform.class)
public class JsonPathJacksonTest extends BaseUnit5Test {
private JsonService sc = null;
Propchange: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/json/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Tue Mar 23 14:42:37 2021
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<!-- Log4j2 should be used by default, removed optional -->
@@ -104,17 +104,26 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
</dependency>
<!-- log4j1.2 bridge instead of log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-runner</artifactId>
+ <version>1.7.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Propchange: turbine/fulcrum/trunk/json/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/localization/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/pom.xml (original)
+++ turbine/fulcrum/trunk/localization/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>7</version>
<relativePath /><!-- ignore default value -->
</parent>
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
Modified: turbine/fulcrum/trunk/mimetype/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/pom.xml (original)
+++ turbine/fulcrum/trunk/mimetype/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/parser/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/pom.xml (original)
+++ turbine/fulcrum/trunk/parser/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/parser/xdocs/index.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/xdocs/index.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/parser/xdocs/index.xml Tue Mar 23 14:42:37 2021
@@ -98,8 +98,13 @@
<td>list</td>
<td>*</td>
<td>
- Wrapper for commons pool2 parameters (child components) <code>maxTotal</code>,
- <code>blockWhenExhausted</code>, <code>maxWaitMillis</code>, <code>testOnBorrow</code>, <code>testOnCreate</code>, <code>testOnReturn</code>,<code>maxIdle</code> and <code>minIdle</code>. The parameter values are the same as for commons.pool2, compare the defaults (upper case and underscore-separated) <a href="https://commons.apache.org/proper/commons-pool/apidocs/constant-values.html">here</a> for org.apache.commons.pool2.impl.BaseObjectPoolConfig and GenericKeyedObjectPoolConfig.
+ Wrapper for commons pool2 parameters (child components) <code>maxTotal</code>with value -1 =no limit, other plausible values 1024, 2048.
+ <code>blockWhenExhausted</code> (by default <code>true</code>), <code>maxWaitMillis</code> by default <code>0</code>, <code>testOnBorrow</code>, <code>testOnCreate</code>, <code>testOnReturn</code>,<code>maxIdle</code> and <code>minIdle</code>.
+ The parameter values are the same as for commons.pool2,
+ compare the defaults (upper case and underscore-separated)
+ <a href="
+ https://commons.apache.org/proper/commons-pool/apidocs/index.html">here </a>
+ look for org.apache.commons.pool2.impl.BaseObjectPoolConfig and BaseGenericObjectPool.
</td>
</tr>
</table>
@@ -112,8 +117,8 @@
<parameterEncoding>utf-8</parameterEncoding>
<automaticUpload>true</automaticUpload>
<pool2>
- <maxTotal>2048</maxTotal><!-- default 8 -->
- <blockWhenExhausted>true</blockWhenExhausted><!-- default is true -->
+ <maxTotal>2048</maxTotal><!-- default 8 -->
+ <blockWhenExhausted>true</blockWhenExhausted><!-- default is true -->
<maxWaitMillis>350</maxWaitMillis><!-- default is -1L -->
</pool2>
</parser>
Propchange: turbine/fulcrum/trunk/parser/xdocs/index.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: turbine/fulcrum/trunk/pool/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pool/pom.xml (original)
+++ turbine/fulcrum/trunk/pool/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: turbine/fulcrum/trunk/pool/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/quartz/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/pom.xml (original)
+++ turbine/fulcrum/trunk/quartz/pom.xml Tue Mar 23 14:42:37 2021
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: turbine/fulcrum/trunk/quartz/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/quartz/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/changes/changes.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/quartz/src/changes/changes.xml Tue Mar 23 14:42:37 2021
@@ -24,7 +24,15 @@
</properties>
<body>
- <release version="1.1.1" date="in SVN">
+ <release version="1.1.2" date="in SVN">
+ <action dev="gk" type="update">
+ security updates: Quartz-Jobs to 2.3.2 , quartz to 2.3.2 (CVE-2019-13990)
+ </action>
+ <action dev="painter" type="update">
+ Allow Java9+ build by adding dependency
+ </action>
+ </release>
+ <release version="1.1.1" date="2019-02-26">
<action dev="painter" type="update">
Update unit tests to BaseUnit5Test
</action>
Propchange: turbine/fulcrum/trunk/quartz/src/changes/changes.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java (original)
+++ turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java Tue Mar 23 14:42:37 2021
@@ -31,8 +31,6 @@ import org.apache.fulcrum.quartz.test.Si
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
/**
@@ -40,7 +38,7 @@ import org.junit.runner.RunWith;
*
* @author <a href="mailto:epughNOSPAM@opensourceconnections.com">Eric Pugh </a>
*/
-@RunWith(JUnitPlatform.class)
+
public class BaseQuartzTestCase extends BaseUnit5Test
{
Propchange: turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/BaseQuartzTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Mar 23 14:42:37 2021
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: turbine/fulcrum/trunk/script/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/script/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/script/pom.xml (original)
+++ turbine/fulcrum/trunk/script/pom.xml Tue Mar 23 14:42:37 2021
@@ -68,22 +68,28 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>2.5.8</version>
+ <version>2.5.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
- <version>2.5.8</version>
+ <version>2.5.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-runner</artifactId>
+ <version>1.7.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.8</version>
Added: turbine/fulcrum/trunk/security/dist/suppression-owasp.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/dist/suppression-owasp.xml?rev=1887964&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/dist/suppression-owasp.xml (added)
+++ turbine/fulcrum/trunk/security/dist/suppression-owasp.xml Tue Mar 23 14:42:37 2021
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+</suppressions>
\ No newline at end of file
Added: turbine/fulcrum/trunk/security/hibernate/suppression-owasp.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/suppression-owasp.xml?rev=1887964&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/suppression-owasp.xml (added)
+++ turbine/fulcrum/trunk/security/hibernate/suppression-owasp.xml Tue Mar 23 14:42:37 2021
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+ <suppress>
+ <notes><![CDATA[
+ file name: hibernate-core-3.6.10.Final.jar
+ ]]></notes>
+ <packageUrl regex="true">^pkg:maven/org\.hibernate/hibernate\-core@.*$</packageUrl>
+ <vulnerabilityName>CVE-2020-25638</vulnerabilityName>
+ </suppress>
+</suppressions>
\ No newline at end of file
Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java (original)
+++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java Tue Mar 23 14:42:37 2021
@@ -51,7 +51,7 @@ import org.junit.jupiter.api.Test;
* Test that we can generate AccessControlLists from the Factory
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
- * @version $Id: AccessControlListTest.java 1791100 2017-04-12 09:48:44Z gk $
+ * @version $Id$
*/
public class TurbineAccessControlListTest extends BaseUnit5Test
{
Propchange: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: turbine/fulcrum/trunk/security/memory/suppression-owasp.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/suppression-owasp.xml?rev=1887964&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/memory/suppression-owasp.xml (added)
+++ turbine/fulcrum/trunk/security/memory/suppression-owasp.xml Tue Mar 23 14:42:37 2021
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+</suppressions>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/security/memory/suppression-owasp.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Tue Mar 23 14:42:37 2021
@@ -21,8 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>7</version>
- <relativePath />
+ <version>8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
Propchange: turbine/fulcrum/trunk/security/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml Tue Mar 23 14:42:37 2021
@@ -23,7 +23,7 @@
<!-- -->
<!-- ==================================================================== -->
<!-- @author: <a href="mailto:tv@apache.org">Thomas Vandahl</a> -->
-<!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
+<!-- @version $Id$ -->
<!-- ==================================================================== -->
<database name="fulcrum"
defaultIdMethod="none"
Propchange: turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml Tue Mar 23 14:42:37 2021
@@ -23,7 +23,7 @@
<!-- -->
<!-- ==================================================================== -->
<!-- @author: <a href="mailto:tv@apache.org">Thomas Vandahl</a> -->
-<!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
+<!-- @version $Id$ -->
<!-- ==================================================================== -->
<database
Propchange: turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml Tue Mar 23 14:42:37 2021
@@ -23,7 +23,7 @@
<!-- -->
<!-- ==================================================================== -->
<!-- @author: <a href="mailto:tv@apache.org">Thomas Vandahl</a> -->
-<!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
+<!-- @version $Id$ -->
<!-- ==================================================================== -->
<database name="fulcrum"
Propchange: turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml?rev=1887964&r1=1887963&r2=1887964&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml Tue Mar 23 14:42:37 2021
@@ -26,7 +26,7 @@
<!-- ID_TABLE table used by the id broker mechanism in Torque. -->
<!-- ==================================================================== -->
<!-- @author: <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a> -->
-<!-- @version $Id: id-table-schema.xml,v 1.2 2005/09/23 12:19:52 tvan Exp $ -->
+<!-- @version $Id$ -->
<!-- ==================================================================== -->
<database name="fulcrum"
Propchange: turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0-strict.xsd
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0-strict.xsd?rev=1887964&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0-strict.xsd (added)
+++ turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0-strict.xsd Tue Mar 23 14:42:37 2021
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ 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.
+-->
+<!--
+ Torque XML database schema DTD
+ $Id$
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://db.apache.org/torque/5.0/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
+ elementFormDefault="qualified"
+ version="5.0">
+
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The XML schema used by version 5.0 and greater of the Apache Software
+Foundation Torque project(
+<a href="http://db.apache.org/torque">http://db.apache.org/torque</a> )
+to model SQL database information.
+This model restricts the available characters in java names and sql names
+as compared to the standard database.xsd
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:redefine schemaLocation="http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-0.xsd">
+ <xs:simpleType name="javaNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Java identifiers, e.g. [A-Za-z_$]A-Za-z_$0-9]*
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="javaNameType">
+ <xs:pattern value="[A-Za-z_$][A-Za-z_$0-9]*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="javaQualifiedNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Java fully qualified names (e.g. x.y.x)
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="javaQualifiedNameType">
+ <xs:pattern
+ value="([A-Za-z_$][A-Za-z_$0-9]*[.])*[A-Za-z_$][A-Za-z_$0-9]*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="sqlNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ SQL Standard non-delimited identifiers.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="sqlNameType">
+ <xs:pattern value="[A-Za-z$#][A-Za-z_$#0-9]*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="sqlQualifiedNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ SQL Standard non-delimited identifiers.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="sqlQualifiedNameType">
+ <xs:pattern value="[A-Za-z$#][A-Za-z_$#0-9]*(\.[A-Za-z$#][A-Za-z_$#0-9]*)?" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:redefine>
+
+</xs:schema>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/security/torque/schema/xsd/database-5-0-strict.xsd
------------------------------------------------------------------------------
svn:keywords = Id