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 1ad9a42 Update to archetype-descriptor/1.2.0 and fix name attribute
in archetype-metadata.xml, deps update surefire minor update to 3.5.3 and
log4j2 patch update to 2.25.1, mysql connector to 8.3.0, mariabdb client to
3.5.4, update changes.xml; set in archetype pom.xml turbine_database_timezone
into maven properties and replace settings.localRepository with
app_volume_local_repo from archetype-metadata.xml
1ad9a42 is described below
commit 1ad9a42260ec1ff80e780fe5b32b06b96b414bc2
Author: Georg Kallidis <[email protected]>
AuthorDate: Wed Jul 23 11:34:42 2025 +0200
Update to archetype-descriptor/1.2.0 and fix name attribute in
archetype-metadata.xml, deps update surefire minor update to 3.5.3 and log4j2
patch update to 2.25.1, mysql connector to 8.3.0, mariabdb client to 3.5.4,
update changes.xml; set in archetype pom.xml turbine_database_timezone into
maven properties and replace settings.localRepository with
app_volume_local_repo from archetype-metadata.xml
---
pom.xml | 2 +-
src/changes/changes.xml | 3 +++
.../resources/META-INF/maven/archetype-metadata.xml | 9 ++++-----
src/main/resources/archetype-resources/pom.xml | 18 +++++++++---------
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1bcd9fe..a2aefc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
<turbine_database_url>jdbc:mysql://localhost:3306/</turbine_database_url>
<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>
+ <db>mysql</db>
</properties>
</profile>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a307d8f..a1988e9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
<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">
+ Build / pom.xml: Switch parent from apache to Turbine-parent (which
inherits from apache)
+ </action>
<action type="update" dev="gk">
Use podman-compose by default, which provides greater flexiblity than
docker.
</action>
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml
b/src/main/resources/META-INF/maven/archetype-metadata.xml
index adb7a0e..a44e445 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -17,11 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<archetype-descriptor
-
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd";
- name="turbine-6.0-webapp">
+<archetype-descriptor
+
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.2.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.2.0
https://maven.apache.org/xsd/archetype-descriptor-1.2.0.xsd";
+ name="turbine-7.0-webapp">
<requiredProperties>
<requiredProperty key="turbine_app_name">
diff --git a/src/main/resources/archetype-resources/pom.xml
b/src/main/resources/archetype-resources/pom.xml
index 5d049b0..1ab23f5 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -18,9 +18,8 @@ specific language governing permissions and limitations
under the License.
*#
#set($dollar = '$')
-#set($amp = '&')
-#set($close = ';')
#macro (var $label)${dollar}{${label}}#end
+## use velocity macro var to keep dollar variables
<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";>
@@ -162,7 +161,7 @@ under the License.
</configuration>
</execution>
<execution>
- <id>torque-sql-mysql</id><!-- ${turbine_database_adapter}
-->
+ <id>torque-sql-mysql</id><!-- turbine_database_adapter:
${turbine_database_adapter} -->
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
@@ -421,11 +420,11 @@ under the License.
<properties>
<maven.compile.source>17</maven.compile.source>
<maven.compile.target>17</maven.compile.target>
- <maven.surefire.version>3.2.5</maven.surefire.version>
+ <maven.surefire.version>3.5.3</maven.surefire.version>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
- <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 -->
+ <log4j2.version>2.25.1</log4j2.version>
+ <mysql.version>8.3.0</mysql.version>
+ <mariadb.version>3.5.4</mariadb.version><!-- v3 requries java 11 and
adapter name mariab instead of mysql -->
<driverClassName>${turbine_database_driver}</driverClassName>
<fulcrum.intake>4.0.0</fulcrum.intake>
<fulcrum.parser>4.0.0</fulcrum.parser>
@@ -489,6 +488,7 @@ under the License.
<properties>
<driverClassName>${turbine_database_driver}</driverClassName>
<turbine_database_url>${turbine_database_url}</turbine_database_url>
+
<turbine_database_timezone>${turbine_database_timezone}</turbine_database_timezone>
<connectionProperties>serverTimezone=${turbine_database_timezone}&useSSL=false&verifyServerCertificate=false&requireSSL=false</connectionProperties>
</properties>
<dependencies>
@@ -509,7 +509,7 @@ under the License.
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
<configuration> <!-- The serverTimezone parameter is
required for MySQL.You may need to remove it for other databases -->
-
<url>#var("turbine_database_url")#var("turbine_database_name")?serverTimezone=${turbine_database_timezone}&useSSL=false&verifyServerCertificate=false&requireSSL=false</url>
+
<url>#var("turbine_database_url")${turbine_database_name}?serverTimezone=${turbine_database_timezone}&useSSL=false&verifyServerCertificate=false&requireSSL=false</url>
</configuration>
<dependencies>
<dependency>
@@ -556,7 +556,7 @@ under the License.
<turbine_database_driver>${turbine_database_driver}</turbine_database_driver>
<connectionProperties><![CDATA[${connectionProperties}]]></connectionProperties>
<!-- read from #var("settings.localRepository") to provide
e.g. local snapshot builds -->
-
<app_volume_local_repo>#var("settings.localRepository")</app_volume_local_repo>
+
<app_volume_local_repo>${app_volume_local_repo}</app_volume_local_repo>
<docker>true</docker>
<db>${db}</db>
</properties>
