Updte to Turbine and Fulcrum Snapshots, update changes, update dependencies log4j, junit
diff --git a/NOTICE b/NOTICE
index 2342908..052a092 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Turbine Webapp Component
-Copyright 2006-2018 The Apache Software Foundation.
+Copyright 2006-2022 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index fc2e16f..20d039b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version><!-- like turbine parent -->
+ <version>27</version><!-- like turbine parent -->
</parent>
<groupId>org.apache.turbine</groupId>
- <artifactId>turbine-webapp-5.1</artifactId>
+ <artifactId>turbine-webapp-5.2</artifactId>
<version>2.0.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>Archetype - Turbine 5.1 WebApp</name>
+ <name>Archetype - Turbine 5.2 WebApp</name>
<description>This archetype sets up a web application project based on Apache Turbine 5.x and Torque 5.x</description>
<url>https://turbine.apache.org</url>
@@ -47,6 +47,7 @@
<turbine_database_url>jdbc:mysql://localhost:3306/</turbine_database_url>
<docker>false</docker>
<app_volume_local_repo>not_used</app_volume_local_repo>
+ <project.build.outputTimestamp>10</project.build.outputTimestamp>
</properties>
<build>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c5ccaff..5f8f45c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,12 +24,18 @@
</properties>
<body>
- <release version="2.0.0-SNAPSHOT" date="in Gitbox">
+ <release version="turbine-webapp-5.2-2.0.1-SNAPSHOT" date="in Gitbox">
+ </release>
+ <release version="turbine-webapp-5.1-2.0.0" date="2022-09-09">
<action type="update" dev="gk">
- integrate docker branch (optional profile docker)
+ Integrate docker branch (optional profile docker). Fixed Bugs: Docker configuration fixes, simplify mysql configuration; using mariadb image 10.8.
+ Update to Torque 5.1 and fix the XSD links in schema files to 6.5.1, javadoc to 3.3.0, update mysql connector due to CVE-2021-3712, CVE-2022-21363.
+ </action>
+ <action type="update" dev="youngho">
+ Update TurbineResources.properties and update for i18n better support, create and Update L10N_ko_KR.properties
</action>
</release>
- <release version="1.0.3" date="in Gitbox">
+ <release version="turbine-webapp-5.0-1.0.3" date="2020-12-03">
<action type="update" dev="jp">
Update to from lang to lang3
</action>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 169a89a..05b372e 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -380,7 +380,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -395,16 +395,16 @@
<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.17.1</log4j2.version>
+ <log4j2.version>2.19.0</log4j2.version>
<mysql.version>8.0.28</mysql.version>
- <fulcrum.json>2.0.1</fulcrum.json>
- <fulcrum.intake>2.0.0</fulcrum.intake>
- <fulcrum.security>2.1.0</fulcrum.security>
+ <fulcrum.json>2.0.2-SNAPSHOT</fulcrum.json>
+ <fulcrum.intake>2.0.1-SNAPSHOT</fulcrum.intake>
+ <fulcrum.security>2.1.1-SNAPSHOT</fulcrum.security>
<fulcrum.yaafi>1.0.8</fulcrum.yaafi>
<fulcrum.cache>2.0.0</fulcrum.cache>
<fulcrum.testcontainer>1.0.9</fulcrum.testcontainer>
<torque.version>5.1</torque.version>
- <turbine.core>5.1</turbine.core>
+ <turbine.core>5.2-SNAPSHOT</turbine.core>
<skipTests>true</skipTests>
<docker>false</docker>
<turbine_database_url>${turbine_database_url}</turbine_database_url>
