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/02/04 16:25:15 UTC
svn commit: r1886209 - in /turbine/core/trunk:
conf/test/CompleteTurbineResources.properties
conf/test/TurbineURLMapperJSONServiceTest.properties
conf/turbine-classic-pipeline.xml pom.xml src/changes/changes.xml
Author: gk
Date: Thu Feb 4 16:25:14 2021
New Revision: 1886209
URL: http://svn.apache.org/viewvc?rev=1886209&view=rev
Log:
- update changes for release
- add jaxb xml support (was inherited from Fulcrum intake)
- remove SNAPSHOT intake and parent (no need to release before turbine core)
- update url mapper informations and add missing test file.
Added:
turbine/core/trunk/conf/test/TurbineURLMapperJSONServiceTest.properties
Modified:
turbine/core/trunk/conf/test/CompleteTurbineResources.properties
turbine/core/trunk/conf/turbine-classic-pipeline.xml
turbine/core/trunk/pom.xml
turbine/core/trunk/src/changes/changes.xml
Modified: turbine/core/trunk/conf/test/CompleteTurbineResources.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/CompleteTurbineResources.properties?rev=1886209&r1=1886208&r2=1886209&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/CompleteTurbineResources.properties (original)
+++ turbine/core/trunk/conf/test/CompleteTurbineResources.properties Thu Feb 4 16:25:14 2021
@@ -637,3 +637,21 @@ services.SessionService.earlyInit=true
#
# Default: none
# -------------------------------------------------------------------
+
+
+# -------------------------------------------------------------------
+#
+# U R L M A P P E R S E R V I C E
+#
+# to use it uncomment
+# - the valve org.apache.turbine.services.urlmapper.URLMapperValve into classic-pipelline.xml
+# - service, pull tool and read configuration
+# - configure turbine-url-mapping in xml, json or yaml
+# -------------------------------------------------------------------
+
+#services.URLMapperService.classname=org.apache.turbine.services.urlmapper.TurbineURLMapperService
+
+# new mapper in pull tooll data service
+#tool.request.mlink=org.apache.turbine.services.urlmapper.MappedTemplateLink
+
+#services.URLMapperService.configFile = conf/turbine-url-mapping.xml
Added: turbine/core/trunk/conf/test/TurbineURLMapperJSONServiceTest.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/TurbineURLMapperJSONServiceTest.properties?rev=1886209&view=auto
==============================================================================
--- turbine/core/trunk/conf/test/TurbineURLMapperJSONServiceTest.properties (added)
+++ turbine/core/trunk/conf/test/TurbineURLMapperJSONServiceTest.properties Thu Feb 4 16:25:14 2021
@@ -0,0 +1,22 @@
+# 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.
+
+# override
+services.URLMapperService.configFile = /conf/turbine-url-mapping.json
+
+include = TurbineURLMapperServiceTest.properties
+
Modified: turbine/core/trunk/conf/turbine-classic-pipeline.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/turbine-classic-pipeline.xml?rev=1886209&r1=1886208&r2=1886209&view=diff
==============================================================================
--- turbine/core/trunk/conf/turbine-classic-pipeline.xml (original)
+++ turbine/core/trunk/conf/turbine-classic-pipeline.xml Thu Feb 4 16:25:14 2021
@@ -19,6 +19,7 @@
-->
<pipeline name="default">
<valves>
+ <!--valve>org.apache.turbine.services.urlmapper.URLMapperValve</valve-->
<valve>org.apache.turbine.pipeline.DefaultSetEncodingValve</valve>
<valve>org.apache.turbine.pipeline.DetermineActionValve</valve>
<valve>org.apache.turbine.pipeline.DetermineTargetValve</valve>
Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1886209&r1=1886208&r2=1886209&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Thu Feb 4 16:25:14 2021
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>8-SNAPSHOT</version>
+ <version>7</version>
</parent>
<artifactId>turbine</artifactId>
<name>Apache Turbine</name>
@@ -1077,6 +1077,18 @@
<artifactId>velocity-engine-core</artifactId>
<version>2.1</version>
</dependency>
+ <!-- with the url mapper we need xml support -->
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.3</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
@@ -1110,10 +1122,6 @@
<version>4.13.1</version>
<scope>test</scope>
</dependency>
- <!-- do not add junit 4 support e.g. with org.junit.platform runner or launcher,
- as it is not compatible with jupiter tags, will throw
- [WARNING] Couldn't load group class 'docker' in Surefire|Failsafe plugin
- -->
</dependencies>
<profiles>
@@ -1164,9 +1172,6 @@
</plugin>
</plugins>
</build>
- <properties>
- <doclint>none</doclint><!-- since javadoc v.3 this is the required instead of -Xdoclint:none, remove if turbine parent (v6) is correct again using profile java8 -->
- </properties>
</profile>
<profile>
<id>docker-testcontainer</id>
@@ -1287,7 +1292,7 @@
<!-- maven.compiler setting in turbine parent -->
<!-- TODO: Change for release: remove development part in path "/turbine/development" -->
<turbine.site.path>turbine/development/turbine-5.1</turbine.site.path>
- <fulcrum.intake>2.0.1-SNAPSHOT</fulcrum.intake>
+ <fulcrum.intake>2.0.0</fulcrum.intake>
<fulcrum.parser>2.0.1</fulcrum.parser>
<fulcrum.security>2.0.0</fulcrum.security>
<torque.version>5.0</torque.version>
Modified: turbine/core/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/changes/changes.xml?rev=1886209&r1=1886208&r2=1886209&view=diff
==============================================================================
--- turbine/core/trunk/src/changes/changes.xml (original)
+++ turbine/core/trunk/src/changes/changes.xml Thu Feb 4 16:25:14 2021
@@ -25,6 +25,35 @@
<body>
<release version="5.1" date="in Subversion">
+ <action type="update" dev="gk">
+ Update yauaa to 5.21 ( CVE-2020-13956), junit to 4.13.1 (CVE-2020-15250)
+ </action>
+ <action type="add" dev="tv">
+ New service URL mapper implementation: render beautified URL and map parameters back when parsed.
+ </action>
+ <action type="update" dev="tv">
+ Add reasonable hashCode(), equals() and toString() methods to URIParam class
+ </action>
+ <action type="update" dev="gk">
+ Update testcontainers to 1.14.3, mysql 8.0.20,
+ use dbcp2 dsfactory, add velocity 2.1 default backwards props in test props, update dependencies: commons-codec 1.15, comonsconfiguration2 2.7, commons-lang3 3.11, commons-test 1.9, torque 5.0, docker testcontainer to 1.15.0-rc2 to be able to use junit jupiter 2.7.0
+ </action>
+ <action type="update" dev="tv">
+ Better concurrency in TurbineRundataService
+ </action>
+ <action type="update" dev="tv">
+ Replace charset strings with Charset objects where possible
+ </action>
+ <action type="add" dev="gk">
+ Add Java Docker Testcontainers with minimal impact for default build in profile docker-testcontainer.
+ </action>
+ <action type="update" dev="painter">
+ Update turbine-parent 6 and fulcrum-parser 2.0.1
+ </action>
+ <action type="update" dev="tv">
+ Add reasonable hashCode(), equals() and toString() methods to URIParam class
+ </action>
+
</release>
<release version="5.0" date="2019-05-28">
<action type="update" dev="tv">