You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/10/02 08:10:27 UTC
[maven-pdf-plugin] branch master updated (392b08b -> dc212c4)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git.
from 392b08b Bump actions/setup-java from 2.3.0 to 2.3.1
new 0ab5693 Update CI config
new 4cbd850 Fix failing tests with new plexus-utils
new dc212c4 Small pom cleanups
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:
.github/workflows/maven.yml | 9 +++------
pom.xml | 23 ++--------------------
.../plugins/pdf/DocumentModelBuilderTest.java | 2 +-
src/test/resources/unit/pdf/pom_model_builder.xml | 2 +-
4 files changed, 7 insertions(+), 29 deletions(-)
[maven-pdf-plugin] 03/03: Small pom cleanups
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit dc212c4ddfe713d6a8565bb84011215e1b042537
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Oct 2 10:09:36 2021 +0200
Small pom cleanups
---
pom.xml | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 15e0235..3cb29f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,19 +93,10 @@ under the License.
<doxiaSitetoolsVersion>1.10</doxiaSitetoolsVersion>
<mavenVersion>3.1.1</mavenVersion>
<javaVersion>8</javaVersion>
+ <mavenPluginToolsVersion>3.6.1</mavenPluginToolsVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-logging-api</artifactId>
- <version>${doxiaVersion}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -301,6 +292,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M3</version>
<executions>
<execution>
<goals>
@@ -364,17 +356,6 @@ under the License.
</locales>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration>
- <instrumentation>
- <excludes>
- <exclude>**/HelpMojo.class</exclude>
- </excludes>
- </instrumentation>
- </configuration>
- </plugin>
</plugins>
</reporting>
</profile>
[maven-pdf-plugin] 02/03: Fix failing tests with new plexus-utils
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit 4cbd850407c228a60fb03d51a043a02f772dff37
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Oct 1 21:36:02 2021 +0200
Fix failing tests with new plexus-utils
---
.../java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java | 2 +-
src/test/resources/unit/pdf/pom_model_builder.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java b/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
index f8c2770..bb50bfb 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
@@ -65,7 +65,7 @@ public class DocumentModelBuilderTest
{
DocumentModel model = new DocumentModelBuilder( new ModelBuilderMavenProjectStub() ).getDocumentModel();
- assertEquals( "ISO-8859-1", model.getModelEncoding() );
+ assertEquals( "UTF-8", model.getModelEncoding() );
assertEquals( "Test ArtifactId", model.getOutputName() );
DocumentCover cover = model.getCover();
diff --git a/src/test/resources/unit/pdf/pom_model_builder.xml b/src/test/resources/unit/pdf/pom_model_builder.xml
index 0608d22..d62638d 100644
--- a/src/test/resources/unit/pdf/pom_model_builder.xml
+++ b/src/test/resources/unit/pdf/pom_model_builder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
[maven-pdf-plugin] 01/03: Update CI config
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit 0ab56936f109b0a7f6eaddb63283e06581278dd1
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Oct 1 21:35:13 2021 +0200
Update CI config
---
.github/workflows/maven.yml | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index bbb2175..e350889 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,17 +25,14 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
- java: [8, 11, 17-ea]
+ java: [8, 11, 17]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
- - name: Checkout
- uses: actions/checkout@v2.3.4
-
- - name: Set up JDK
- uses: actions/setup-java@v2.3.1
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'