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 2022/10/20 14:39:39 UTC
[turbine-fulcrum-security] branch master updated: Update parent, and use explicit turbine.log4j2.version for org.apache.logging.log4j for update of Torque (until not updated to 5.2-SNAPSHOT
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-fulcrum-security.git
The following commit(s) were added to refs/heads/master by this push:
new a13382b Update parent, and use explicit turbine.log4j2.version for org.apache.logging.log4j for update of Torque (until not updated to 5.2-SNAPSHOT
a13382b is described below
commit a13382b78acbf856bd32d295cd8fa2d30b795fae
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Thu Oct 20 15:44:16 2022 +0200
Update parent, and use explicit turbine.log4j2.version for org.apache.logging.log4j for update of Torque (until not updated to 5.2-SNAPSHOT
---
pom.xml | 2 +-
torque/pom.xml | 31 +++++++++++++++++++++++++++----
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1149ce1..f96c78c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>11</version>
+ <version>12-SNAPSHOT</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/torque/pom.xml b/torque/pom.xml
index 8380323..d45c150 100644
--- a/torque/pom.xml
+++ b/torque/pom.xml
@@ -34,11 +34,11 @@
<properties>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<!-- Easy update of torque libs -->
- <torque.version>5.0</torque.version>
+ <torque.version>5.1</torque.version>
<torque.om>org.apache.fulcrum.security.torque.om</torque.om>
<torque.om.path>org/apache/fulcrum/security/torque/om</torque.om.path>
</properties>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.5.1</version>
+ <version>2.7.0</version>
<!--version>1.8.0.10</version-->
<scope>test</scope>
</dependency>
@@ -113,6 +113,29 @@
<artifactId>commons-dbcp2</artifactId>
<version>2.9.0</version>
</dependency>
+
+ <!-- override from torque -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ </dependency>
+
<!-- testing dependencies -->
<dependency>