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 2025/04/23 08:01:26 UTC
(turbine-archetypes) branch master updated (7115216 -> 7427413)
This is an automated email from the ASF dual-hosted git repository.
gk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
from 7115216 Switch scm URL to gitbox
new 2c63604 Update to apache v34 and adding default outputTimestamp (seconds for today) to be in allowed time range for maven-remote-resources-plugin:3.3.0:process
new 7427413 Preparing Turbine archetype v.turbine-webapp-7.0-4.0.0 using turbine parent 14 and turbine 7.0 (SNAPSHOT); setting dynamically profile mariadb or mysql dependening on selected archetype attribute 'db'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 13 +++++++++----
pom.xml | 3 ++-
src/changes/changes.xml | 8 +++++++-
src/main/resources/archetype-resources/pom.xml | 22 ++++++++++++++--------
4 files changed, 32 insertions(+), 14 deletions(-)
(turbine-archetypes) 01/02: Update to apache v34 and adding default outputTimestamp (seconds for today) to be in allowed time range for maven-remote-resources-plugin:3.3.0:process
Posted by gk...@apache.org.
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 2c636043e51ca9c02bac792c1ba4c042f3b819e7
Author: gk <gk...@apache.org>
AuthorDate: Wed Apr 2 16:50:09 2025 +0200
Update to apache v34 and adding default outputTimestamp (seconds for today) to be in allowed time range for maven-remote-resources-plugin:3.3.0:process
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 55ae57b..9b704d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>33</version>
+ <version>34</version>
<relativePath/>
<!-- like turbine parent -->
</parent>
@@ -54,6 +54,7 @@
<turbine_database_driver>com.mysql.cj.jdbc.Driver</turbine_database_driver>
<connectionProperties>serverTimezone=${turbine_database_timezone}&useSSL=false&verifyServerCertificate=false&requireSSL=false</connectionProperties>
<db>mysql</db>
+ <project.build.outputTimestamp>1743604929</project.build.outputTimestamp>
</properties>
<build>
(turbine-archetypes) 02/02: Preparing Turbine archetype v.turbine-webapp-7.0-4.0.0 using turbine parent 14 and turbine 7.0 (SNAPSHOT); setting dynamically profile mariadb or mysql dependening on selected archetype attribute 'db'
Posted by gk...@apache.org.
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 74274139707ea57529fe3c6be2d7947f2569738e
Author: gk <gk...@apache.org>
AuthorDate: Wed Apr 23 09:59:26 2025 +0200
Preparing Turbine archetype v.turbine-webapp-7.0-4.0.0 using turbine parent 14 and turbine 7.0 (SNAPSHOT); setting dynamically profile mariadb or mysql dependening on selected archetype attribute 'db'
---
README.md | 13 +++++++++----
src/changes/changes.xml | 8 +++++++-
src/main/resources/archetype-resources/pom.xml | 22 ++++++++++++++--------
3 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 3d589b0..8aa6d27 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,23 @@
+# turbine-webapp-7.0
+
+* Maven Archetype to generate a webapp utilizing Turbine 7.0 and Torque 6.0 (and later Torque 7.0)
+* Java 17 JDK or later since Turbine 7.0
+
# turbine-webapp-6.0
-Maven Archetype to generate a webapp utilizing Turbine 7.0 and Torque 6.0
+* Maven Archetype to generate a webapp utilizing Turbine 6.0 and Torque 5.1
+* Java 11 JDK or later (since Turbine 5.2), before Java 8
## Getting Started
These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
-### Prerequisites
+### Further Prerequisites
-* Java 11 JDK or later (since Turbine 5.2), before Java 8.
* [MySQL](https://www.mysql.com/) - Database Server or Container like [Docker](https://docs.docker.com/get-docker/) or Podman.
* [Maven](https://maven.apache.org/) - Dependency Management
-You should have Java 17 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.1. 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 [...]
+You should have a Java version as mentioned above (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.1. 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 s [...]
### Installing
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7c95263..611ead2 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,13 @@
</properties>
<body>
- <release version="turbine-webapp-6.0-SNAPSHOT" date="In GitBox">
+ <release version="turbine-webapp-7.0-4.0.0-SNAPSHOT" 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.
+ </action>
+ <action type="update" dev="gk">
+ Use property connectionProperties, evaluate db property in archetype pom.xml
+ </action>
</release>
<release version="turbine-webapp-6.0-3.0.0" date="2024-04-23">
<action type="update" dev="jp">
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 1d5f7bb..da95058 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>14</version>
<relativePath/>
</parent>
@@ -427,14 +427,14 @@ under the License.
<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>
- <fulcrum.intake>3.0.1-SNAPSHOT</fulcrum.intake>
- <fulcrum.parser>3.0.1-SNAPSHOT</fulcrum.parser>
- <fulcrum.security>3.0.1-SNAPSHOT</fulcrum.security>
+ <fulcrum.intake>4.0.0</fulcrum.intake>
+ <fulcrum.parser>4.0.0</fulcrum.parser>
+ <fulcrum.security>4.0.0</fulcrum.security>
<fulcrum.yaafi>2.0.1</fulcrum.yaafi>
- <fulcrum.json>2.0.2-SNAPSHOT</fulcrum.json>
- <fulcrum.cache>2.0.1-SNAPSHOT</fulcrum.cache>
- <fulcrum.testcontainer>2.0.1-SNAPSHOT</fulcrum.testcontainer>
- <torque.version>6.0</torque.version>
+ <fulcrum.json>2.0.1</fulcrum.json>
+ <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>
<skipTests>true</skipTests>
<docker>false</docker>
@@ -446,6 +446,9 @@ under the License.
<profiles>
<profile>
<id>mariadb</id>
+ <activation>
+ <activeByDefault>#if(${db}=="mariadb")true#{else}false#end</activeByDefault>
+ </activation>
<properties>
<driverClassName>org.mariadb.jdbc.Driver</driverClassName>
<turbine_database_url>jdbc:mariadb://localhost:3306/</turbine_database_url>
@@ -480,6 +483,9 @@ under the License.
</profile>
<profile>
<id>mysql</id>
+ <activation>
+ <activeByDefault>#if(${db}=="mysql")true#{else}false#end</activeByDefault>
+ </activation>
<properties>
<driverClassName>${turbine_database_driver}</driverClassName>
<turbine_database_url>${turbine_database_url}</turbine_database_url>