Author: gk Date: Thu Oct 20 13:52:33 2022 New Revision: 1904742 URL: http://svn.apache.org/viewvc?rev=1904742&view=rev Log: - set java version to 11, adapt log4j to 2.19.0, derby 10.15.2.0,d hsqldb 2.7.9 (minor updates)and mysql 8.0.28 (aatch update). - Remove in Torque.properties durationBetweenEvictionRuns which requires now a duration since dbcp 2.9.0 and commons-pool2 2.10.0
Modified: db/torque/trunk/pom.xml db/torque/trunk/torque-runtime/src/conf/Torque.properties db/torque/trunk/torque-test/pom.xml Modified: db/torque/trunk/pom.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1904742&r1=1904741&r2=1904742&view=diff ============================================================================== --- db/torque/trunk/pom.xml (original) +++ db/torque/trunk/pom.xml Thu Oct 20 13:52:33 2022 @@ -450,13 +450,13 @@ <version>${derby.version}</version> <scope>test</scope> </dependency> - <!--required for derby 15 / java 11: - dependency> + <!-- required for derby 15 / java 11 --> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derbyshared</artifactId> <version>${derby.version}</version> <scope>test</scope> - </dependency--> + </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derbytools</artifactId> @@ -572,7 +572,7 @@ <version>3.3.1</version> <configuration> <doclint>none</doclint> - <source>1.8</source> + <source>11</source> </configuration> <executions> <execution> @@ -824,23 +824,20 @@ <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> <dependency.check.skip>true</dependency.check.skip> <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> + <log4j2.version>2.19.0</log4j2.version> <torque.compiler.fork>false</torque.compiler.fork> - <torque.compiler.compilerVersion>1.8</torque.compiler.compilerVersion> + <torque.compiler.compilerVersion>11</torque.compiler.compilerVersion> <!--suppress UnresolvedMavenProperty --> <torque.compiler.javac>${JAVA_HOME}/bin/javac</torque.compiler.javac> - <!-- derby 10.15 requires java 11 --> - <derby.version>10.14.2.0</derby.version> + <!-- derby 10.15 requires java 11, 10.16 requries java 12 --> + <derby.version>10.15.2.0</derby.version> <project.build.outputTimestamp>1</project.build.outputTimestamp> @@ -898,15 +895,6 @@ </modules> </profile> <profile> - <id>java8</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <properties> - <doclint>none</doclint><!-- since javadoc v.3 this is required instead of -Xdoclint:none --> - </properties> - </profile> - <profile> <id>owasp</id> <properties> <dependency.check.skip>false</dependency.check.skip> 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=1904742&r1=1904741&r2=1904742&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/conf/Torque.properties (original) +++ db/torque/trunk/torque-runtime/src/conf/Torque.properties Thu Oct 20 13:52:33 2022 @@ -72,7 +72,9 @@ torque.defaults.pool.maxTotal = 10 # How often the pool is checked for connection which stayed in the pool # for too long. Defaults to 5 minutes (5 * 60 * 1000) # remove property if the idle object evictor should not be run -torque.defaults.pool.timeBetweenEvictionRunsMillis= 300000 +#torque.defaults.pool.torque.defaults.pool.timeBetweenEvictionRunsMillis= 300000 +# SINCE DBCP 2.9.0 replace with to Duration.parse +#torque.defaults.pool.torque.defaults.pool.durationBetweenEvictionRuns= # Lifetime of an idle connection in the pool in milliseconds. # Defaults to one hour (1000 * 60 * 60) Modified: db/torque/trunk/torque-test/pom.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1904742&r1=1904741&r2=1904742&view=diff ============================================================================== --- db/torque/trunk/torque-test/pom.xml (original) +++ db/torque/trunk/torque-test/pom.xml Thu Oct 20 13:52:33 2022 @@ -52,9 +52,9 @@ <onSqlError>abort</onSqlError> <!-- log4j2.version and derby.version now renamed 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.hsqldb.version>2.7.0</torque.test.hsqldb.version> <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 --> + <torque.test.mysql.version>8.0.28</torque.test.mysql.version><!-- 5.1.48 --> <torque.test.oracle.version>10.2.0.4.0</torque.test.oracle.version> <torque.test.postgres.jdbc.version>42.2.14</torque.test.postgres.jdbc.version><!-- 9.1-901.jdbc4, --> <torque.test.postgres.version>13.1</torque.test.postgres.version> --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org