Fix assignment of TurbineConfiguration to configuration2 type, update deprecated velocity params (partially), set gitbox as default in scm settings in pom.xml by default, example updates in READMEs
diff --git a/pom.xml b/pom.xml
index 6c13032..caad5fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
<inceptionYear>2011</inceptionYear>
<scm>
- <connection>scm:git:https://github.com/apache/turbine-archetypes</connection>
- <developerConnection>scm:git:ssh://git@github.com/apache/turbine-archetypes</developerConnection>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/turbine-archetypes.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/turbine-archetypes.git</developerConnection>
<url>scm:git:https://github.com/apache/turbine-archetypes</url>
<tag>HEAD</tag>
</scm>
diff --git a/src/main/resources/archetype-resources/docs/DOCKER-README.md b/src/main/resources/archetype-resources/docs/DOCKER-README.md
index 8cb57f9..f7a2566 100644
--- a/src/main/resources/archetype-resources/docs/DOCKER-README.md
+++ b/src/main/resources/archetype-resources/docs/DOCKER-README.md
@@ -203,7 +203,7 @@
Then run in target/docker-resources a docker compose run command:
- docker compose run app /bin/sh
+ docker compose run --rm app /bin/sh
#mvn test -DskipTests=false
Of course, if running inside the container, you should exit and you might have to restart the app service.
@@ -227,7 +227,7 @@
### Db Service
- docker-compose run db /bin/bash
+ docker-compose run --rm db /bin/bash
Extract data in db service
diff --git a/src/main/resources/archetype-resources/docs/README.md b/src/main/resources/archetype-resources/docs/README.md
index c316da7..b13c815 100644
--- a/src/main/resources/archetype-resources/docs/README.md
+++ b/src/main/resources/archetype-resources/docs/README.md
@@ -81,11 +81,9 @@
### Development
-You may use
+You may use (add -U to get a fresh copy)
-```sh
-mvn archetype:generate -DarchetypeCatalog=local
-```
+ mvn archetype:generate -DarchetypeCatalog=local -U
to avoid declaring the *archetype* variables.
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/screens/FluxIndex.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/screens/FluxIndex.java
index 0836b25..688e6a0 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/screens/FluxIndex.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/screens/FluxIndex.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/screens/FluxScreen.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/screens/FluxScreen.java
index bf58332..acd4022 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/screens/FluxScreen.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/screens/FluxScreen.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
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 c9f2611..907ef29 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
@@ -577,7 +577,7 @@
# Set this to true to catch Velocity Errors and display them in the log file
services.VelocityService.catch.errors = true
-services.VelocityService.input.encoding=UTF-8
+services.VelocityService.default_encoding=UTF-8
#
# Class Path Loader, Turbine jar
services.VelocityService.velocimacro.library = macros/TurbineMacros.vm,macros/applicationMacros.vm
@@ -597,10 +597,10 @@
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
+# Upgrading from Velocity 2.0.x to Velocity 2.3.x
services.VelocityService.runtime.conversion.handler = none
-services.VelocityService.space.gobbling = bc
-services.VelocityService.directive.if.emptycheck = false
+services.VelocityService.parser.space.gobbling = bc
+services.VelocityService.directive.if.empty_check = false
# -------------------------------------------------------------------
