update version, and use in archetype torque 4.1-SNAPSHOT (and Fulcrum snapshots), skip sql plugin db create/data create in docker profile
diff --git a/pom.xml b/pom.xml
index 754fa62..6a6a310 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,12 +26,12 @@
<version>20</version><!-- like turbine parent -->
</parent>
<groupId>org.apache.turbine</groupId>
- <artifactId>turbine-webapp-5.0</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>turbine-webapp-5.1-docker</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>Archetype - Turbine 5.0 WebApp</name>
- <description>This archetype sets up a web application project based on Apache Turbine 5.0</description>
+ <description>This archetype sets up a web application project based on Apache Turbine 5.1 and torque 4.1 with docker compose</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 eceb065..1468cd3 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -407,13 +407,13 @@
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<log4j2.version>2.12.0</log4j2.version>
<mysql.version>8.0.17</mysql.version>
- <torque.version>4.0</torque.version>
- <fulcrum.json>2.0.0</fulcrum.json>
- <fulcrum.intake>2.0.0</fulcrum.intake>
- <fulcrum.security>1.1.3</fulcrum.security>
<fulcrum.yaafi>1.0.8</fulcrum.yaafi>
- <fulcrum.testcontainer>1.0.8</fulcrum.testcontainer>
- <turbine.core>5.0</turbine.core>
+ <fulcrum.testcontainer>1.0.9-SNAPSHOT</fulcrum.testcontainer>
+ <torque.version>4.1-SNAPSHOT</torque.version>
+ <fulcrum.json>2.0.1-SNAPSHOT</fulcrum.json>
+ <fulcrum.intake>2.0.1-SNAPSHOT</fulcrum.intake>
+ <fulcrum.security>2.0.0-SNAPSHOT</fulcrum.security>
+ <turbine.core>5.1-SNAPSHOT</turbine.core>
<skipTests>true</skipTests>
</properties>
@@ -457,6 +457,28 @@
<activation>
<activeByDefault>${docker}</activeByDefault>
</activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-db</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>create-data</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<properties>
<turbine_database_url>jdbc:mysql://db:3306/</turbine_database_url>
<!-- to provide e.g. local snapshot builds -->
