You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by po...@apache.org on 2020/10/11 07:31:12 UTC
[creadur-rat] branch update-doxia-tools created (now eff4ab4)
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a change to branch update-doxia-tools
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git.
at eff4ab4 Try to update doxia stuff to avoid problems in httpclient
This branch includes the following new commits:
new eff4ab4 Try to update doxia stuff to avoid problems in httpclient
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[creadur-rat] 01/01: Try to update doxia stuff to avoid problems in
httpclient
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch update-doxia-tools
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
commit eff4ab46399d5893a48ab287922776d20e4fe1f6
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Sun Oct 11 09:30:55 2020 +0200
Try to update doxia stuff to avoid problems in httpclient
---
apache-rat-plugin/.gitignore | 1 +
apache-rat-plugin/pom.xml | 4 ++--
.../src/main/java/org/apache/rat/mp/RatReportMojo.java | 6 +++---
apache-rat-tasks/.gitignore | 1 +
apache-rat/.gitignore | 1 +
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/apache-rat-plugin/.gitignore b/apache-rat-plugin/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/apache-rat-plugin/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 594b3a1..f3f25b0 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -34,8 +34,8 @@
</prerequisites>
<properties>
<currentVersion>${project.version}</currentVersion>
- <doxiaVersion>1.6</doxiaVersion>
- <doxiaSitetoolsVersion>1.6</doxiaSitetoolsVersion>
+ <doxiaVersion>1.9.1</doxiaVersion>
+ <doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
</properties>
<build>
<resources>
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
index 396009d..b3b129a 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
@@ -84,11 +84,11 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport {
/**
* Returns the skins artifact file.
*
- * @return Artifact file
+ * @return Artifact
* @throws MojoFailureException An error in the plugin configuration was detected.
* @throws MojoExecutionException An error occurred while searching for the artifact file.
*/
- private File getSkinArtifactFile() throws MojoFailureException, MojoExecutionException {
+ private Artifact getSkinArtifactFile() throws MojoFailureException, MojoExecutionException {
final Skin skin = Skin.getDefaultSkin();
String version = skin.getVersion();
@@ -111,7 +111,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport {
throw new MojoFailureException("The skin does not exist: " + e.getMessage());
}
- return artifact.getFile();
+ return artifact;
}
/**
diff --git a/apache-rat-tasks/.gitignore b/apache-rat-tasks/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/apache-rat-tasks/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/apache-rat/.gitignore b/apache-rat/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/apache-rat/.gitignore
@@ -0,0 +1 @@
+/target/