This is an automated email from the ASF dual-hosted git repository.
painter 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 932bc12 Bumping version number. Update to Turbine 6.0 and Torque 5.1.
Corrected variable expansion for the database url in the jetty-env.xml. Force
the generated pom.xml to explicitly define the javac compiler option and added
property to specify the version of the surefire plugin to 3.2.5 to support
Eclipse IDE
932bc12 is described below
commit 932bc12befd2143d5ebd016de34f251fecd8c997
Author: Jeffery Painter <[email protected]>
AuthorDate: Tue Apr 23 10:33:37 2024 -0400
Bumping version number. Update to Turbine 6.0 and Torque 5.1. Corrected
variable expansion for the database url in the jetty-env.xml. Force the
generated pom.xml to explicitly define the javac compiler option and added
property to specify the version of the surefire plugin to 3.2.5 to support
Eclipse IDE
---
.project | 4 +-
pom.xml | 2 +-
src/changes/changes.xml | 7 +-
.../META-INF/maven/archetype-metadata.xml | 2 +-
src/main/resources/archetype-resources/pom.xml | 74 ++++++++++------------
.../src/main/webapp/WEB-INF/jetty-env.xml | 2 +-
6 files changed, 43 insertions(+), 48 deletions(-)
diff --git a/.project b/.project
index 0f4d664..9c0b14b 100644
--- a/.project
+++ b/.project
@@ -1,7 +1,7 @@
<?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>
+ <name>turbine-webapp-6.0</name>
+ <comment>This archetype sets up a web application project based on
Apache Turbine 6.0 and Torque 5.1. NO_M2ECLIPSE_SUPPORT: Project files created
with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
</projects>
<buildSpec>
diff --git a/pom.xml b/pom.xml
index caad5fb..a919ee2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-webapp-6.0</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>3.0.0</version>
<packaging>maven-archetype</packaging>
<name>Archetype - Turbine 6.0 WebApp</name>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5f8f45c..7c95263 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,12 @@
</properties>
<body>
- <release version="turbine-webapp-5.2-2.0.1-SNAPSHOT" date="in Gitbox">
+ <release version="turbine-webapp-6.0-SNAPSHOT" date="In GitBox">
+ </release>
+ <release version="turbine-webapp-6.0-3.0.0" date="2024-04-23">
+ <action type="update" dev="jp">
+ Update to Turbine 6.0 and Torque 5.1. Corrected variable expansion
for the database url in the jetty-env.xml. Force the generated pom.xml to
explicitly define the javac compiler option and added property to specify the
version of the surefire plugin to 3.2.5 to support Eclipse IDE.
+ </action>
</release>
<release version="turbine-webapp-5.1-2.0.0" date="2022-09-09">
<action type="update" dev="gk">
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml
b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 0158c60..9809418 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -21,7 +21,7 @@
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-5.1-webapp">
+ name="turbine-6.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 69c353d..8107ee3 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -98,6 +98,8 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <!-- if this is not specified throws an error in Eclipse IDE
-->
+ <version>${maven.surefire.version}</version>
<configuration>
<skipTests>#var("skipTests")</skipTests>
<!--default setting is forkCount=1/reuseForks=true -->
@@ -111,6 +113,8 @@ under the License.
<source>#var("maven.compile.source")</source>
<target>#var("maven.compile.target")</target>
<encoding>#var("project.build.sourceEncoding")</encoding>
+ <!-- if this is not specified throws an error in Eclipse
IDE -->
+
<executable>#var("java.home")/bin/javac</executable>
</configuration>
</plugin>
<plugin>
@@ -270,6 +274,24 @@ under the License.
</execution>
</executions>
</plugin>
+ <!-- Jetty plugin mvn jetty:run will startup the application -->
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <!-- latest version that is working -->
+ <version>9.4.51.v20230217</version>
+ <configuration>
+ <!--
https://www.eclipse.org/jetty/documentation/jetty-9/index.html#jars-scanned-for-annotations
-->
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <httpConnector>
+ <port>8081</port>
+ <idleTimeout>60000</idleTimeout>
+ </httpConnector>
+ <webApp>
+
<jettyEnvXml>${project.build.directory}/${project.build.finalName}/WEB-INF/jetty-env.xml</jettyEnvXml>
+ </webApp>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -395,19 +417,21 @@ under the License.
<properties>
<maven.compile.source>11</maven.compile.source>
<maven.compile.target>11</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>
<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.json>2.0.2-SNAPSHOT</fulcrum.json>
- <fulcrum.intake>3.0.1-SNAPSHOT</fulcrum.intake>
- <fulcrum.security>2.1.1-SNAPSHOT</fulcrum.security>
- <fulcrum.yaafi>2.0.1-SNAPSHOT</fulcrum.yaafi>
+ <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.2-SNAPSHOT</torque.version>
- <turbine.core>5.2-SNAPSHOT</turbine.core>
+ <torque.version>5.1</torque.version>
+ <turbine.core>6.0</turbine.core>
<skipTests>true</skipTests>
<docker>false</docker>
<turbine_database_url>${turbine_database_url}</turbine_database_url>
@@ -456,7 +480,7 @@ under the License.
</activation>
<properties>
<driverClassName>${turbine_database_driver}</driverClassName>
-
<turbine_database_url>jdbc:mysql://localhost:3306/</turbine_database_url>
+
<turbine_database_url>${turbine_database_url}</turbine_database_url>
</properties>
<dependencies>
<dependency>
@@ -486,41 +510,7 @@ under the License.
</plugins>
</build>
</profile>
- <profile>
- <id>jetty</id>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.51.v20230217</version>
- <configuration>
- <!--
https://www.eclipse.org/jetty/documentation/jetty-9/index.html#jars-scanned-for-annotations
-->
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <httpConnector>
- <port>8081</port>
- <idleTimeout>60000</idleTimeout>
- </httpConnector>
- <webApp>
-
<jettyEnvXml>${project.build.directory}/${project.build.finalName}/WEB-INF/jetty-env.xml</jettyEnvXml>
- </webApp>
- </configuration>
- </plugin>
- <!-- we call this profile in
docker-resources/docker-compose.yml for app,
- which should not replace /m2repo,
- we want to avoid a second parsing from inside the
container -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+
<profile>
<id>docker</id>
<activation>
diff --git
a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-env.xml
b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-env.xml
index f250732..7497f55 100644
---
a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-env.xml
+++
b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-env.xml
@@ -5,7 +5,7 @@
<Arg>
<New class="org.apache.commons.dbcp.BasicDataSource">
<Set name="driverClassName">${turbine_database_driver}</Set>
- <Set
name="url">#var('turbine_database_url')${turbine_database_name}</Set>
+ <Set
name="url">${turbine_database_url}${turbine_database_name}</Set>
<Set name="username">${turbine_database_user}</Set>
<Set name="password">${turbine_database_password}</Set>
<Set
name="connectionProperties">serverTimezone=${turbine_database_timezone};useUnicode=true;characterEncoding=utf8;useSSL=false;allowPublicKeyRetrieval=true</Set>
