Skip to content

Commit

Permalink
Merge branch 'apache:master' into RAT-368_remove_unused_files
Browse files Browse the repository at this point in the history
  • Loading branch information
Claudenw committed Apr 28, 2024
2 parents 6460ab0 + a49e260 commit 003104d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 1 deletion.
10 changes: 10 additions & 0 deletions apache-rat-plugin/src/it/it4_RAT-168/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,15 @@
</configuration>
</plugin>
</plugins>
<!-- RAT-354: prevent warning about missing version property of maven-clean-plugin -->
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ agnostic home for software distribution comprehension and audit tools.
<mavenPluginPluginVersion>3.12.0</mavenPluginPluginVersion>
<mavenChangesVersion>2.12.1</mavenChangesVersion>
<mavenJavadocPluginVersion>3.6.3</mavenJavadocPluginVersion>
<mavenPmdPluginVersion>3.21.2</mavenPmdPluginVersion>
<mavenPmdPluginVersion>3.22.0</mavenPmdPluginVersion>
<!-- Used to generate download page for RAT during site builds, please adapt versions manually BEFORE doing a release -->
<!-- START - adapat manually before doing a release -->
<previousRatVersion>0.17</previousRatVersion>
Expand Down
9 changes: 9 additions & 0 deletions src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd
</release>
-->
<release version="0.17-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
<action issue="RAT-354" type="fix" dev="pottlinger" due-to="Guillaume Nodet">
Fix integration test failure with Maven4 by adding a version property in integration test's pom.xml. Versions above Maven4-alpha13 require Java17 and cannot be used with RAT, as it relies on Java8.
</action>
<action issue="RAT-355" type="add" dev="claudenw">
Optionally export XML configuration file as part of run. Added framework to inspect available licenses and matchers.
</action>
<action issue="RAT-366" type="update" dev="claudenw">
Switch to processing header matches in one call rather than line by line.
</action>
<action issue="RAT-333" type="fix" dev="claudenw">
Fix if --force option is used executable bit is not set properly on newly created/license-augmented file.
</action>
Expand Down
2 changes: 2 additions & 0 deletions src/site/apt/index.apt.vm
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ java -jar apache-rat-${project.version}.jar --help

Use the plugin for {{{https://maven.apache.org}Apache Maven ${mavenVersion}}} or later.

<<ATTENTION!>> Maven4 is based on Java 17 and thus cannot be used with RAT, that relies on Java 8.

+------------------------------------------+
<plugin>
<groupId>org.apache.rat</groupId>
Expand Down

0 comments on commit 003104d

Please sign in to comment.