update scm to git, update mysql-connector-java, log4j2, fix port in readme, indentation in pom
diff --git a/pom.xml b/pom.xml
index 12983f9..b84cc9f 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>https://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>
diff --git a/src/main/resources/archetype-resources/docs/README.txt b/src/main/resources/archetype-resources/docs/README.txt
index 8cb124a..9a527c2 100644
--- a/src/main/resources/archetype-resources/docs/README.txt
+++ b/src/main/resources/archetype-resources/docs/README.txt
@@ -124,7 +124,9 @@
If you get an error like "The driver has not received any packets" probably the database is not up and running or the port may be another one.
Last step on the command line is run the server by invoking
-mvn jetty:run ## Now you can launch your new Turbine application by default http://localhost:8080/app
+mvn jetty:run
+
+## Now you can launch your new Turbine application by default http://localhost:8081/app (check port in pom.xml, if needed).
### Logs
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index dfa0b59..fcf30b3 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -72,17 +72,17 @@
</testResources>
<plugins>
<!-- test will not fail in turbine 4.0.1 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M2</version>
- <configuration>
- <skipTests>#var("skipTests")</skipTests>
- <!--default setting is forkCount=1/reuseForks=true -->
- <reuseForks>false</reuseForks>
- <forkCount>1</forkCount>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <configuration>
+ <skipTests>#var("skipTests")</skipTests>
+ <!--default setting is forkCount=1/reuseForks=true -->
+ <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
@@ -200,7 +200,7 @@
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.16</version>
+ <version>8.0.17</version>
</dependency>
</dependencies>
<!-- this is mysql specific -->
@@ -267,7 +267,7 @@
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.16</version>
+ <version>8.0.17</version>
</dependency>
<!-- Allow lookup of #var("web:rootDir") in log4j2 file -->
<dependency>
@@ -407,7 +407,7 @@
<maven.compile.source>1.8</maven.compile.source>
<maven.compile.target>1.8</maven.compile.target>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
- <log4j2.version>2.11.1</log4j2.version>
+ <log4j2.version>2.12.0</log4j2.version>
<torque.version>4.0</torque.version>
<fulcrum.json>2.0.0</fulcrum.json>
<fulcrum.intake>2.0.0</fulcrum.intake>
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
#
# -------------------------------------------------------------------
