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/07/21 16:03:32 UTC
[maven-plugin-tools] branch doxia-2.0.0 created (now bafe3504)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
at bafe3504 Doxia 2.0.0 ready
This branch includes the following new commits:
new bafe3504 Doxia 2.0.0 ready
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-plugin-tools] 01/01: Doxia 2.0.0 ready
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit bafe3504d0a8f2f211348337d0788db7ad57021f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 21 18:03:20 2022 +0200
Doxia 2.0.0 ready
---
maven-plugin-plugin/pom.xml | 8 ++++----
maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml | 4 ++--
maven-plugin-plugin/src/it/plugin-report/pom.xml | 4 ++--
maven-plugin-tools-generators/pom.xml | 6 +++---
pom.xml | 10 +++-------
5 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 60f762c4..ecabb7e5 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -42,8 +42,8 @@
</prerequisites>
<properties>
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
+ <doxiaVersion>2.0.0-M3</doxiaVersion>
+ <doxia-sitetoolsVersion>2.0.0-M3</doxia-sitetoolsVersion>
<it.debug>true</it.debug>
</properties>
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
<!-- plexus -->
@@ -326,7 +326,7 @@
<settingsFile>src/it/settings.xml</settingsFile>
<streamLogsOnFailures>true</streamLogsOnFailures>
<filterProperties>
- <sitePluginVersion>3.11.0</sitePluginVersion>
+ <sitePluginVersion>4.0.0-M3-SNAPSHOT</sitePluginVersion>
<projectInfoReportsPlugin>3.4.0</projectInfoReportsPlugin>
<antVersion>${antVersion}</antVersion>
</filterProperties>
diff --git a/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml b/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
index 434886d8..51203cf5 100644
--- a/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
+++ b/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
@@ -51,12 +51,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
</dependencies>
diff --git a/maven-plugin-plugin/src/it/plugin-report/pom.xml b/maven-plugin-plugin/src/it/plugin-report/pom.xml
index 3cdb6896..5ea6e7b5 100644
--- a/maven-plugin-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-plugin/src/it/plugin-report/pom.xml
@@ -51,12 +51,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
</dependencies>
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index bab7ca7f..f431a5d3 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
<!-- plexus -->
@@ -67,7 +67,7 @@
<!-- other -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/pom.xml b/pom.xml
index 04abbee9..e2dddff6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,24 +189,20 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
- <version>1.2</version>
+ <version>2.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!-- other -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
<dependency>