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 2019/07/24 09:08:30 UTC
[turbine-archetypes] 05/05: update scm to git,
update mysql-connector-java, log4j2, fix port in readme, indentation in pom
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit b5b4ce85a8e9057b998ed0493c7e9707be9f4a3f
Merge: f72cb3a a6db498
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Wed Jul 24 11:07:05 2019 +0200
update scm to git, update mysql-connector-java, log4j2, fix port in readme, indentation in pom
pom.xml | 4 +--
.../resources/archetype-resources/docs/README.txt | 4 ++-
src/main/resources/archetype-resources/pom.xml | 30 +++++++++++-----------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --cc pom.xml
index 4ec15db,12983f9..b84cc9f
--- a/pom.xml
+++ b/pom.xml
@@@ -37,12 -37,12 +37,12 @@@
<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>
+ <build>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
diff --cc src/main/resources/archetype-resources/docs/README.txt
index 8cb124a,8cb124a..9a527c2
--- a/src/main/resources/archetype-resources/docs/README.txt
+++ b/src/main/resources/archetype-resources/docs/README.txt
@@@ -124,7 -124,7 +124,9 @@@ mvn clean instal
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 --cc src/main/resources/archetype-resources/pom.xml
index 6d7f176,dfa0b59..fcf30b3
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@@ -72,17 -72,17 +72,17 @@@ under the License
</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 +200,7 @@@
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.15</version>
- <version>8.0.16</version>
++ <version>8.0.17</version>
</dependency>
</dependencies>
<!-- this is mysql specific -->
@@@ -267,7 -267,7 +267,7 @@@
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.15</version>
- <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 +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>