You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/04/18 12:41:18 UTC
[maven-pdf-plugin] branch master updated (c8d7d28 -> 80eaf0e)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
from c8d7d28 Bump maven-reporting-exec from 1.5.1 to 1.6.0
new 24f4b73 Update CI URL
new 8f89c50 [MPDF-100] Remove remains of org.codehaus.doxia.sink.Sink
new 633df59 [MPDF-101] Upgrade Maven to 3.2.5
new dcc0e62 Clean up dependencies
new f9c3095 [MPDF-102] Upgrade Maven Plugin Plugin to 3.6.4
new 80eaf0e [MPDF-103] Upgrade plugins in ITs
The 6 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:
pom.xml | 55 +++++++++++++++-------
src/it/descriptor/pom.xml | 6 +--
src/it/pdf-aggregate/pom.xml | 4 +-
src/it/pdf-with-reporting-section/pom.xml | 4 +-
.../java/org/apache/maven/plugins/pdf/PdfMojo.java | 1 -
5 files changed, 44 insertions(+), 26 deletions(-)
[maven-pdf-plugin] 03/06: [MPDF-101] Upgrade Maven to 3.2.5
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit 633df598fec78fbaf6281f6ac8add33957032090
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 18 14:29:49 2022 +0200
[MPDF-101] Upgrade Maven to 3.2.5
---
pom.xml | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5b23417..b8cb9bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@ under the License.
<properties>
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
- <mavenVersion>3.1.1</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
<mavenPluginToolsVersion>3.6.1</mavenPluginToolsVersion>
<project.build.outputTimestamp>2021-11-28T20:43:24Z</project.build.outputTimestamp>
@@ -114,6 +114,25 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -125,11 +144,13 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
[maven-pdf-plugin] 02/06: [MPDF-100] Remove remains of org.codehaus.doxia.sink.Sink
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit 8f89c50d3144b49401f94607f6ea19c30878eb97
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 18 13:58:07 2022 +0200
[MPDF-100] Remove remains of org.codehaus.doxia.sink.Sink
---
src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
index d116982..8c0de75 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
@@ -1421,7 +1421,6 @@ public class PdfMojo
*/
private static class PdfXdocSink
extends XdocSink
- implements org.codehaus.doxia.sink.Sink
{
protected PdfXdocSink( Writer writer )
{
[maven-pdf-plugin] 04/06: Clean up dependencies
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit dcc0e620721ba817e0d9817dbcfdc881d687e672
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 18 14:30:27 2022 +0200
Clean up dependencies
---
pom.xml | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index b8cb9bd..0f73d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,23 +158,12 @@ under the License.
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>3.3.4</version>
</dependency>
<!-- Doxia -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- <version>${doxiaVersion}</version>
- <exclusions>
- <exclusion>
- <artifactId>plexus-container-default</artifactId>
- <groupId>org.codehaus.plexus</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xdoc</artifactId>
@@ -184,6 +173,13 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-fo</artifactId>
<version>${doxiaVersion}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
[maven-pdf-plugin] 01/06: Update CI URL
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit 24f4b73f2fe256e085f8a48f67e91d49c0fa6e1a
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 18 13:56:28 2022 +0200
Update CI URL
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1b0a533..5b23417 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-pdf-plugin/</url>
+ <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-pdf-plugin/</url>
</ciManagement>
<distributionManagement>
<site>
[maven-pdf-plugin] 06/06: [MPDF-103] Upgrade plugins in ITs
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit 80eaf0ede5ad96ea77b8ce12400ca9dda77c4142
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 18 14:36:40 2022 +0200
[MPDF-103] Upgrade plugins in ITs
---
pom.xml | 4 +++-
src/it/descriptor/pom.xml | 6 +++---
src/it/pdf-aggregate/pom.xml | 4 ++--
src/it/pdf-with-reporting-section/pom.xml | 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index ee7d5fb..db647aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,8 @@ under the License.
<mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
<mavenPluginToolsVersion>3.6.4</mavenPluginToolsVersion>
+ <projectInfoReportsPlugin>3.2.2</projectInfoReportsPlugin>
+ <cleanPlugin>3.2.0</cleanPlugin>
<project.build.outputTimestamp>2021-11-28T20:43:24Z</project.build.outputTimestamp>
</properties>
@@ -108,7 +110,7 @@ under the License.
<artifactId>maven-reporting-exec</artifactId>
<version>1.6.0</version>
</dependency>
-
+
<!-- Maven -->
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/src/it/descriptor/pom.xml b/src/it/descriptor/pom.xml
index 92c879a..0bb6d97 100644
--- a/src/it/descriptor/pom.xml
+++ b/src/it/descriptor/pom.xml
@@ -42,7 +42,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
+ <version>@cleanPlugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -59,11 +59,11 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
+ <version>@projectInfoReportsPlugin@</version>
<reportSets>
<reportSet>
<reports>
- <report>license</report>
+ <report>licenses</report>
<report>summary</report>
</reports>
</reportSet>
diff --git a/src/it/pdf-aggregate/pom.xml b/src/it/pdf-aggregate/pom.xml
index 324c407..9163675 100644
--- a/src/it/pdf-aggregate/pom.xml
+++ b/src/it/pdf-aggregate/pom.xml
@@ -67,7 +67,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
+ <version>@cleanPlugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -81,7 +81,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.0</version>
+ <version>@projectInfoReportsPlugin@</version>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/pdf-with-reporting-section/pom.xml b/src/it/pdf-with-reporting-section/pom.xml
index 1f803bd..155b8c9 100644
--- a/src/it/pdf-with-reporting-section/pom.xml
+++ b/src/it/pdf-with-reporting-section/pom.xml
@@ -67,7 +67,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
+ <version>@cleanPlugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -81,7 +81,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.0</version>
+ <version>@projectInfoReportsPlugin@</version>
<reportSets>
<reportSet>
<reports>
[maven-pdf-plugin] 05/06: [MPDF-102] Upgrade Maven Plugin Plugin to 3.6.4
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit f9c3095ddee783de18da3ff0ee230ebd8b09ba06
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 18 14:31:38 2022 +0200
[MPDF-102] Upgrade Maven Plugin Plugin to 3.6.4
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0f73d5c..ee7d5fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@ under the License.
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
- <mavenPluginToolsVersion>3.6.1</mavenPluginToolsVersion>
+ <mavenPluginToolsVersion>3.6.4</mavenPluginToolsVersion>
<project.build.outputTimestamp>2021-11-28T20:43:24Z</project.build.outputTimestamp>
</properties>