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 81a8cd0 Update to enable some of the Java9 bindings by default and
parameterize some of the versioning info
81a8cd0 is described below
commit 81a8cd0b297fdd3a4776a8f087e12d8ff7b6fa82
Author: Jeffery Painter <[email protected]>
AuthorDate: Wed Sep 11 20:37:31 2019 -0400
Update to enable some of the Java9 bindings by default and parameterize
some of the versioning info
---
src/main/resources/archetype-resources/pom.xml | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/archetype-resources/pom.xml
b/src/main/resources/archetype-resources/pom.xml
index fcf30b3..0bbd5e6 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -200,7 +200,7 @@ under the License.
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.17</version>
+ <version>#var("mysql.version")</version>
</dependency>
</dependencies>
<!-- this is mysql specific -->
@@ -267,7 +267,7 @@ under the License.
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.17</version>
+ <version>#var("mysql.version")</version>
</dependency>
<!-- Allow lookup of #var("web:rootDir") in log4j2 file -->
<dependency>
@@ -276,7 +276,6 @@ under the License.
<version>#var("log4j2.version")</version>
</dependency>
<!-- Required for Java 9 and higher -->
- <!--
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -292,8 +291,6 @@ under the License.
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
- -->
-
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
@@ -323,11 +320,10 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <!-- slf4j already non optional/required slf4j in T5.0-->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8</version>
+ <version>#var("fulcrum.yaafi")</version>
</dependency>
<!-- if using intake -->
<dependency>
@@ -398,7 +394,7 @@ under the License.
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>#var("fulcrum.testcontainer")</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -408,10 +404,13 @@ under the License.
<maven.compile.target>1.8</maven.compile.target>
<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>
<skipTests>true</skipTests>
</properties>
@@ -439,7 +438,7 @@ under the License.
<id>tomcat</id>
<build>
<defaultGoal>tomcat:run</defaultGoal>
- <finalName>#var("project.artifactId")</finalName>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
