This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 4b51865 Reshuffle depMgmt (#34)
4b51865 is described below
commit 4b518651a0c055fe41cb6a2ebaf2626ec985297e
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri Oct 15 12:49:43 2021 +0200
Reshuffle depMgmt (#34)
Remove legacy from doxia parent (plexus shim is "drop in"
replacement), and define useful stuff at TLP the
p-u, plexus shim as well as downstream
these are most probably used, is easier
to align along these.
---
doxia-tools/pom.xml | 16 ----------------
pom.xml | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/doxia-tools/pom.xml b/doxia-tools/pom.xml
index 05d6fa8..d289d4a 100644
--- a/doxia-tools/pom.xml
+++ b/doxia-tools/pom.xml
@@ -59,22 +59,6 @@ under the License.
<maven.site.path>doxia-tools-archives/${project.artifactId}-LATEST</maven.site.path>
</properties>
- <dependencyManagement>
- <dependencies>
- <!-- Plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<pluginManagement>
<plugins>
diff --git a/pom.xml b/pom.xml
index f347655..46d6680 100644
--- a/pom.xml
+++ b/pom.xml
@@ -913,6 +913,7 @@ under the License.
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
<maven.site.path>../..</maven.site.path><!-- to be overridden -->
<mavenPluginToolsVersion>3.6.1</mavenPluginToolsVersion>
+ <sisuVersion>0.3.5</sisuVersion>
<!-- don't fail check for some rules that are too hard to enforce (could
even be told broken for some) -->
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength</checkstyle.violation.ignore>
<project.build.outputTimestamp>2020-01-26T09:04:18Z</project.build.outputTimestamp>
@@ -920,6 +921,23 @@ under the License.
<dependencyManagement>
<dependencies>
+ <!-- Plexus Shim -->
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ <version>${sisuVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <version>${sisuVersion}</version>
+ </dependency>
+ <!-- Commonly shared: last Java7 -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.3.0</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
