commit 6b1d3b7b7d910f9e0909c523b0ca967ca4def1ff
author Georg Kallidis <gk@apache.org> Fri Mar 29 08:24:35 2019 +0100
committer Georg Kallidis <gk@apache.org> Fri Mar 29 08:24:35 2019 +0100
tree 0f414a0154dea1afbdd1b8af936216f7612aaa27
parent 5f0afbd3365841065f3cb0586a85852e4f13e846
parent 8e5db34486d7038415ddc70c7eb9712a328ca471

Merge branch 'master' of https://gitbox.apache.org/repos/asf/turbine-archetypes

pom.xml

diff --git a/pom.xml b/pom.xml
index f5a829e..4ec15db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,9 @@
   <inceptionYear>2011</inceptionYear>
 
   <scm>
-    <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>
+    <connection>scm:git:https://github.com/apache/turbine-archetypes</connection>
+    <developerConnection>scm:git:https://github.com/apache/turbine-archetypes</developerConnection>
+    <url>scm:git:https://github.com/apache/turbine-archetypes</url>
   </scm>
   
 <build>

src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties

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 b184621..d266cbd 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
@@ -25,14 +25,6 @@
 #
 # -------------------------------------------------------------------
 
-
-# -------------------------------------------------------------------
-#
-#  P I P E L I N E
-#
-# -------------------------------------------------------------------
-pipeline.default.descriptor = WEB-INF/conf/turbine-classic-pipeline.xml
-
 # -------------------------------------------------------------------
 #
 #  L O G 4 J 2 - L O G G I N G
@@ -44,6 +36,13 @@
 
 # -------------------------------------------------------------------
 #
+#  P I P E L I N E
+#
+# -------------------------------------------------------------------
+pipeline.default.descriptor = WEB-INF/conf/turbine-classic-pipeline.xml
+
+# -------------------------------------------------------------------
+#
 #  M A I L  S E R V E R
 #
 # -------------------------------------------------------------------