diff --git a/.buildtools/formatSiteXml b/.buildtools/formatSiteXml new file mode 100755 index 000000000..57b248774 --- /dev/null +++ b/.buildtools/formatSiteXml @@ -0,0 +1,20 @@ +# 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 +# +# 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. +# +for siteDesc in `find . -name \site.xml` +do + xmllint --format $siteDesc > /tmp/w + mv /tmp/w $siteDesc +done diff --git a/.buildtools/generateStagingSiteInWebpageRepo b/.buildtools/generateStagingSiteInWebpageRepo index a1825d4f1..6ee7303a7 100755 --- a/.buildtools/generateStagingSiteInWebpageRepo +++ b/.buildtools/generateStagingSiteInWebpageRepo @@ -16,5 +16,5 @@ # DEVHINT: RAT-302: Do not use modern JDK due to the javadoc problem; JDK8 and 16 are okay # DEVHINT: package build is required as site target requires access to the completed jar package. ./mvnw clean package site site:stage -cp -rvf target/staging/* ../creadur-site/rat017/ -cp -rvf src/site/javadocFont/* ../creadur-site/rat017/apidocs/ +cp -rvf target/staging/* ../creadur-site/RAT-397/ +cp -rvf src/site/javadocFont/* ../creadur-site/RAT-397/apidocs/ diff --git a/apache-rat-core/src/site/site.xml b/apache-rat-core/src/site/site.xml index 4440bc8a4..2de6868f8 100644 --- a/apache-rat-core/src/site/site.xml +++ b/apache-rat-core/src/site/site.xml @@ -1,4 +1,4 @@ - + - - - - ]]> - - + + + ]]> - + diff --git a/apache-rat-plugin/src/site/site.xml b/apache-rat-plugin/src/site/site.xml index 612760c38..a8b4deb6e 100644 --- a/apache-rat-plugin/src/site/site.xml +++ b/apache-rat-plugin/src/site/site.xml @@ -1,4 +1,4 @@ - + - + - - ]]> - - + ]]> - @@ -38,7 +32,6 @@ - - + diff --git a/apache-rat-tasks/src/site/site.xml b/apache-rat-tasks/src/site/site.xml index 48caaff82..883cb837e 100644 --- a/apache-rat-tasks/src/site/site.xml +++ b/apache-rat-tasks/src/site/site.xml @@ -1,4 +1,4 @@ - + - - - - ]]> - - + + + ]]> - @@ -32,7 +26,6 @@ - - + diff --git a/apache-rat-tools/src/site/site.xml b/apache-rat-tools/src/site/site.xml index 6a92692ec..3c7ae760a 100644 --- a/apache-rat-tools/src/site/site.xml +++ b/apache-rat-tools/src/site/site.xml @@ -1,4 +1,4 @@ - + - - - - ]]> - - + + + ]]> - - - + diff --git a/apache-rat/src/site/site.xml b/apache-rat/src/site/site.xml index 310ce7985..3ca9fa954 100644 --- a/apache-rat/src/site/site.xml +++ b/apache-rat/src/site/site.xml @@ -1,4 +1,4 @@ - + - - - - ]]> - - + + + ]]> - + diff --git a/pom.xml b/pom.xml index 025a6130b..8f169e37c 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ agnostic home for software distribution comprehension and audit tools. RAT 3.15.1 - 2.12.1 + 3.0.0-M1 3.11.2 3.26.0 @@ -79,6 +79,12 @@ agnostic home for software distribution comprehension and audit tools. + + + org.apache.maven.skins + maven-fluido-skin + 2.0.1 + org.apache.rat apache-rat-core @@ -237,8 +243,6 @@ agnostic home for software distribution comprehension and audit tools. Resolved,Closed Bug,New Feature,Task,Improvement,Wish,Test - - true ${commons.changes.onlyCurrentVersion} ${commons.changes.maxEntries} @@ -249,12 +253,70 @@ agnostic home for software distribution comprehension and audit tools. - changes-report - jira-report + changes + jira-changes + github-changes + + org.apache.maven.plugins + maven-changelog-plugin + 2.3 + + + + org.codehaus.mojo + taglist-maven-plugin + 3.2.1 + + + + + Todo Work + + + todo + ignoreCase + + + fixme + ignoreCase + + + + + Refactor Work + + + refactor + ignoreCase + + + + + Review Work + + + review + ignoreCase + + + + + Deprecated items + + + @deprecated + ignoreCase + + + + + + + org.apache.maven.plugins maven-checkstyle-plugin @@ -330,7 +392,7 @@ agnostic home for software distribution comprehension and audit tools. org.apache.maven.plugins maven-project-info-reports-plugin - 3.6.2 + 3.8.0 @@ -455,10 +517,7 @@ agnostic home for software distribution comprehension and audit tools. org.apache.maven.plugins maven-site-plugin - 3.12.1 - - false - + 3.21.0 org.apache.rat diff --git a/src/site/site.xml b/src/site/site.xml index 76443f91f..0b65335d6 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,4 +1,4 @@ - + - - - The Apache Software Foundation - The Apache Software Foundation - https://www.apache.org/img/asf_logo.png - https://www.apache.org/ + + + org.apache.maven.skins + maven-fluido-skin + + + + + + apache/creadur-rat + right + blue + + + + + The Apache Software Foundation - - + + + - - - ]]> - - + ]]> - - + - + - - - - - - - - + + + + - - - - - + + + + - @@ -84,54 +81,42 @@ - - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + - - + - - - + + - - - - + + + + - - - +