diff --git a/.buildtools/generateStagingSiteInWebpageRepo b/.buildtools/generateStagingSiteInWebpageRepo index cab0d515f..d58d2d9d6 100755 --- a/.buildtools/generateStagingSiteInWebpageRepo +++ b/.buildtools/generateStagingSiteInWebpageRepo @@ -19,7 +19,7 @@ ./mvnw -B package site site:stage # DEVHINT: with trailing slash please! -targetDirectory=../creadur-site/rat100/ +targetDirectory=../creadur-site/rat018/ echo "Copying site resources into asf-site repo under $targetDirectory" cp -rvf target/staging/* $targetDirectory > /dev/null diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 8dd4f3f83..5f0d5e521 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -63,7 +63,7 @@ jobs: run: ./mvnw -e -B -V -ntp clean install - name: Archive integration failure - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 if: failure() with: name: reporting-integration-test-failure-logs-${{ matrix.os }}-JDK${{ matrix.java }}-PR${{ github.run_id }} @@ -72,7 +72,7 @@ jobs: apache-rat-core/target/test-classes/ReportTest/** - name: Archive test failure - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 if: failure() with: name: test-failure-logs-${{ matrix.os }}-JDK${{ matrix.java }}-PR${{ github.run_id }} diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index adb5e9e62..9e96845fe 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -1,12 +1,14 @@ name: SonarQube on: push: +# RAT-293: Global secrets are not visible on dependabot runs thus block if triggered by Dependabot branches: - master pull_request: types: [opened, synchronize, reopened] jobs: build: + if: github.actor != 'dependabot[bot]' name: Build and analyze runs-on: ubuntu-latest steps: @@ -32,5 +34,5 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Build and analyze at ASF-sonarcloud env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./mvnw -X -e verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_creadur-rat -Dsonar.token=${SONAR_TOKEN} + SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} + run: ./mvnw verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_creadur-rat -Dsonar.organization=apache -Dsonar.token=${SONAR_TOKEN} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index b5501577c..15bcd7fb1 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,7 +3,7 @@ com.gradle develocity-maven-extension - 2.3.2 + 2.3.4 com.gradle diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml index 4819f23bc..ae9cd0434 100644 --- a/apache-rat-core/pom.xml +++ b/apache-rat-core/pom.xml @@ -20,7 +20,7 @@ org.apache.rat apache-rat-project - 1.0.0-SNAPSHOT + 0.18-SNAPSHOT apache-rat-core jar diff --git a/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java b/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java index 4011ce5e2..eb1805c50 100644 --- a/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java +++ b/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java @@ -44,7 +44,6 @@ import org.apache.rat.utils.DefaultLog; import org.apache.rat.utils.Log; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.CleanupMode; import org.junit.jupiter.api.io.TempDir; diff --git a/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsTest.java b/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsTest.java index 8af8b6867..ccb82f3c6 100644 --- a/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsTest.java +++ b/apache-rat-core/src/test/java/org/apache/rat/ReporterOptionsTest.java @@ -32,7 +32,6 @@ import org.apache.rat.utils.DefaultLog; import org.apache.rat.utils.Log; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.CleanupMode; diff --git a/apache-rat-core/src/test/java/org/apache/rat/config/exclusion/ExclusionUtilsTest.java b/apache-rat-core/src/test/java/org/apache/rat/config/exclusion/ExclusionUtilsTest.java index 48a2897ed..4f3746f2f 100644 --- a/apache-rat-core/src/test/java/org/apache/rat/config/exclusion/ExclusionUtilsTest.java +++ b/apache-rat-core/src/test/java/org/apache/rat/config/exclusion/ExclusionUtilsTest.java @@ -20,7 +20,6 @@ import org.apache.rat.ConfigurationException; import org.apache.rat.utils.ExtendedIterator; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.CleanupMode; import org.junit.jupiter.api.io.TempDir; diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml index 6c56d599b..fa599ea7f 100644 --- a/apache-rat-plugin/pom.xml +++ b/apache-rat-plugin/pom.xml @@ -20,7 +20,7 @@ apache-rat-project org.apache.rat - 1.0.0-SNAPSHOT + 0.18-SNAPSHOT apache-rat-plugin maven-plugin diff --git a/apache-rat-plugin/src/test/java/org/apache/rat/mp/OptionMojoTest.java b/apache-rat-plugin/src/test/java/org/apache/rat/mp/OptionMojoTest.java index 68c2864bd..7b9e27e41 100644 --- a/apache-rat-plugin/src/test/java/org/apache/rat/mp/OptionMojoTest.java +++ b/apache-rat-plugin/src/test/java/org/apache/rat/mp/OptionMojoTest.java @@ -32,7 +32,6 @@ import org.apache.rat.utils.DefaultLog; import org.codehaus.plexus.component.configurator.ComponentConfigurationException; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.io.CleanupMode; diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml index 35d003544..b04515038 100644 --- a/apache-rat-tasks/pom.xml +++ b/apache-rat-tasks/pom.xml @@ -20,7 +20,7 @@ org.apache.rat apache-rat-project - 1.0.0-SNAPSHOT + 0.18-SNAPSHOT apache-rat-tasks jar diff --git a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportOptionTest.java b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportOptionTest.java index b438f9344..9f66bc74d 100644 --- a/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportOptionTest.java +++ b/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportOptionTest.java @@ -35,9 +35,6 @@ import org.apache.rat.utils.DefaultLog; import org.apache.rat.utils.Log; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.condition.EnabledIf; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.io.CleanupMode; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; diff --git a/apache-rat-testdata/pom.xml b/apache-rat-testdata/pom.xml index 63f4040c7..1be67fc50 100644 --- a/apache-rat-testdata/pom.xml +++ b/apache-rat-testdata/pom.xml @@ -20,7 +20,7 @@ org.apache.rat apache-rat-project - 1.0.0-SNAPSHOT + 0.18-SNAPSHOT apache-rat-testdata Apache Creadur RAT::Testdata diff --git a/apache-rat-tools/pom.xml b/apache-rat-tools/pom.xml index 728694d89..5d440b463 100644 --- a/apache-rat-tools/pom.xml +++ b/apache-rat-tools/pom.xml @@ -20,7 +20,7 @@ org.apache.rat apache-rat-project - 1.0.0-SNAPSHOT + 0.18-SNAPSHOT apache-rat-tools jar diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml index bcf8b1e23..ee662434e 100644 --- a/apache-rat/pom.xml +++ b/apache-rat/pom.xml @@ -20,7 +20,7 @@ org.apache.rat apache-rat-project - 1.0.0-SNAPSHOT + 0.18-SNAPSHOT apache-rat jar diff --git a/pom.xml b/pom.xml index d9ee8f67d..a74521763 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.rat apache-rat-project - 1.0.0-SNAPSHOT + 0.18-SNAPSHOT pom Apache Creadur RAT https://creadur.apache.org/rat/ @@ -53,24 +53,24 @@ agnostic home for software distribution comprehension and audit tools. 4.0.0-M1 17 3.2.3 - 5.21.0 + 5.22.0 ${javaVersion} ${javaVersion} 3.9 - 3.9.12 + 3.9.13 RAT 2.4.1 3.1 - 3.5.0 + 3.5.1 3.15.2 3.0.0-M3 3.12.0 3.28.0 - 0.17 + 0.18 1.0.0-SNAPSHOT @@ -570,7 +570,7 @@ agnostic home for software distribution comprehension and audit tools. org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${javaVersion} ${javaVersion} @@ -585,7 +585,7 @@ agnostic home for software distribution comprehension and audit tools. org.apache.maven.plugins maven-dependency-plugin - 3.9.0 + 3.10.0 org.apache.maven.plugins @@ -658,7 +658,7 @@ agnostic home for software distribution comprehension and audit tools. org.apache.maven.plugins maven-resources-plugin - 3.4.0 + 3.5.0 ISO-8859-1 false @@ -667,12 +667,12 @@ agnostic home for software distribution comprehension and audit tools. org.apache.maven.plugins maven-failsafe-plugin - 3.5.4 + 3.5.5 org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.5 1 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 766bb80bf..14552c14b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -61,13 +61,16 @@ in order to be properly linked in site reports. Apache Creadur RAT developers - - + + + Upgrade to doxia 2.0.0 and generate XHTML5 reports during RAT runs (fixes multiple CVEs implicitly). + Speedup tests and avoid garbage collection workaround by changing to CleanupMode.NONE in jUnit's TempDir usages. @@ -144,7 +147,7 @@ in order to be properly linked in site reports. Changed '/.externalToolBuilders' to '/.externalToolBuilders/**' in the ECLIPSE standard exclusion list and added '**/bin/**' to ignore generated binary folders in Eclipse IDE. - TODO/TBD: collect all dependabot updates for release 1.0.0. + TODO/TBD: collect all dependabot updates for release 0.18.

- The KEYS + The KEYS file links to the code signing keys used to sign the product. The PGP link downloads the OpenPGP compatible signature from our main site. The @@ -72,10 +72,10 @@ limitations under the License. apache-rat-${previousRatVersion}-bin.tar.bz2 - sha512 + sha512 - pgp + pgp @@ -83,10 +83,10 @@ limitations under the License. apache-rat-${previousRatVersion}-bin.tar.gz - sha512 + sha512 - pgp + pgp @@ -94,10 +94,10 @@ limitations under the License. apache-rat-${previousRatVersion}-bin.zip - sha512 + sha512 - pgp + pgp @@ -109,10 +109,10 @@ limitations under the License. apache-rat-${previousRatVersion}-src.tar.bz2 - sha512 + sha512 - pgp + pgp @@ -120,10 +120,10 @@ limitations under the License. apache-rat-${previousRatVersion}-src.tar.gz - sha512 + sha512 - pgp + pgp @@ -131,10 +131,10 @@ limitations under the License. apache-rat-${previousRatVersion}-src.zip - sha512 + sha512 - pgp + pgp