Author: gk
Date: Wed Jul 31 12:09:21 2024
New Revision: 1919601
URL: http://svn.apache.org/viewvc?rev=1919601&view=rev
Log:
Dependencies:
- update minor version: commons-configuration2 to 2.11.0, commons-lang3 to
3.15.0, org.eclipse.jgit to 6.10.0.202406032230-r, plugin spotbugs 4.8.6
- Update patch number: commons-jcs3-core to 3.2.1
- cleanup groovy-all depoendency in generator to include the groovy packages
required and update to 3.0.22.
Configuration:
- update to dbcp2 adapter in default Torque.properties in Torque runtime
Modified:
db/torque/trunk/README.md
db/torque/trunk/pom.xml
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-runtime/src/conf/Torque.properties
Modified: db/torque/trunk/README.md
URL:
http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1919601&r1=1919600&r2=1919601&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Wed Jul 31 12:09:21 2024
@@ -24,8 +24,9 @@
- it uses velocity / groovy templates during the code generation process.
## Requirements
-- Version 5 and 5.1 requires Java 8.
- Version 6 requires Java 11.
+- Version 5 and 5.1 requires Java 8.
+- Torque 4.0 requires JDK 1.6 or higher
- Build and Tests run with Java 8 and 14 (v5.1) and Java 20 (v.6.0).
@@ -108,7 +109,6 @@ or (without clean)
again.
-Torque 4.0 requires JDK 1.6 or higher,
#### Build modules
@@ -123,8 +123,10 @@ To build all with checksums run in root
Profile apache-release activates torque-test profile. We need at least one
"database" profile (see below) to replace in database replacements
in generate sources, e.g. setting torque.driver, in the example it is
derbyEmbedded-jenkins.
Profiles beans and managers are needed to get the beans for the Bean*Tests
(test-exclude is not working in compile plugin).
+
+#### Security Check
-To check seucrity issues run profile owasp (sets -Ddependency.check.skip=false)
+To check seucrity issues run profile owasp (or set
-Ddependency.check.skip=false)
mvn package -Papache-release,derbyEmbedded-jenkins,beans,managers,owasp
Modified: db/torque/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1919601&r1=1919600&r2=1919601&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Wed Jul 31 12:09:21 2024
@@ -342,7 +342,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <version>2.10.1</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
@@ -360,13 +360,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs3-core</artifactId>
- <version>3.2</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.14.0</version>
+ <version>3.15.0</version>
</dependency>
<dependency>
@@ -521,13 +521,13 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.8.3.1</version>
+ <version>4.8.6</version>
<dependencies>
<!-- overwrite dependency on spotbugs if you want to
specify the version of spotbugs -->
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
- <version>4.8.3</version>
+ <version>4.8.6</version>
</dependency>
</dependencies>
<configuration>
Modified: db/torque/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1919601&r1=1919600&r2=1919601&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Wed Jul 31 12:09:21 2024
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>6.7.0.202309050840-r</version>
+ <version>6.10.0.202406032230-r</version>
</dependency>
<dependency>
@@ -86,81 +86,23 @@
upgrading to at least 2.4.8 due to CVE-2015-3253 and
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-6814 -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>3.0.21</version>
- <type>pom</type>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-testng</artifactId>
- </exclusion>
- <!-- we do not use groovy sql, excluding all which is not needed -->
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-sql</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-jmx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-datetime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-docgenerator</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-nio</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-macro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-swing</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-jsr223</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-console</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-servlet</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-groovysh</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-groovydoc</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>groovy</artifactId>
+ <version>3.0.22</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ <version>3.0.22</version>
+ </dependency>
+ <!--dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-test-junit5</artifactId>
+ <version>3.0.22</version>
+ </dependency><dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-astbuilder</artifactId>
+ <version>3.0.22</version>
+ </dependency-->
<!--
java 11 has org.xml packages, which conflicts without expicit
settings: removed xerces xercesImpl
-->
Modified: db/torque/trunk/torque-runtime/src/conf/Torque.properties
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/conf/Torque.properties?rev=1919601&r1=1919600&r2=1919601&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/conf/Torque.properties (original)
+++ db/torque/trunk/torque-runtime/src/conf/Torque.properties Wed Jul 31
12:09:21 2024
@@ -142,7 +142,7 @@ torque.dsfactory.bookstore.connection.pa
# torque.dsfactory.bookstore.jndi.path=jdbc/DBbookstore
# torque.dsfactory.bookstore.jndi.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
# torque.dsfactory.bookstore.jndi.java.naming.factory.url.pkgs =
org.apache.naming
-#
torque.dsfactory.bookstore.datasource.classname=org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS
+#
torque.dsfactory.bookstore.datasource.classname=org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS
# torque.dsfactory.bookstore.datasource.driver = org.gjt.mm.mysql.Driver
# torque.dsfactory.bookstore.datasource.url =
jdbc:mysql://localhost:3306/torque
# torque.dsfactory.bookstore.datasource.user = user
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
