Author: gk Date: Fri Mar 31 09:35:14 2023 New Revision: 1908843 URL: http://svn.apache.org/viewvc?rev=1908843&view=rev Log: - Update deps: commons-configurations2 to 2.9, surefire to 3.0.0, dependency-check to 8.2.1, maven-ant to 3.1.0, javadoc to 3.5.0, build-helper-maven-plugin to 3.3.0, org.jacoco to 0.8.8, use compiler.release (java > 9). - Skip jacoco for Java > 12 (issue).
Modified: db/torque/trunk/README.md db/torque/trunk/pom.xml Modified: db/torque/trunk/README.md URL: http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1908843&r1=1908842&r2=1908843&view=diff ============================================================================== --- db/torque/trunk/README.md (original) +++ db/torque/trunk/README.md Fri Mar 31 09:35:14 2023 @@ -24,8 +24,10 @@ - it uses velocity / groovy templates during the code generation process. ## Requirements -- Version 5 requires Java 8. -- Build and Tests run with Java 8 and 14. Building with Java 11 may require some fixes. +- Version 5 and 5.1 requires Java 8. +- Version 5.2 requires Java 11. + +- Build and Tests run with Java 8 and 14 (v5.1) and Java 20 (v.5.2). - IDE integration Modified: db/torque/trunk/pom.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1908843&r1=1908842&r2=1908843&view=diff ============================================================================== --- db/torque/trunk/pom.xml (original) +++ db/torque/trunk/pom.xml Fri Mar 31 09:35:14 2023 @@ -342,7 +342,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> - <version>2.7</version> + <version>2.9</version> </dependency> <dependency> @@ -479,7 +479,7 @@ <version>3.15.0</version> <configuration> <linkXRef>true</linkXRef> - <targetJdk>${maven.compiler.source}</targetJdk> + <targetJdk>${maven.compiler.target}</targetJdk> </configuration> <dependencies> <dependency> @@ -542,12 +542,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0-M5</version> + <version>3.0.0</version> </plugin> <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>6.5.1</version> + <version>8.2.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -563,16 +563,17 @@ <target>${maven.compiler.target}</target> <encoding>${project.build.sourceEncoding}</encoding> <fork>${torque.compiler.fork}</fork> - <compilerVersion>${torque.compiler.compilerVersion}</compilerVersion> + <!-- compilerVersion>${torque.compiler.compilerVersion}</compilerVersion--> <executable>${torque.compiler.javac}</executable> + <maven.compiler.release>${torque.compiler.compilerVersion}</maven.compiler.release> </configuration> </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.3.1</version> + <version>3.5.0</version> <configuration> <doclint>none</doclint> - <source>11</source> + <source>${maven.compiler.source}</source> </configuration> <executions> <execution> @@ -585,12 +586,12 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>3.0.0</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.2.0</version> + <version>3.3.0</version> </plugin> </plugins> </pluginManagement> @@ -649,11 +650,14 @@ <check/> </configuration> </plugin--> + <plugin> + <!-- runs with java 17, but not 20 --> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.7</version> + <version>0.8.8</version> <configuration> + <skip>${jacoco.skip}</skip> <excludes> <exclude>*/*Test*</exclude> </excludes> @@ -810,6 +814,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> + <version>0.8.8</version> <reportSets> <reportSet> <reports> @@ -901,15 +906,13 @@ </properties> </profile> <profile> - <id>java12</id> + <id>javaAbove12</id> <activation> <jdk>[12,)</jdk> </activation> <properties> - <java.version>12</java.version> - <!--torque.compiler.fork>true</torque.compiler.fork> - <torque.compiler.compilerVersion>1.12</torque.compiler.compilerVersion> - <torque.compiler.release>8</torque.compiler.release--> + <!--java.version>12</java.version--> + <jacoco.skip>true</jacoco.skip> </properties> </profile> </profiles> --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org