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 2024/01/02 16:23:25 UTC
(maven-doxia-sitetools) 01/01: [DOXIASITETOOLS-323] Upgrade components
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIASITETOOLS-323
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 714405d9141d80fd6a3c6310148762827bced9cd
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 2 17:22:02 2024 +0100
[DOXIASITETOOLS-323] Upgrade components
Co-authored-by: Sylwester Lachiewicz <sl...@gmail.com>
This closes #125
---
doxia-integration-tools/pom.xml | 31 ++++++++++++++++++++-----------
doxia-site-renderer/pom.xml | 21 ++++++++++++---------
pom.xml | 24 ++++++++++--------------
3 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index d8b8259..ab53817 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -86,9 +86,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>${aetherVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ <version>${aetherVersion}</version>
<scope>provided</scope>
</dependency>
@@ -103,12 +109,6 @@
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
@@ -123,10 +123,14 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.26</version>
+ <version>1.27</version>
</dependency>
<!-- test -->
@@ -145,6 +149,11 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
@@ -184,7 +193,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-testing</artifactId>
- <version>1.1.0</version>
+ <version>1.3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index a209b6b..ebc3ecf 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -101,18 +101,16 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
- <version>2.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </dependency>
<!-- misc -->
<dependency>
@@ -128,7 +126,7 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
+ <version>3.14.0</version>
</dependency>
<!-- test -->
@@ -151,7 +149,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
<scope>test</scope>
</dependency>
<dependency>
@@ -190,6 +187,12 @@ under the License.
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/pom.xml b/pom.xml
index 2b5d67c..8b1ee98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@ under the License.
<mavenVersion>3.2.5</mavenVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
<wagonVersion>3.5.3</wagonVersion>
- <junitVersion>5.10.0</junitVersion>
<l10nPluginVersion>1.0.0</l10nPluginVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
<project.build.outputTimestamp>2023-11-18T09:16:47Z</project.build.outputTimestamp>
@@ -130,15 +129,9 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.11.0</version>
+ <version>2.15.1</version>
</dependency>
<!-- Plexus -->
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>4.2.3</version>
- <classifier>no_aop</classifier>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
@@ -169,14 +162,17 @@ under the License.
</dependency>
<!-- Test -->
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junitVersion}</version>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>5.10.1</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junitVersion}</version>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>6.0.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>