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 2024/07/18 11:38:08 UTC
(turbine-archetypes) branch master updated: Name new archetpye turbine-webapp-7.0-SNAPSPOT updating apache parent to v32. In archetpye-resources/pom.xml update dep to turbine-core 7.0-SNAPSHOT with Jakarta and Java 17. Update all fulcrum libraries to current SNAPSHOTs, e.g. yaafi and testcontainer in archetype/pom.xml to 2.0.01-SNAPSHOT. USe Torque 6.0.
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 1bf64f8 Name new archetpye turbine-webapp-7.0-SNAPSPOT updating apache parent to v32. In archetpye-resources/pom.xml update dep to turbine-core 7.0-SNAPSHOT with Jakarta and Java 17. Update all fulcrum libraries to current SNAPSHOTs, e.g. yaafi and testcontainer in archetype/pom.xml to 2.0.01-SNAPSHOT. USe Torque 6.0.
1bf64f8 is described below
commit 1bf64f816a23c9f3c56c68c7419ca0b79a594af4
Author: gemkall <ge...@fu-berlin.de>
AuthorDate: Thu Jul 18 13:31:14 2024 +0200
Name new archetpye turbine-webapp-7.0-SNAPSPOT updating apache parent to v32.
In archetpye-resources/pom.xml update dep to turbine-core 7.0-SNAPSHOT with Jakarta and Java 17.
Update all fulcrum libraries to current SNAPSHOTs, e.g. yaafi and testcontainer in archetype/pom.xml to 2.0.01-SNAPSHOT.
USe Torque 6.0.
---
pom.xml | 9 +++---
src/main/resources/archetype-resources/pom.xml | 39 +++++++++++++++-----------
2 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index a4f4fca..22ac713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,16 +23,17 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>29</version>
+ <version>32</version>
+ <relativePath/>
<!-- like turbine parent -->
</parent>
<groupId>org.apache.turbine</groupId>
- <artifactId>turbine-webapp-6.0</artifactId>
+ <artifactId>turbine-webapp-7.0-SNAPSHOT</artifactId>
<version>3.0.0</version>
<packaging>maven-archetype</packaging>
- <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>
+ <name>Archetype - Turbine 7.0 WebApp</name>
+ <description>This archetype sets up a web application project based on Apache Turbine 7.x</description>
<url>https://turbine.apache.org</url>
<inceptionYear>2011</inceptionYear>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 8107ee3..6c91ea7 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -314,11 +314,16 @@ under the License.
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-runtime</artifactId>
+ <version>${torque.version}</version>
</dependency>
<dependency>
<groupId>org.apache.turbine</groupId>
@@ -415,23 +420,23 @@ under the License.
</dependencies>
<properties>
- <maven.compile.source>11</maven.compile.source>
- <maven.compile.target>11</maven.compile.target>
+ <maven.compile.source>17</maven.compile.source>
+ <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.20.0</log4j2.version>
+ <log4j2.version>2.22.0</log4j2.version>
<mysql.version>8.0.33</mysql.version>
<mariadb.version>3.2.0</mariadb.version><!-- v3 requries java 11 and adapter name mariab instead of mysql -->
<driverClassName>${turbine_database_driver}</driverClassName>
- <fulcrum.intake>3.0.0</fulcrum.intake>
- <fulcrum.parser>3.0.0</fulcrum.parser>
- <fulcrum.security>3.0.0</fulcrum.security>
- <fulcrum.yaafi>2.0.0</fulcrum.yaafi>
- <fulcrum.json>2.0.1</fulcrum.json>
- <fulcrum.cache>2.0.0</fulcrum.cache>
- <fulcrum.testcontainer>2.0.0</fulcrum.testcontainer>
- <torque.version>5.1</torque.version>
- <turbine.core>6.0</turbine.core>
+ <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.yaafi>2.0.1-SNAPSHOT</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>
+ <turbine.core>7.0-SNAPSHOT</turbine.core>
<skipTests>true</skipTests>
<docker>false</docker>
<turbine_database_url>${turbine_database_url}</turbine_database_url>