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 2021/12/22 21:54:40 UTC
[creadur-rat] branch update-doxia-tools updated (c3cd990 -> d78bd9e)
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.
from c3cd990 RAT-275: Merge from master
new 73952b5 RAT-275: do not use deprecated method to copyResources
new 6d14e1c RAT-275: fallback to defaults when processing site resources
new d78bd9e RAT-275: Use doxia 1.11.1
The 3 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.
Summary of changes:
apache-rat-plugin/pom.xml | 4 ++--
apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 4 ++--
src/changes/changes.xml | 3 +++
3 files changed, 7 insertions(+), 4 deletions(-)
[creadur-rat] 02/03: RAT-275: fallback to defaults when processing site resources
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 6d14e1cbf761f4caf3b311d72396e8ed94c413ad
Author: P. Ottlinger <po...@apache.org>
AuthorDate: Wed Dec 22 22:52:56 2021 +0100
RAT-275: fallback to defaults when processing site resources
---
apache-rat-plugin/pom.xml | 2 +-
apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index b3e28d8..91552f9 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -35,7 +35,7 @@
<properties>
<currentVersion>${project.version}</currentVersion>
<doxiaVersion>1.10</doxiaVersion>
- <doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>1.11.1</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 cf2833f..432d373 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
@@ -150,8 +150,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport {
siteRenderer.generateDocument(writer, sink, siteContext);
- siteRenderer.copyResources(siteContext, new File(getProject().getBasedir() + "/src/site/resources"),
- outputDirectory);
+ siteRenderer.copyResources(siteContext, outputDirectory);
} catch (IOException | RendererException | MavenReportException e) {
throw new MojoExecutionException(e.getMessage(), e);
}
[creadur-rat] 01/03: RAT-275: do not use deprecated method to copyResources
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 73952b52b5c62c0fd8464fa00ffa6c0c65d31cfb
Author: P. Ottlinger <po...@apache.org>
AuthorDate: Wed Dec 22 22:49:53 2021 +0100
RAT-275: do not use deprecated method to copyResources
---
apache-rat-plugin/pom.xml | 2 +-
apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 3 ++-
src/changes/changes.xml | 3 +++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 7be7991..b3e28d8 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -34,7 +34,7 @@
</prerequisites>
<properties>
<currentVersion>${project.version}</currentVersion>
- <doxiaVersion>1.9.1</doxiaVersion>
+ <doxiaVersion>1.10</doxiaVersion>
<doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
</properties>
<build>
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 04da245..cf2833f 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
@@ -149,7 +149,8 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport {
siteRenderer.generateDocument(writer, sink, siteContext);
- siteRenderer.copyResources(siteContext, new File(getProject().getBasedir(), "src/site/resources"),
+
+ siteRenderer.copyResources(siteContext, new File(getProject().getBasedir() + "/src/site/resources"),
outputDirectory);
} catch (IOException | RendererException | MavenReportException e) {
throw new MojoExecutionException(e.getMessage(), e);
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f9e6a44..3273e96 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -55,6 +55,9 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="0.14-SNAPSHOT" date="2020-xx-xx" description="Current SNAPSHOT - to be done">
+ <action issue="RAT-275" type="fix" dev="pottlinger">
+ Update httpclient to fix CVE-2020-13956 after a new doxia-core is out.
+ </action>
<action issue="RAT-289" type="add" dev="pottlinger">
Enable dependabot integration - write access is forbidden, but email alerts and pull requests should be ok.
</action>
[creadur-rat] 03/03: RAT-275: Use doxia 1.11.1
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 d78bd9eb010994a5c13148c3582f8085d3e7e79f
Author: P. Ottlinger <po...@apache.org>
AuthorDate: Wed Dec 22 22:54:35 2021 +0100
RAT-275: Use doxia 1.11.1
---
apache-rat-plugin/pom.xml | 2 +-
src/changes/changes.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 91552f9..77dc2fb 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -34,7 +34,7 @@
</prerequisites>
<properties>
<currentVersion>${project.version}</currentVersion>
- <doxiaVersion>1.10</doxiaVersion>
+ <doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
</properties>
<build>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3273e96..683cddc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -56,7 +56,7 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="0.14-SNAPSHOT" date="2020-xx-xx" description="Current SNAPSHOT - to be done">
<action issue="RAT-275" type="fix" dev="pottlinger">
- Update httpclient to fix CVE-2020-13956 after a new doxia-core is out.
+ Update httpclient to fix CVE-2020-13956 after a new doxia-core is out. Update to doxia 1.11.1.
</action>
<action issue="RAT-289" type="add" dev="pottlinger">
Enable dependabot integration - write access is forbidden, but email alerts and pull requests should be ok.