Author: gk
Date: Mon Jan 3 14:32:34 2022
New Revision: 1896642
URL: http://svn.apache.org/viewvc?rev=1896642&view=rev
Log:
- parent/root:
* Updated dependencies: log4j2 to 2.17.1, junit.jupiter to 5.6.2, junit
launcher to 1.8.2, junit to 4.13.2, mockito-core to 4.2.0
* Moved Derby management from test module
* Owasp in mode aggregate (may remove it from modules)
- Torque-maven-plugin:
* Updated dependencies: maven-plugin-plugin to 3.6.2, maven to 3.8.4
* Fix Owasp false positive warning by exluding maven guava.
- Torque-site:
* Updated dependencies: maven-project-info-reports-plugin to 3.1.2
* Site building fixes, fluido-skin 1.9, README.md update.
Modified:
db/torque/trunk/README.md
db/torque/trunk/pom.xml
db/torque/trunk/src/main/assembly/bin-with-dependencies.xml
db/torque/trunk/torque-ant-tasks/pom.xml
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-maven-plugin/pom.xml
db/torque/trunk/torque-runtime/pom.xml
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-site/src/site/site.xml
db/torque/trunk/torque-templates/pom.xml
db/torque/trunk/torque-test/pom.xml
Modified: db/torque/trunk/README.md
URL:
http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Mon Jan 3 14:32:34 2022
@@ -76,12 +76,14 @@ or in **root folder** (with default data
#### Site module
-*Torque-site* is used to generate the site (add post-site to merge the
documentation of dependend modules.
+*Torque-site* is used to generate the site (add post-site to merge the
documentation of dependent modules.
You need the ant tool installed.
mvn site post-site
N.B. This has to be run from root folder, as torque-site expects existing
target/site folders for each module (torque-test is not included).
+
+The ant build tool does not (yet) include pmd/xref reports in the final site
building, although they are build for inspection in each sub module (except
test).
#### Build modules
@@ -112,7 +114,13 @@ To build all with checksums run in root
#### Deploy Artifacts and Release modules
-Find more information here: [Developer
Guide][https://db.apache.org/torque/torque-4.0/developer-info/developer-guide.html]
+Find more information here: [Developer
Guide][https://db.apache.org/torque/torque-5.0/developer-info/developer-guide.html]
+
+Check versions with Maven Versions Plugin:
+
+ - mvn versions:display-plugin-updates
+ - mvn versions:display-dependency-updates
+ - mvn versions:display-property-updates
- Requirements
@@ -128,7 +136,6 @@ You will be asked for your gpg passphras
- Release modules
-
First test the release locally until the build is successfull,
then clean again and run and perform release (from the parent root):
Modified: db/torque/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Mon Jan 3 14:32:34 2022
@@ -384,7 +384,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
<scope>test</scope>
</dependency>
@@ -426,7 +426,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
@@ -436,10 +436,134 @@
<version>1.0.8</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <version>2.8.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${torque.test.derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!--required for derby 15 / java 11:
+ dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyshared</artifactId>
+ <version>${torque.test.derby.version}</version>
+ <scope>test</scope>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${torque.test.derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <!-- pmd and jxr plugins are used only for developing - they
are not included with pmd/xref reports
+ in the final site building process using the ant build tool in
module site -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <!-- with error
https://issues.apache.org/jira/browse/MPMD-325 and workaround -->
+ <version>3.15.0</version>
+ <configuration>
+ <linkXref>true</linkXref>
+ <targetJdk>${maven.compiler.source}</targetJdk>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>9.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>6.5.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.10.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <fork>${torque.compiler.fork}</fork>
+
<compilerVersion>${torque.compiler.compilerVersion}</compilerVersion>
+ <executable>${torque.compiler.javac}</executable>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.3.1</version>
+ <configuration>
+ <doclint>none</doclint>
+ <source>1.8</source>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>javadoc</goal>
+ <goal>test-javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -496,10 +620,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
@@ -509,7 +629,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
<configuration>
<!--default setting is forkCount=1/reuseForks=true -->
<reuseForks>false</reuseForks>
@@ -526,7 +645,7 @@
<executions>
<execution>
<goals>
- <goal>check</goal>
+ <goal>aggregate</goal>
</goals>
</execution>
</executions>
@@ -539,99 +658,12 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.15.0</version>
- <configuration>
- <linkXref>true</linkXref>
- <targetJdk>${maven.compiler.source}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.15</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
- </plugin>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>5.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- <fork>${torque.compiler.fork}</fork>
-
<compilerVersion>${torque.compiler.compilerVersion}</compilerVersion>
- <executable>${torque.compiler.javac}</executable>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.1</version>
- <configuration>
- <doclint>none</doclint>
- <source>1.8</source>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>javadoc</goal>
- <goal>test-javadoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<reporting>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
<!-- to generate only in root -->
<reportSets>
<reportSet>
@@ -654,6 +686,18 @@
<skippedModules>torque-test</skippedModules>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jxr-no-fork</report>
+ <report>test-jxr-no-fork</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
@@ -721,9 +765,9 @@
<maven.compiler.target>1.8</maven.compiler.target>
<dependency.check.skip>true</dependency.check.skip>
- <junit.jupiter.version>5.6.2</junit.jupiter.version>
- <junit.launcher.version>1.6.2</junit.launcher.version>
- <log4j2.version>2.16.0</log4j2.version>
+ <junit.jupiter.version>5.8.2</junit.jupiter.version>
+ <junit.launcher.version>1.8.2</junit.launcher.version>
+ <log4j2.version>2.17.1</log4j2.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -732,7 +776,8 @@
<torque.compiler.compilerVersion>1.8</torque.compiler.compilerVersion>
<!--suppress UnresolvedMavenProperty -->
<torque.compiler.javac>${JAVA_HOME}/bin/javac</torque.compiler.javac>
-
+ <!-- derby 10.15 requires java 11 -->
+ <torque.test.derby.version>10.14.2.0</torque.test.derby.version>
<project.build.outputTimestamp>1</project.build.outputTimestamp>
Modified: db/torque/trunk/src/main/assembly/bin-with-dependencies.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/src/main/assembly/bin-with-dependencies.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/src/main/assembly/bin-with-dependencies.xml (original)
+++ db/torque/trunk/src/main/assembly/bin-with-dependencies.xml Mon Jan 3
14:32:34 2022
@@ -43,7 +43,7 @@
</fileSets>
<dependencySets>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>lib/</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
Modified: db/torque/trunk/torque-ant-tasks/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/pom.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/trunk/torque-ant-tasks/pom.xml Mon Jan 3 14:32:34 2022
@@ -38,12 +38,7 @@
</scm>
<dependencies>
- <!--dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque-generator</artifactId>
- <version>${project.version}</version>
- </dependency-->
- <!-- includes generator and runtime -->
+ <!-- includes generator and runtime -->
<dependency>
<groupId>org.apache.torque</groupId>
<artifactId>torque-templates</artifactId>
@@ -73,15 +68,23 @@
<version>3.9</version>
</dependency-->
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- <scope>test</scope>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!--dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyshared</artifactId>
+ <scope>test</scope>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
- <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: db/torque/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Mon Jan 3 14:32:34 2022
@@ -176,7 +176,6 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
- <version>2.8.3</version>
<scope>test</scope>
</dependency>
<!-- this is needed for velocity 2.0, it contains slf4j-api -->
@@ -195,9 +194,18 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.14.2.0</version>
<scope>test</scope>
</dependency>
+ <!--dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyshared</artifactId>
+ <scope>test</scope>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/pom.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Mon Jan 3 14:32:34 2022
@@ -47,6 +47,13 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.api.version}</version>
+ <!-- guava throws an owasp warning and is used in indexer-core to run
maven, but not to build this plugin -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -76,7 +83,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.11.0</version>
<scope>test</scope>
</dependency>
@@ -131,13 +137,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.6.2</version>
</plugin>
</plugins>
</reporting>
<properties>
- <maven.api.version>3.8.3</maven.api.version>
+ <maven.api.version>3.8.4</maven.api.version>
</properties>
</project>
Modified: db/torque/trunk/torque-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/pom.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/pom.xml (original)
+++ db/torque/trunk/torque-runtime/pom.xml Mon Jan 3 14:32:34 2022
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
(original)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Mon Jan 3 14:32:34 2022
@@ -837,8 +837,7 @@ public class TorqueInstance
/**
* This method registers a PeerImpl for a given class.
*
- * @param <T> the type of the OM class
- * @param <T> the type of the peerInstance class
+ * @param <T> the type of the OM class and the type of the peerInstance
class, which is of type BasePeerImpl.
* @param omClass the class of the associated OM object
* @param peerInstance PeerImpl instance
*/
Modified: db/torque/trunk/torque-site/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Mon Jan 3 14:32:34 2022
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2</version>
</plugin>
</plugins>
</reporting>
Modified: db/torque/trunk/torque-site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/site.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/site.xml (original)
+++ db/torque/trunk/torque-site/src/site/site.xml Mon Jan 3 14:32:34 2022
@@ -29,7 +29,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</skin>
<body>
Modified: db/torque/trunk/torque-templates/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/pom.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/pom.xml (original)
+++ db/torque/trunk/torque-templates/pom.xml Mon Jan 3 14:32:34 2022
@@ -59,14 +59,22 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
- <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!--dependency>
<groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- <scope>test</scope>
+ <artifactId>derbyshared</artifactId>
+ <scope>test</scope>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -126,7 +134,6 @@
<descriptors>
<descriptor>../src/main/assembly/bin-with-dependencies.xml</descriptor>
</descriptors>
- <appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<executions>
Modified: db/torque/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1896642&r1=1896641&r2=1896642&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Mon Jan 3 14:32:34 2022
@@ -50,7 +50,8 @@
<properties>
<onSqlError>abort</onSqlError>
- <torque.test.derby.version>10.15.2.0</torque.test.derby.version>
+
+ <!-- torque.test.derby.version now in parent pom as shared in other
modules -->
<torque.test.hsqldb.version>2.5.1</torque.test.hsqldb.version><!--
2.5.1 as of june 2020 -->
<torque.test.mssql.version>1.2.7</torque.test.mssql.version>
<torque.test.mysql.version>8.0.27</torque.test.mysql.version><!--
5.1.48 -->
@@ -710,12 +711,12 @@
<version>${torque.test.derby.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
<version>${torque.test.derby.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
@@ -754,11 +755,11 @@
<groupId>org.apache.derby</groupId>
<version>${torque.test.derby.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
<version>${torque.test.derby.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
@@ -812,12 +813,12 @@
<version>${torque.test.derby.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
<version>${torque.test.derby.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
