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
The following commit(s) were added to refs/heads/master by this push:
new c063815 Update archetypes to be in line with Java 11 requirements,
rename to turbine-webapp-6.0i, update apache parent to v29. In generated
archetype pom.xml: remove deprecated idea maven plugin goal, integrate turbine
parent pom v12 as external module (and use versions from parent), honor
relocated mysql dep artifactId and groupId, remove old jakarta.xml.bind-api
after new fulcrum intake 3.0.0 (SNAPSHOT) and fulcrum yaafi 1.0.9 (SNAPSHOT)
upgrade.
c063815 is described below
commit c063815f42734099a112aab40ae0292de040c767
Author: Georg Kallidis <[email protected]>
AuthorDate: Mon Jun 12 11:41:14 2023 +0200
Update archetypes to be in line with Java 11 requirements, rename to
turbine-webapp-6.0i, update apache parent to v29. In generated archetype
pom.xml: remove deprecated idea maven plugin goal, integrate turbine parent pom
v12 as external module (and use versions from parent), honor relocated mysql
dep artifactId and groupId, remove old jakarta.xml.bind-api after new fulcrum
intake 3.0.0 (SNAPSHOT) and fulcrum yaafi 1.0.9 (SNAPSHOT) upgrade.
Update deps archetype to 3.2.1 (patch update), resources plugin to 3.3.1,
ref java 11 in docs, use log4j2 v2.20.0, update jetty to latest 9.4. version.
---
.project | 27 ++++++++++--------
README.md | 4 +--
pom.xml | 15 +++++-----
.../archetype-resources/docs/DOCKER-README.md | 4 +--
.../resources/archetype-resources/docs/README.md | 10 +++----
src/main/resources/archetype-resources/pom.xml | 32 +++++++++++++---------
.../src/main/docker-resources/app/Dockerfile | 2 +-
.../src/main/docker-resources/db/Dockerfile | 2 +-
.../src/main/docker-resources/db/mysql/conf/my.cnf | 8 ++++++
src/test/resources/projects/first/goal.txt | 2 +-
10 files changed, 62 insertions(+), 44 deletions(-)
diff --git a/.project b/.project
index f0019d6..0f4d664 100644
--- a/.project
+++ b/.project
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>turbine-webapp-5.1</name>
- <comment>This archetype sets up a web application project based on Apache
Turbine 5.x and Torque 5.x. NO_M2ECLIPSE_SUPPORT: Project files created with
the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>turbine-webapp-5.1</name>
+ <comment>This archetype sets up a web application project based on
Apache Turbine 5.x and Torque 5.x. NO_M2ECLIPSE_SUPPORT: Project files created
with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/README.md b/README.md
index 3f43d92..a2f107a 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,11 @@ These instructions will get you a copy of the project up and
running on your loc
### Prerequisites
-* Java 8 JDK or later
+* Java 11 JDK or later (since Turbine 5.2), before Java 8.
* [MySQL](https://www.mysql.com/) - Database Server or
[Docker](https://docs.docker.com/get-docker/)
* [Maven](https://maven.apache.org/) - Dependency Management
-You should have Java 8 or later installed. The archetype sets up a new
application using MySQL as the default database store. However, you can adjust
this to use any database supported by Apache Torque 5.x. If not using Docker,
you should therefore be at least have a database instance where you have access
rights to create a new database schema and populate it with the tables the
application generates. Finally, this is a maven archetype, so of course you
should install a local version [...]
+You should have Java 11 or later installed. The archetype sets up a new
application using MySQL as the default database store. However, you can adjust
this to use any database supported by Apache Torque 5.x. If not using Docker,
you should therefore be at least have a database instance where you have access
rights to create a new database schema and populate it with the tables the
application generates. Finally, this is a maven archetype, so of course you
should install a local versio [...]
### Installing
diff --git a/pom.xml b/pom.xml
index 20d039b..6c13032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,15 +23,16 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>27</version><!-- like turbine parent -->
+ <version>29</version>
+ <!-- like turbine parent -->
</parent>
<groupId>org.apache.turbine</groupId>
- <artifactId>turbine-webapp-5.2</artifactId>
+ <artifactId>turbine-webapp-6.0</artifactId>
<version>2.0.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <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>
+ <name>Archetype - Turbine 6.0 WebApp</name>
+ <description>This archetype sets up a web application project based on
Apache Turbine 6.x and Torque 5.2.x</description>
<url>https://turbine.apache.org</url>
<inceptionYear>2011</inceptionYear>
@@ -55,7 +56,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
</extension>
</extensions>
@@ -63,7 +64,7 @@
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
<!-- skip tests in generated archetype's pom, here the
integration-test would be skipped -->
<!--configuration>
<skip>true</skip>
@@ -76,7 +77,7 @@
<!-- filtering for docker -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.3.1</version>
<executions>
<execution>
<id>copy-resources</id>
diff --git a/src/main/resources/archetype-resources/docs/DOCKER-README.md
b/src/main/resources/archetype-resources/docs/DOCKER-README.md
index e3b7683..8cb57f9 100644
--- a/src/main/resources/archetype-resources/docs/DOCKER-README.md
+++ b/src/main/resources/archetype-resources/docs/DOCKER-README.md
@@ -10,7 +10,7 @@ The build should take place outside the docker container.
It is based on one docker-compose.yml file and two Dockerfiles.
-Docker compose uses currently two customized services: **app** (maven:3-jdk-8)
and **db** (mysql:latest).
+Docker compose uses currently two customized services: **app**
(maven:3-jdk-11) and **db** (mysql:latest).
## Note
- Mysql is replaced by Mariadb.
@@ -54,7 +54,7 @@ If running from integrationtest, you find the docker files in
integrationtest/ta
docker compose build --no-cache
docker compose up --detach
-** A frst time build of the app service might take a couple of minutes. **
+** A first time build of the app service might take a couple of minutes. **
You might check the process with
diff --git a/src/main/resources/archetype-resources/docs/README.md
b/src/main/resources/archetype-resources/docs/README.md
index c982b92..c316da7 100644
--- a/src/main/resources/archetype-resources/docs/README.md
+++ b/src/main/resources/archetype-resources/docs/README.md
@@ -8,15 +8,15 @@ These instructions will get you a copy of the project up and
running on your loc
### Prerequisites
-* Java 8 JDK or later
+* Java 11 JDK or later (Turbine 5.2 and later), before Java 8
* [MySQL](https://www.mysql.com/) - Database Server or [Docker]
(https://docs.docker.com/get-docker/)
* [Maven](https://maven.apache.org/) - Dependency Management
-You should have Java 8 or later installed. The archetype sets up a new
application using MySQL as the default database store. However, you can adjust
this to use any database supported by Apache Torque 5.x. If not using Docker,
you should therefore be at least have a database instance where you have access
rights to create a new database schema and populate it with the tables the
application generates. Finally, this is a maven archetype, so of course you
should install a local version [...]
+You should have Java 11 or later installed. The archetype sets up a new
application using MySQL as the default database store. However, you can adjust
this to use any database supported by Apache Torque 5.x. If not using Docker,
you should therefore be at least have a database instance where you have access
rights to create a new database schema and populate it with the tables the
application generates. Finally, this is a maven archetype, so of course you
should install a local versio [...]
## About this archetype
-Turbine Version: Turbine 5.1 Turbine-webapp-5.x
+Turbine Version: Turbine 5.2 Turbine-webapp-5.x
### Integration Test (if you checked out this [Archetype Generate
Repository](https://github.com/apache/turbine-archetypes.git))
@@ -97,7 +97,7 @@ This requires you provide a local catalog in
$HOME\.m2\archetype-catalog.xml. Fi
<archetype-catalog ...>
<archetype>
<groupId>org.apache.turbine</groupId>
- <artifactId>turbine-webapp-5.1</artifactId>
+ <artifactId>turbine-webapp-5.2</artifactId>
<version>2.0.0-SNAPSHOT</version>
<description>This archetype sets up a web application project based on
Apache Turbine 5.x</description>
</archetype>
@@ -213,7 +213,7 @@ Be aware of settings and some smaller restrictions, which
mostly will be fixed i
- abstract classes and managers are included (because of some minor bugs in
Fulcrum Security 1.1.0, same as above)
- LogoutUser action is included as an custom example
- LoginUser action is included (to check for anonymous user, may be fixed in
future release)
-- OM (Torque Object Mapper) stub classes are included (until configurable in
schema with Torque version 2.1)
+- OM (Torque Object Mapper) stub classes are included (until configurable in
schema with Torque version 5.1)
- TurbineConfiguration returns a Commons configuration object, even if field
is not assignable (fixed in Turbine 5.x, you can then assign e.g. to String
instead, cft. SecureScreen)
- Database connection is done initially by default with JNDI. If you want to
change it, check Torque.properties and (1) for Tomcat, META-INF/context.xml or
(2) for Jetty, WEB-INF/jetty-env.xml.
diff --git a/src/main/resources/archetype-resources/pom.xml
b/src/main/resources/archetype-resources/pom.xml
index aae4475..b1531b4 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -21,6 +21,13 @@ under the License.
#macro (var $label)${dollar}{${label}}#end
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <parent>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>turbine-parent</artifactId>
+ <version>12</version>
+ <relativePath/>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>${package}</groupId>
@@ -91,7 +98,6 @@ under the License.
<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 -->
@@ -101,7 +107,6 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
<configuration>
<source>#var("maven.compile.source")</source>
<target>#var("maven.compile.target")</target>
@@ -180,7 +185,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.3.2</version>
<configuration>
<archive>
<manifestEntries>
@@ -223,8 +228,8 @@ under the License.
<!-- this is mysql specific -->
<dependencies>
<dependency>
- <artifactId>mysql-connector-java</artifactId>
- <groupId>mysql</groupId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<version>#var("mysql.version")</version>
</dependency>
</dependencies>
@@ -269,11 +274,12 @@ under the License.
</build>
<dependencies>
- <dependency>
+ <!-- in fulcrum intake:
+ dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
- </dependency>
+ </dependency-->
<!-- update with the database driver of your choice -->
<dependency>
<artifactId>mysql-connector-java</artifactId>
@@ -395,12 +401,12 @@ under the License.
<maven.compile.source>11</maven.compile.source>
<maven.compile.target>11</maven.compile.target>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
- <log4j2.version>2.19.0</log4j2.version>
- <mysql.version>8.0.28</mysql.version>
+ <log4j2.version>2.20.0</log4j2.version>
+ <mysql.version>8.0.33</mysql.version>
<fulcrum.json>2.0.2-SNAPSHOT</fulcrum.json>
- <fulcrum.intake>2.0.1-SNAPSHOT</fulcrum.intake>
+ <fulcrum.intake>3.0.0-SNAPSHOT</fulcrum.intake>
<fulcrum.security>2.1.1-SNAPSHOT</fulcrum.security>
- <fulcrum.yaafi>1.0.8</fulcrum.yaafi>
+ <fulcrum.yaafi>1.0.9-SNAPSHOT</fulcrum.yaafi>
<fulcrum.cache>2.0.0</fulcrum.cache>
<fulcrum.testcontainer>1.0.9</fulcrum.testcontainer>
<torque.version>5.1</torque.version>
@@ -420,7 +426,7 @@ under the License.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.43.v20210629</version>
+ <version>9.4.51.v20230217</version>
<configuration>
<!--
https://www.eclipse.org/jetty/documentation/jetty-9/index.html#jars-scanned-for-annotations
-->
<scanIntervalSeconds>10</scanIntervalSeconds>
@@ -439,7 +445,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git
a/src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile
b/src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile
index ba732c5..f202fe7 100644
---
a/src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile
+++
b/src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3-jdk-8
+FROM maven:3-jdk-11
# cft hub.docker.com/r/library/maven
# not used, as in docker-compose m2repo is set
diff --git
a/src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
b/src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
index 252ce0f..505c179 100644
---
a/src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
+++
b/src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
@@ -1,5 +1,5 @@
# mariadb uses docker-entrypoint
-FROM mariadb:10.8
+FROM mariadb:10.10
# That file does the DB initialization but also runs mysql daemon, by removing
the last line it will only init
#RUN ["/bin/sed", "-i", "s/exec \"$@\"/echo \"not running $@\"/",
"/usr/local/bin/docker-entrypoint.sh"]
diff --git
a/src/main/resources/archetype-resources/src/main/docker-resources/db/mysql/conf/my.cnf
b/src/main/resources/archetype-resources/src/main/docker-resources/db/mysql/conf/my.cnf
index ee4cb2c..74dc782 100644
---
a/src/main/resources/archetype-resources/src/main/docker-resources/db/mysql/conf/my.cnf
+++
b/src/main/resources/archetype-resources/src/main/docker-resources/db/mysql/conf/my.cnf
@@ -2,6 +2,11 @@
#
[mysqld]
+
+collation-server = utf8mb4_unicode_ci
+init-connect='SET NAMES utf8mb4'
+character-set-server = utf8mb4
+
tls_version=TLSv1.2,TLSv1.3
character_set_server=utf8mb4
@@ -22,6 +27,9 @@ collation_server=utf8mb4_unicode_ci
#bind-address = 0.0.0.0
[mysql]
+
+default-character-set=utf8mb4
+
tee=/mysql/log/log.out
[mysqld_safe]
diff --git a/src/test/resources/projects/first/goal.txt
b/src/test/resources/projects/first/goal.txt
index b472a75..4d16865 100644
--- a/src/test/resources/projects/first/goal.txt
+++ b/src/test/resources/projects/first/goal.txt
@@ -1 +1 @@
-eclipse:eclipse idea:idea package
\ No newline at end of file
+eclipse:eclipse package
\ No newline at end of file
