This is an automated email from the ASF dual-hosted git repository. painter pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
The following commit(s) were added to refs/heads/master by this push: new fa48492 Fix versioning and references to webapp 5 fa48492 is described below commit fa48492514fd707c52bfdaaee1be56f676472867 Author: jlpainter <jeff.pain...@gmail.com> AuthorDate: Wed Oct 31 12:21:13 2018 -0400 Fix versioning and references to webapp 5 --- pom.xml | 10 +++++----- src/changes/changes.xml | 11 +++++++++++ src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- .../src/main/webapp/WEB-INF/conf/TurbineResources.properties | 2 +- .../conf/torque/turbine/CompleteTurbineResources.properties | 10 +++++++++- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index ed7932b..14f9912 100644 --- a/pom.xml +++ b/pom.xml @@ -27,19 +27,19 @@ </parent> <groupId>org.apache.turbine</groupId> <artifactId>turbine-webapp-5.0</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.3-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>Archetype - Turbine 5.0 WebApp</name> - <description>This archetype sets up a web application project based on Apache Turbine 4.0</description> + <description>This archetype sets up a web application project based on Apache Turbine 5.0</description> <url>http://turbine.apache.org</url> <inceptionYear>2011</inceptionYear> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</developerConnection> - <url>http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</developerConnection> + <url>http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</url> </scm> <build> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index daeae8a..70d544e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -24,6 +24,17 @@ </properties> <body> + <release version="1.0.3" date="in Gitbox"> + <action type="update" dev="jp"> + Update to from lang to lang3 + </action> + <action type="update" dev="jp"> + Update mysql driver required adding server time zone parameter in new app properties + </action> + <action type="update" dev="jp"> + Update to Turbine 5.0 + </action> + </release> <release version="1.0.2" date="in Subversion"> <action type="update" dev="gk" due-to="Jeffery Painter"> Added security test to show Turbine Fulcrum Torque consistency diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index 5679f93..e7e0478 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -21,7 +21,7 @@ xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" - name="turbine-4.0-webapp"> + name="turbine-5.0-webapp"> <requiredProperties> <requiredProperty key="turbine_app_name"> diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties index b4a2716..387b732 100644 --- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties +++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties @@ -661,4 +661,4 @@ services.AvalonComponentService.containerConfiguration = /WEB-INF/conf/container # ------------------------------------------------------------------- # Required to enable the flux library -include=flux.properties \ No newline at end of file +include=flux.properties diff --git a/src/main/resources/archetype-resources/src/test/conf/torque/turbine/CompleteTurbineResources.properties b/src/main/resources/archetype-resources/src/test/conf/torque/turbine/CompleteTurbineResources.properties index d5de6fc..4c213d3 100644 --- a/src/main/resources/archetype-resources/src/test/conf/torque/turbine/CompleteTurbineResources.properties +++ b/src/main/resources/archetype-resources/src/test/conf/torque/turbine/CompleteTurbineResources.properties @@ -521,7 +521,6 @@ tool.om.factory=org.apache.turbine.om.MockRetrieverFactory # # ------------------------------------------------------------------- - services.VelocityService.earlyInit = true services.VelocityService.template.extension = vm @@ -538,6 +537,15 @@ services.VelocityService.file.resource.loader.path = src/templates/test services.VelocityService.file.resource.loader.cache = false services.VelocityService.file.resource.loader.modificationCheckInterval = 2 +services.VelocityService.resource.loader = classpath +services.VelocityService.classpath.resource.loader.description = Velocity Classpath Resource Loader +services.VelocityService.classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader + +# Upgrading from Velocity 1.7.x to Velocity 2.0.x +services.VelocityService.runtime.conversion.handler = none +services.VelocityService.space.gobbling = bc +services.VelocityService.directive.if.emptycheck = false + # ------------------------------------------------------------------- # # J S P S E R V I C E