Author: gk
Date: Thu Oct 10 14:56:16 2024
New Revision: 1921236
URL: http://svn.apache.org/viewvc?rev=1921236&view=rev
Log:
- Minor version update plugins: jxr to 3.5.0, pmd to 3.25.0, compiler to
3.13.0, jdepend to 2.1.
- Major version update taglist to 3.10, site to 4.0.0-M16 and allow interitance
using attach-descriptor
- Fix site generation, use build.xml (ant regex) to fix changes-report.xml and
jdepend-report.xml until MCHANGES-423 is resolved.
- Fix scm URLs to use trunk, not inexistent tags.
- JDepend still showing Unknown constant: 18 when site is build.
Modified:
db/torque/trunk/pom.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/changes/changes.xml
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-site/src/ant/build.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/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Thu Oct 10 14:56:16 2024
@@ -315,9 +315,9 @@
</contributors>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-6.0</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-6.0</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-6.0</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencyManagement>
@@ -498,36 +498,21 @@
<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.21.2</version>
+ <version>3.25.0</version>
<configuration>
<linkXRef>true</linkXRef>
<targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>9.6</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.5.0</version>
</plugin>
<plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.8.6.4</version>
- <!--dependencies>
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs</artifactId>
- <version>4.8.6</version>
- </dependency>
- </dependencies-->
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>4.8.6.4</version>
<configuration>
<excludeFilterFile>${basedir}/src/main/plugin-config/findbugs-exclude.xml</excludeFilterFile>
</configuration>
@@ -582,12 +567,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.20.0</version>
+ <version>4.0.0-M16</version> <!-- MCHANGES-423 does not
generate changes-report.xml correctly missing table element -->
+ <executions>
+ <execution>
+ <id>inherit-parent-site</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
+ <version>3.13.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -773,12 +766,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -790,19 +783,15 @@
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
<minimumTokens>200</minimumTokens>
- <rulesets>
+ <!-- the default ruleset in
/rulesets/java/maven-pmd-plugin-default.xml -->
+ <!--rulesets>
<ruleset>/category/java/bestpractices.xml</ruleset>
<ruleset>/category/java/codestyle.xml</ruleset>
<ruleset>/category/java/errorprone.xml</ruleset>
<ruleset>/category/java/multithreading.xml</ruleset>
<ruleset>/category/java/performance.xml</ruleset>
<ruleset>/category/java/design.xml</ruleset>
- <!-- comment default rule sets: basic, imports,
unusedcode -->
- <!--ruleset>/rulesets/java/basic.xml</ruleset>
- <ruleset>/rulesets/java/finalizers.xml</ruleset>
- <ruleset>/rulesets/java/imports.xml</ruleset>
- <ruleset>/rulesets/java/unusedcode.xml</ruleset-->
- </rulesets>
+ </rulesets-->
</configuration>
</plugin>
<plugin>
@@ -881,6 +870,13 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-plugin-report-plugin</artifactId>
+ <version>3.13.0</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
Modified: db/torque/trunk/torque-ant-tasks/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/pom.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/trunk/torque-ant-tasks/pom.xml Thu Oct 10 14:56:16 2024
@@ -32,9 +32,9 @@
<name>Torque Generator Ant tasks</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-6.0/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Thu Oct 10 14:56:16 2024
@@ -32,9 +32,9 @@
<name>Torque Generator</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-6.0/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/pom.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Thu Oct 10 14:56:16 2024
@@ -32,9 +32,9 @@
<name>Torque Generator Maven 2 Plugin</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-6.0/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/pom.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/pom.xml (original)
+++ db/torque/trunk/torque-runtime/pom.xml Thu Oct 10 14:56:16 2024
@@ -32,10 +32,10 @@
<name>Torque Runtime</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk/trunk
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-6.0/trunk</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-runtime/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/changes/changes.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-runtime/src/changes/changes.xml Thu Oct 10 14:56:16
2024
@@ -17,41 +17,44 @@
specific language governing permissions and limitations
under the License.
-->
-<document>
+<document xmlns="http://maven.apache.org/changes/1.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0
http://maven.apache.org/xsd/changes-1.0.0.xsd";>
<properties>
<title>Changes</title>
</properties>
- <body> <release version="5.2-SNAPSHOT" date="in SVN">
- <action type="update" dev="tv">
- Update to JCS 3.2
- </action>
- <action type="update" dev="tv">
- Use Charset where appropriate
- </action>
- <action type="fix" dev="mwriedt" issue="TORQUE-365">
- CountHelper doesn't work, when Criteria has "setDisctint()"
- </action>
- <action type="fix" dev="gk" issue="TORQUE-363">
- Criterion "is Null" fix, Thanks for the report to Max Philipp Wriedt.
- </action>
- <action type="fix" dev="gk" issue="TORQUE-362">
- Resolve error
- </action>
- <action type="add" dev="gk" date="2023-10-13">
- Allow Duration text format in configuration, whichresolve in TORQUE-362
follow-up error
- </action>
- <action type="add" dev="gk" date="2023-09-22">
- Support for Mariadb driver (default to mysql behaviour)
- </action>
+ <body>
+ <release version="5.2-SNAPSHOT" date="in SVN">
+ <action type="update" dev="tv">
+ Update to JCS 3.2
+ </action>
+ <action type="update" dev="tv">
+ Use Charset where appropriate
+ </action>
+ <action type="fix" dev="mwriedt" issue="TORQUE-365">
+ CountHelper doesn't work, when Criteria has "setDisctint()"
+ </action>
+ <action type="fix" dev="gk" issue="TORQUE-363">
+ Criterion "is Null" fix, Thanks for the report to Max Philipp
Wriedt.
+ </action>
+ <action type="fix" dev="gk" issue="TORQUE-362">
+ Resolve error
+ </action>
+ <action type="add" dev="gk" date="2023-10-13">
+ Allow Duration text format in configuration, whichresolve in
TORQUE-362 follow-up error
+ </action>
+ <action type="add" dev="gk" date="2023-09-22">
+ Support for Mariadb driver (default to mysql behaviour)
+ </action>
</release>
<release version="5.1" date="2022-01-05">
- <action type="change" dev="painter">Adding AvgHelper which works similarly
to the CountHelper util for providing extra criteria to the Avg function
+ <action type="change" dev="painter">Adding AvgHelper which works
similarly to the CountHelper util for providing extra criteria to the Avg
function
</action>
</release>
<release version="5.0" date="2020-09-22">
- <action type="update" dev="gk">
+ <action type="update" dev="gk">
Use Commons Configuration, which allows for overriding, Update
Beanutils 1.9.4
- </action>
+ </action>
</release>
</body>
</document>
Modified: db/torque/trunk/torque-site/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Thu Oct 10 14:56:16 2024
@@ -39,9 +39,9 @@
</properties>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-6.0/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk/trunk</url>
</scm>
<distributionManagement>
@@ -86,7 +86,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.7.0</version>
</plugin>
</plugins>
</reporting>
Modified: db/torque/trunk/torque-site/src/ant/build.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/ant/build.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/ant/build.xml (original)
+++ db/torque/trunk/torque-site/src/ant/build.xml Thu Oct 10 14:56:16 2024
@@ -92,16 +92,31 @@
<replacetoken><![CDATA[ ]]></replacetoken>
<replacevalue> </replacevalue>
</replace>
- <!-- workaround for TORQUE-367 and MPLUGIN-517 -->
+ <!-- workaround for TORQUE-367 and MPLUGIN-517 (changed) -->
<replaceregexp flags="g">
- <regexp pattern="(<a
name="[^"]+">)(<section>)"/>
+ <regexp pattern="(<a
id="[^"]+">)(<section>)"/>
<substitution expression="\1</a>\2"/>
<fileset dir="${basedir}/target/maven-plugin-site" includes="*.xml"/>
</replaceregexp>
- <replace dir="${basedir}/target/maven-plugin-site" includes="*.xml">
- <replacetoken><![CDATA[</a></a>]]></replacetoken>
- <replacevalue><![CDATA[</a>]]></replacevalue>
- </replace>
+ <!-- workaround for MCHANGES-423 no table or <table><table> -->
+ <replaceregexp flags="sg">
+ <regexp pattern="(?!<table>)[\r\n]*?(<tr
class="[^"]+">[\r\n]*?<th>)"/>
+ <substitution expression="<table>\1"/>
+ <fileset dir="${basedir}/target" includes="**/jdepend-report.xml"/>
+ </replaceregexp>
+ <replaceregexp flags="sg">
+ <regexp pattern="(?!<table>)[\r\n]*?(<tr
class="[^"]+">[\r\n]*?<th>)"/>
+ <substitution expression="<table>\1"/>
+ <fileset dir="${basedir}/target" includes="**/changes-report.xml"/>
+ </replaceregexp>
+ <replace dir="${basedir}/target" includes="**/jdepend-report.xml">
+ <replacetoken><![CDATA[<table><table>]]></replacetoken>
+ <replacevalue><![CDATA[<table>]]></replacevalue>
+ </replace>
+ <replace dir="${basedir}/target" includes="**/changes-report.xml">
+ <replacetoken><![CDATA[<table><table>]]></replacetoken>
+ <replacevalue><![CDATA[<table>]]></replacevalue>
+ </replace>
</target>
<target name="merge-content">
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=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/site.xml (original)
+++ db/torque/trunk/torque-site/src/site/site.xml Thu Oct 10 14:56:16 2024
@@ -17,19 +17,26 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="Torque">
- <bannerLeft>
- <name>Apache DB Project</name>
- <src>images/db-logo-white.png</src>
- <href>http://db.apache.org/</href>
+
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";
+ name="Apache Db Torque" combine.self="merge">
+
+ <bannerLeft href="http://db.apache.org/";>
+ <image src="images/db-logo-white.png" alt="Apache Db " />
</bannerLeft>
- <bannerRight>
- <src>images/torque-logo-new.png</src>
- </bannerRight>
+
+ <bannerRight>
+ <image src="images/torque-logo-new.png" alt="Apache Torque" />
+ </bannerRight>
+
+ <publishDate format="dd MMMM yyyy" position="left" />
+ <version position="left" />
+
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.9</version>
+ <version>2.0.0-M11</version>
</skin>
<body>
@@ -187,4 +194,5 @@
<sideBarEnabled>true</sideBarEnabled>
</fluidoSkin>
</custom>
-</project>
\ No newline at end of file
+
+</site>
\ No newline at end of file
Modified: db/torque/trunk/torque-templates/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/pom.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/pom.xml (original)
+++ db/torque/trunk/torque-templates/pom.xml Thu Oct 10 14:56:16 2024
@@ -32,10 +32,10 @@
<name>Torque Templates</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk/trunk
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-6.0/trunk</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1921236&r1=1921235&r2=1921236&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Thu Oct 10 14:56:16 2024
@@ -68,10 +68,10 @@
</properties>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-6.0/trunk
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk/torque-test</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk/torque-test/
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-6.0/trunk</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk/torque-test</url>
</scm>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
