You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/01/20 12:50:45 UTC
[maven-site-plugin] branch MSITE-758 created (now 44bec0c)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MSITE-758
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git.
at 44bec0c [MSITE-758] upgrade wagon-api from 1.0 to 3.3.1
This branch includes the following new commits:
new 44bec0c [MSITE-758] upgrade wagon-api from 1.0 to 3.3.1
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.
[maven-site-plugin] 01/01: [MSITE-758] upgrade wagon-api from 1.0
to 3.3.1
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSITE-758
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 44bec0cc2a50ea29a4d9c05734e71835a4559c96
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Jan 20 13:50:36 2019 +0100
[MSITE-758] upgrade wagon-api from 1.0 to 3.3.1
---
pom.xml | 21 +++++++++------------
src/it/full-reporting/pom.xml | 26 +++++++++++---------------
2 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ef55b5..ab6dba8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>33</version>
- <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>maven-site-plugin</artifactId>
@@ -170,7 +170,7 @@ under the License.
</contributors>
<prerequisites>
- <maven>${prerequisiteMavenVersion}</maven>
+ <maven>${mavenVersion}</maven>
</prerequisites>
<scm>
@@ -195,22 +195,21 @@ under the License.
</distributionManagement>
<properties>
+ <mavenVersion>3.0</mavenVersion>
<javaVersion>8</javaVersion>
+ <!-- for dependencies -->
<doxiaVersion>1.8</doxiaVersion>
<doxiaSitetoolsVersion>1.8.1</doxiaSitetoolsVersion>
- <mavenVersion>3.0</mavenVersion>
- <prerequisiteMavenVersion>2.2.1</prerequisiteMavenVersion>
- <wagonVersion>1.0</wagonVersion>
+ <jettyVersion>9.4.12.v20180830</jettyVersion>
<plexusVersion>1.5.4</plexusVersion>
<scmVersion>1.4</scmVersion>
+ <wagonVersion>3.3.1</wagonVersion>
<!-- for ITs -->
- <javadocPluginVersion>2.9.1</javadocPluginVersion>
- <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
+ <javadocPluginVersion>3.0.1</javadocPluginVersion>
<pmdPluginVersion>3.11.0</pmdPluginVersion>
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven.compiler.source>1.8</maven.compiler.source>
- <jettyVersion>9.4.12.v20180830</jettyVersion>
+ <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
+ <surefirePluginVersion>2.22.1</surefirePluginVersion>
</properties>
<dependencies>
@@ -442,8 +441,6 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- note slf4j- upgrade possible until upgrade wagon-webdav-jackrabbit is upgraded too -->
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/src/it/full-reporting/pom.xml b/src/it/full-reporting/pom.xml
index 0e1aa2f..50b5345 100644
--- a/src/it/full-reporting/pom.xml
+++ b/src/it/full-reporting/pom.xml
@@ -31,17 +31,8 @@ under the License.
<groupId>org.apache.maven.plugins.site.its</groupId>
<artifactId>full-reporting</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>maven-site-plugin IT: full reporting</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <javadocPluginVersion>@javadocPluginVersion@</javadocPluginVersion>
- <checkstylePluginVersion>@checkstylePluginVersion@</checkstylePluginVersion>
- <projectInfoReportsPluginVersion>@projectInfoReportsPluginVersion@</projectInfoReportsPluginVersion>
- <pmdPluginVersion>@pmdPluginVersion@</pmdPluginVersion>
- </properties>
<dependencies>
<dependency>
@@ -61,13 +52,18 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>@surefirePluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocPluginVersion}</version>
+ <version>@javadocPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstylePluginVersion}</version>
+ <version>@checkstylePluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -77,7 +73,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>${pmdPluginVersion}</version>
+ <version>@pmdPluginVersion@</version>
</plugin>
</plugins>
</build>
@@ -113,7 +109,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>${pmdPluginVersion}</version>
+ <version>@pmdPluginVersion@</version>
<configuration>
<skipEmptyReport>false</skipEmptyReport>
</configuration>
@@ -121,12 +117,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocPluginVersion}</version>
+ <version>@javadocPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstylePluginVersion}</version>
+ <version>@checkstylePluginVersion@</version>
</plugin>
</plugins>
</reporting>