This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
The following commit(s) were added to refs/heads/master by this push:
new 7948434f RAT-343, RAT-349: Reformat poms and fix encoding warning in
build
7948434f is described below
commit 7948434f4446e43f1ad6d2f76d6d811dd73011c2
Author: P. Ottlinger <[email protected]>
AuthorDate: Sun Jan 14 13:59:00 2024 +0100
RAT-343, RAT-349: Reformat poms and fix encoding warning in build
---
apache-rat-plugin/pom.xml | 2 +-
.../src/test/resources/unit/RAT-343/pom.xml | 115 ++++++++++-----------
apache-rat-tasks/pom.xml | 22 ++--
apache-rat/pom.xml | 2 +-
pom.xml | 7 +-
5 files changed, 75 insertions(+), 73 deletions(-)
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index ac4ba5da..9cc7c3ec 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -120,7 +120,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
b/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
index 2d47e68d..aa4b20c3 100644
--- a/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
+++ b/apache-rat-plugin/src/test/resources/unit/RAT-343/pom.xml
@@ -27,64 +27,63 @@
<artifactId>apache-rat-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
-
<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
- <licenses>
- <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-
<licenseFamilyCategory>MIT</licenseFamilyCategory>
-
<licenseFamilyName>MIT</licenseFamilyName>
- <notes></notes>
- <patterns>
-
<pattern>Licensed MIT</pattern>
-
<pattern>Licensed under MIT</pattern>
-
<pattern>Licensed under the MIT license</pattern>
-
<pattern>MIT/GPL2 Licensed</pattern>
-
<pattern>licensed under the MIT and GPL</pattern>
-
<pattern>MIT license</pattern>
- </patterns>
-
- </license>
- <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-
<licenseFamilyCategory>BSD</licenseFamilyCategory>
-
<licenseFamilyName>BSD</licenseFamilyName>
- <notes></notes>
- <patterns>
-
<pattern>BSD-style license</pattern>
- </patterns>
- </license>
- <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-
<licenseFamilyCategory>CC BY</licenseFamilyCategory>
-
<licenseFamilyName>Creative Commons Attribution</licenseFamilyName>
- <notes></notes>
- <patterns>
-
<pattern>creativecommons.org/licenses/by/4.0</pattern>
- </patterns>
- </license>
- </licenses>
- <licenseFamilies>
- <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
-
<familyName>MIT</familyName>
- </licenseFamily>
- <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
-
<familyName>BSD</familyName>
- </licenseFamily>
- <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>CC
BY</familyName>
- </licenseFamily>
- </licenseFamilies>
- <approvedLicenses>
- <id>BSD</id>
- </approvedLicenses>
- <excludes>
-
<exclude>**/*.mp3</exclude>
-
<exclude>**/localhost.jks</exclude>
-
<exclude>**/node_modules/**</exclude>
-
<exclude>**/package-lock.json</exclude>
-
<exclude>**/target/**</exclude>
-
<exclude>**/.project</exclude>
-
<exclude>**/.classpath</exclude>
-
<exclude>**/.settings/**</exclude>
-
<exclude>.gitattributes</exclude>
- </excludes>
+ <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
+ <licenses>
+ <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>MIT</licenseFamilyCategory>
+ <licenseFamilyName>MIT</licenseFamilyName>
+ <notes/>
+ <patterns>
+ <pattern>Licensed MIT</pattern>
+ <pattern>Licensed under MIT</pattern>
+ <pattern>Licensed under the MIT license</pattern>
+ <pattern>MIT/GPL2 Licensed</pattern>
+ <pattern>licensed under the MIT and GPL</pattern>
+ <pattern>MIT license</pattern>
+ </patterns>
+ </license>
+ <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>BSD</licenseFamilyCategory>
+ <licenseFamilyName>BSD</licenseFamilyName>
+ <notes/>
+ <patterns>
+ <pattern>BSD-style license</pattern>
+ </patterns>
+ </license>
+ <license
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>CC BY</licenseFamilyCategory>
+ <licenseFamilyName>Creative Commons
Attribution</licenseFamilyName>
+ <notes/>
+ <patterns>
+ <pattern>creativecommons.org/licenses/by/4.0</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <licenseFamilies>
+ <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>MIT</familyName>
+ </licenseFamily>
+ <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>BSD</familyName>
+ </licenseFamily>
+ <licenseFamily
implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>CC BY</familyName>
+ </licenseFamily>
+ </licenseFamilies>
+ <approvedLicenses>
+ <id>BSD</id>
+ </approvedLicenses>
+ <excludes>
+ <exclude>**/*.mp3</exclude>
+ <exclude>**/localhost.jks</exclude>
+ <exclude>**/node_modules/**</exclude>
+ <exclude>**/package-lock.json</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>.gitattributes</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
diff --git a/apache-rat-tasks/pom.xml b/apache-rat-tasks/pom.xml
index 6a323388..4f6d4bff 100644
--- a/apache-rat-tasks/pom.xml
+++ b/apache-rat-tasks/pom.xml
@@ -113,18 +113,18 @@
<configuration>
<target>
<ant
antfile="src/test/resources/antunit/report-bad-configurations.xml"
inheritAll="false" inheritRefs="false">
- <property name="jar.name"
location="${project.build.outputDirectory}" />
- <property name="base.dir" location="${basedir}" />
- <property name="antunit.jar.name"
location="${project.build.directory}/dependencies/ant-antunit.jar" />
- <property name="test.skipped" value="${maven.test.skip}" />
- <property name="test.classpath" refid="maven.test.classpath"
/>
+ <property name="jar.name"
location="${project.build.outputDirectory}"/>
+ <property name="base.dir" location="${basedir}"/>
+ <property name="antunit.jar.name"
location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+ <property name="test.skipped" value="${maven.test.skip}"/>
+ <property name="test.classpath"
refid="maven.test.classpath"/>
</ant>
<ant
antfile="src/test/resources/antunit/report-normal-operation.xml"
inheritAll="false" inheritRefs="false">
- <property name="jar.name"
location="${project.build.outputDirectory}" />
- <property name="base.dir" location="${basedir}" />
- <property name="antunit.jar.name"
location="${project.build.directory}/dependencies/ant-antunit.jar" />
- <property name="test.skipped" value="${maven.test.skip}" />
- <property name="test.classpath" refid="maven.test.classpath"
/>
+ <property name="jar.name"
location="${project.build.outputDirectory}"/>
+ <property name="base.dir" location="${basedir}"/>
+ <property name="antunit.jar.name"
location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+ <property name="test.skipped" value="${maven.test.skip}"/>
+ <property name="test.classpath"
refid="maven.test.classpath"/>
</ant>
</target>
</configuration>
@@ -162,7 +162,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/apache-rat/pom.xml b/apache-rat/pom.xml
index 67325de1..0aee0489 100644
--- a/apache-rat/pom.xml
+++ b/apache-rat/pom.xml
@@ -149,7 +149,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index ba6db540..5e6a511c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,6 +390,9 @@ agnostic home for software distribution comprehension and
audit tools.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
+ <configuration>
+ <propertiesEncoding>ISO-8859-1</propertiesEncoding>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -420,7 +423,7 @@ agnostic home for software distribution comprehension and
audit tools.
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -442,7 +445,7 @@ agnostic home for software distribution comprehension and
audit tools.
</goals>
<configuration>
<target>
- <copy file="RELEASE_NOTES.txt"
todir="${project.build.directory}/site/" failonerror="false" />
+ <copy file="RELEASE_NOTES.txt"
todir="${project.build.directory}/site/" failonerror="false"/>
</target>
</configuration>
</execution>
