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 24be4f19cb6a34c001af9d0ea14fa641dca02fbc Author: Georg Kallidis <[email protected]> AuthorDate: Fri Jun 20 09:48:44 2025 +0200 Align Maven Archetype with released Turbine 7.0, update log4j to v2.25.0 and jetty-ee-10 to v12.0.22. Update archetype README and add release info in README.md; Update changes.xml. --- NOTICE | 4 ++-- README.md | 3 +++ src/changes/changes.xml | 12 +++++++++--- .../resources/archetype-resources/docs/README.md | 22 +++++++++++----------- src/main/resources/archetype-resources/pom.xml | 6 +++--- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/NOTICE b/NOTICE index 052a092..27c0e26 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ -Turbine Webapp Component -Copyright 2006-2022 The Apache Software Foundation. +Turbine Archetype Webapp Component +Copyright 2006-2025 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md index 8aa6d27..63a99cd 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,9 @@ Follow further instructions here: [ARCHETYPE-README](src/main/resources/archetyp Clone this repository and build it with maven. +### Release Versions + +As the archetype catalogue shows by default the artifactId the version is integrated in the project artifactId, while the project version is just incremented between releases. ## Built With diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 611ead2..a307d8f 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -24,12 +24,18 @@ </properties> <body> - <release version="turbine-webapp-7.0-4.0.0-SNAPSHOT" date="In GitBox"> + <release version="turbine-webapp-7.0-SNAPSHOT-4.0.0" date="In GitBox"> <action type="update" dev="gk"> - Update to Turbine 7.0 with Fulcrum modules intake, parser, security set to v4.0.0 and Torque 6.0. USing jakarta libraries and jetty-ee10-maven-plugin v.12.0.14 with dbcp2. + Update to Turbine 7.0 with Fulcrum modules intake, parser, security set to v4.0.0 and Torque 6.0. Using jakarta libraries and jetty-ee10-maven-plugin v.12.0.22 with dbcp2. + </action> + <action type="add" dev="gk" due-to="Thomas Vandahl"> + Adding default outputTimestamp (seconds for today) to be in allowed time range for maven-remote-resources-plugin. + </action> + <action type="update" dev="gk"> + Use podman-compose by default, which provides greater flexiblity than docker. </action> <action type="update" dev="gk"> - Use property connectionProperties, evaluate db property in archetype pom.xml + Use property connectionProperties, evaluate db property in archetype pom.xml; setting dynamically profile mariadb or mysql depending on selected archetype attribute 'db'. </action> </release> <release version="turbine-webapp-6.0-3.0.0" date="2024-04-23"> diff --git a/src/main/resources/archetype-resources/docs/README.md b/src/main/resources/archetype-resources/docs/README.md index 516a1fe..7b34b78 100644 --- a/src/main/resources/archetype-resources/docs/README.md +++ b/src/main/resources/archetype-resources/docs/README.md @@ -1,6 +1,6 @@ -# Quick Guide to using the new Turbine 5.x maven archetype for skeleton application generation +# Quick Guide to using the new Turbine maven archetype for skeleton application generation -Maven Archetype to generate a webapp utilizing Turbine 5.x +Maven Archetype to generate a webapp utilizing Turbine ## Getting Started @@ -16,7 +16,7 @@ You should have Java 11 or later installed. The archetype sets up a new applica ## About this archetype -Turbine Version: Turbine 6.02 Turbine-webapp-6.x +Turbine Version: Turbine x ~ Turbine-webapp-x ### Integration Test (if you checked out this [Archetype Generate Repository](https://github.com/apache/turbine-archetypes.git)) @@ -35,7 +35,7 @@ N.B.: This builds an integrationtest project in target/test-classes/projects/fir First, you should have a local database installed and configured prior to beginning the application setup below. -As we are using MySQL by default you need to create the database in MySQL (server version should be at least 5.5, because of new sql driver), e.g. with +As we are using MySQL by default you need to create the database in MySQL (server version should be at least 5.5), e.g. with ```sh mysql -u <user> -p @@ -47,15 +47,15 @@ or other tools. The database should have been started and the database user gran ### Maven archetype -Next, you can invoke the Maven archetype for turbine-webapp-5.0 from +Next, you can invoke the Maven archetype for turbine-webapp-7.0 from the command line as shown below - please update values starting with 'groupId' as appropriate. ```sh mvn archetype:generate \ -DarchetypeGroupId=org.apache.turbine \ - -DarchetypeArtifactId=turbine-webapp-5.1 \ - -DarchetypeVersion=2.0.0-SNAPSHOT \ + -DarchetypeArtifactId=turbine-webapp-7.0 \ + -DarchetypeVersion=4.0.0 \ -DgroupId=com.mycompany.webapp \ -DartifactId=myhelloworld \ -Dversion=1.0 \ @@ -113,9 +113,9 @@ This requires you provide a local catalog in $HOME\.m2\archetype-catalog.xml, e. <archetype-catalog ...> <archetype> <groupId>org.apache.turbine</groupId> - <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> + <artifactId>turbine-webapp-7.0</artifactId> + <version>4.0.0-SNAPSHOT</version> + <description>This archetype sets up a web application project based on Apache Turbine 7.x</description> </archetype> </archetypes> </archetype-catalog> @@ -143,7 +143,7 @@ mvn integration-test This executes the SQL code to create the application schema defined in src/main/torque-schema. You should now check the database tables and if some data is missing -insert the sample data file in sample-mysql-data (Torque 4.0 has disabled the datasql task). +insert the sample data file in sample-mysql-data (since Torque 4.0 the datasql task is disabled). ```sh mvn clean install diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index da95058..5d049b0 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -278,7 +278,7 @@ under the License. <plugin> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-maven-plugin</artifactId> - <version>12.0.14</version> + <version>12.0.22</version> <configuration> <!-- https://www.eclipse.org/jetty/documentation/jetty-9/index.html#jars-scanned-for-annotations --> <scanIntervalSeconds>10</scanIntervalSeconds> @@ -423,7 +423,7 @@ under the License. <maven.compile.target>17</maven.compile.target> <maven.surefire.version>3.2.5</maven.surefire.version> <project.build.sourceEncoding>utf-8</project.build.sourceEncoding> - <log4j2.version>2.24.1</log4j2.version> + <log4j2.version>2.25.0</log4j2.version> <mysql.version>8.0.33</mysql.version> <mariadb.version>3.4.1</mariadb.version><!-- v3 requries java 11 and adapter name mariab instead of mysql --> <driverClassName>${turbine_database_driver}</driverClassName> @@ -435,7 +435,7 @@ under the License. <fulcrum.cache>2.0.1</fulcrum.cache> <fulcrum.testcontainer>2.0.1</fulcrum.testcontainer> <torque.version>6.0</torque.version> <!-- stable version is 6.0, 7.0-SNAPSHOT next --> - <turbine.core>7.0-SNAPSHOT</turbine.core> + <turbine.core>7.0</turbine.core> <skipTests>true</skipTests> <docker>false</docker> <turbine_database_url>${turbine_database_url}</turbine_database_url>
