Author: gk
Date: Wed Apr 2 12:16:13 2025
New Revision: 1924743
URL: http://svn.apache.org/viewvc?rev=1924743&view=rev
Log:
Add Apache license header to doap file to avoid rat error.
Update plugins surefire,spotbugs,jxr, pmd, org.apache.maven.plugin-tools
Revert site plugin to v3.21.0 version.
Set changes plugin to 3.0.0-M2 (due to this set issue url to https to avoid
redirect):
- Reactivate build fixes (still some errors somewhere, which get resolved then
again)
- Rename changes-report to changes.html in build.xml, rename from jira-report
to jira-changes in configuration and site.xml.
- Remove changes report in torque site, which is deprecated sincd Torque 3.3
- jira-changes report filter: Add Torque 7.0 version to fixVersionIds list.
In Test module set systemPropertyVariables combine.children to merge from
depreacred override.
Modified:
db/torque/trunk/README.md
db/torque/trunk/doap_Torque.rdf
db/torque/trunk/pom.xml
db/torque/trunk/torque-maven-plugin/pom.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-test/pom.xml
Modified: db/torque/trunk/README.md
URL:
http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1924743&r1=1924742&r2=1924743&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Wed Apr 2 12:16:13 2025
@@ -108,6 +108,9 @@ or (without clean)
mvn package -Papache-release,derbyEmbedded-jenkins,beans,managers,owasp
-rf :torque-site
+or
+ mvn site post-site -rf :torque-site
+
again.
Modified: db/torque/trunk/doap_Torque.rdf
URL:
http://svn.apache.org/viewvc/db/torque/trunk/doap_Torque.rdf?rev=1924743&r1=1924742&r2=1924743&view=diff
==============================================================================
--- db/torque/trunk/doap_Torque.rdf (original)
+++ db/torque/trunk/doap_Torque.rdf Wed Apr 2 12:16:13 2025
@@ -6,12 +6,20 @@
xmlns:asfext="http://projects.apache.org/ns/asfext#";
xmlns:foaf="http://xmlns.com/foaf/0.1/";>
<!--
- =======================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- Copyright (c) 2006 The Apache Software Foundation.
- All rights reserved.
+ http://www.apache.org/licenses/LICENSE-2.0
- =======================================================================
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<Project rdf:about="https://db.apache.org/torque/";>
<created>2006-03-27</created>
Modified: db/torque/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1924743&r1=1924742&r2=1924743&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Wed Apr 2 12:16:13 2025
@@ -46,8 +46,8 @@
</modules>
<issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/TORQUE</url>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/TORQUE</url>
</issueManagement>
<ciManagement>
@@ -498,7 +498,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.25.0</version>
+ <version>3.26.0</version>
<configuration>
<linkXRef>true</linkXRef>
<targetJdk>${maven.compiler.target}</targetJdk>
@@ -507,12 +507,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.8.6.4</version>
+ <version>4.9.3.0</version>
<configuration>
<excludeFilterFile>${basedir}/src/main/plugin-config/findbugs-exclude.xml</excludeFilterFile>
</configuration>
@@ -520,7 +520,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.4.1</version>
+ <version>3.5.0</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -557,7 +557,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.5.3</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
@@ -567,7 +567,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>4.0.0-M16</version> <!-- MCHANGES-423 does not
generate changes-report.xml correctly missing table element -->
+ <version>3.21.0</version> <!-- 4.0.0-M16 only for maven
4.x, MCHANGES-423 does not generate changes-report.xml correctly missing table
element -->
<executions>
<execution>
<id>inherit-parent-site</id>
@@ -580,7 +580,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.13.0</version>
+ <version>3.14.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -804,7 +804,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.12.1</version>
+ <version>3.0.0-M2</version><!-- previous was 2.12.1,
MCHANGES-423 was resolved in 3.0.0-M1 -->
<reportSets>
<reportSet>
<reports>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/pom.xml?rev=1924743&r1=1924742&r2=1924743&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Wed Apr 2 12:16:13 2025
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.12.0</version>
+ <version>3.13.1</version><!-- MPLUGIN-517 resolved in 3.13.0 -->
<!-- annotations are not used at runtime because
@Retention(value=CLASS), they are needed only to build the plugin -->
<scope>provided</scope>
</dependency>
@@ -129,7 +129,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-report-plugin</artifactId>
- <version>3.12.0</version>
+ <version>3.15.1</version>
</plugin>
</plugins>
</reporting>
Modified: db/torque/trunk/torque-site/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1924743&r1=1924742&r2=1924743&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Wed Apr 2 12:16:13 2025
@@ -61,21 +61,15 @@
<reportSets>
<reportSet>
<reports>
- <report>jira-report</report>
+ <report>jira-changes</report>
+ <!--report>changes</report--><!-- deprecated, last used in
torque 3.3, changes.xml not valid in changes 2.0.0 xsd -->
</reports>
</reportSet>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- <configuration>
- <xmlPath>src/changes/old-changes.xml</xmlPath>
- </configuration>
- </reportSet>
</reportSets>
<configuration>
- <!-- 5.1 last jira version id: 12349141, 6.0:
https://issues.apache.org/jira/projects/TORQUE/versions/12352987 -->
-
<fixVersionIds>12312102,12323291,12324114,12349141,12352987</fixVersionIds>
+ <!--xmlPath>src/changes/old-changes.xml</xmlPath--><!-- for changes
report, deprecated probably used last time in version 3.3 -->
+ <!-- 5.1 last jira version id: 12349141, 6.0: 2352987, 7.0: 12355198
-->
+ <fixVersionIds>12312102,12323291,12324114,12349141,12352987,
12355198</fixVersionIds>
<columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix
Version</columnNames>
<statusIds>Resolved,Closed</statusIds>
<sortColumnNames>Created DESC,Fix Version DESC</sortColumnNames>
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=1924743&r1=1924742&r2=1924743&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/ant/build.xml (original)
+++ db/torque/trunk/torque-site/src/ant/build.xml Wed Apr 2 12:16:13 2025
@@ -93,13 +93,13 @@
<replacevalue> </replacevalue>
</replace>
<!-- REMOVED for site plugin 4.0.0-M16, which fixes workaround for
TORQUE-367 and MPLUGIN-517 (changed) -->
- <!-- replaceregexp flags="g">
+ <replaceregexp flags="g">
<regexp pattern="(<a
id="[^"]+">)(<section>)"/>
<substitution expression="\1</a>\2"/>
<fileset dir="${basedir}/target/maven-plugin-site" includes="*.xml"/>
- </replaceregexp-->
+ </replaceregexp>
<!-- REMOVED for site plugin 4.0.0-M16, which fixes workaround for
MCHANGES-423 no table or <table><table> -->
- <!-- replaceregexp flags="sg">
+ <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"/>
@@ -116,7 +116,7 @@
<replace dir="${basedir}/target" includes="**/changes-report.xml">
<replacetoken><![CDATA[<table><table>]]></replacetoken>
<replacevalue><![CDATA[<table>]]></replacevalue>
- </replace-->
+ </replace>
</target>
<target name="merge-content">
@@ -133,7 +133,7 @@
<replace value="${runtime.taglist}"
file="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/taglist.html">
<replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
</replace>
- <loadfile property="runtime.changes"
srcFile="${basedir}/target/runtime-site-content/changes-report.xml" />
+ <loadfile property="runtime.changes"
srcFile="${basedir}/target/runtime-site-content/changes.xml" />
<replace value="${runtime.changes}"
file="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/changes-report.html">
<replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
</replace>
@@ -150,7 +150,7 @@
<replace value="${generator.taglist}"
file="${project.reporting.outputDirectory}/documentation/modules/generator/reports/taglist.html">
<replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
</replace>
- <loadfile property="generator.changes"
srcFile="${basedir}/target/generator-site-content/changes-report.xml" />
+ <loadfile property="generator.changes"
srcFile="${basedir}/target/generator-site-content/changes.xml" />
<replace value="${generator.changes}"
file="${project.reporting.outputDirectory}/documentation/modules/generator/reports/changes-report.html">
<replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
</replace>
@@ -167,7 +167,7 @@
<replace value="${templates.taglist}"
file="${project.reporting.outputDirectory}/documentation/modules/templates/reports/taglist.html">
<replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
</replace>
- <loadfile property="templates.changes"
srcFile="${basedir}/target/templates-site-content/changes-report.xml" />
+ <loadfile property="templates.changes"
srcFile="${basedir}/target/templates-site-content/changes.xml" />
<replace value="${templates.changes}"
file="${project.reporting.outputDirectory}/documentation/modules/templates/reports/changes-report.html">
<replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
</replace>
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=1924743&r1=1924742&r2=1924743&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/site.xml (original)
+++ db/torque/trunk/torque-site/src/site/site.xml Wed Apr 2 12:16:13 2025
@@ -36,7 +36,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>2.0.0-M11</version>
+ <version>2.0.0-M10</version><!-- 2.1.0 -->
</skin>
<body>
@@ -44,7 +44,7 @@
<item name="Overview" href="/index.html"/>
<item name="News and Status" href="/status.html"/>
<item name="Downloads" href="/download.html"/>
- <item name="Changes" href="/jira-report.html"/>
+ <item name="Changes" href="/jira-changes.html"/>
<item name="Wiki"
href="http://wiki.apache.org/DBTORQUE/"; target="_blank"/>
<item name="Issue tracker"
href="https://issues.apache.org/jira/projects/TORQUE/"; target="_blank"/>
<item name="Mailing lists" href="/mailing-lists.html"/>
Modified: db/torque/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1924743&r1=1924742&r2=1924743&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Wed Apr 2 12:16:13 2025
@@ -591,7 +591,7 @@
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<!-- change forkCount = 1, if remote debugging with
mvnDebug port 8000, set forkCount=0 -->
- <systemPropertyVariables combine.children="override">
+ <systemPropertyVariables combine.children="merge">
<torque.configuration.file>src/test/profile/${torque.test.profileDirectory}/Torque.properties
</torque.configuration.file>
<torque.callback>host</torque.callback>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
