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/11/19 10:20:06 UTC
(maven-site-plugin) branch MSITE-1028 created (now 6bba9e66)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MSITE-1028
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
at 6bba9e66 Let's try
This branch includes the following new commits:
new 6bba9e66 Let's try
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: Let's try
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSITE-1028
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 6bba9e66a1d26610e33d99aee256207ef5390d99
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Nov 19 11:19:55 2024 +0100
Let's try
---
pom.xml | 40 ++++++++++++++++++++++++++++++++++++----
1 file changed, 36 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 505bd596..7ad801fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,8 +193,10 @@ under the License.
</distributionManagement>
<properties>
- <javaVersion>8</javaVersion>
- <mavenVersion>3.6.3</mavenVersion>
+ <javaVersion>17</javaVersion>
+ <mavenVersion>4.0.0-beta-5</mavenVersion>
+ <sisuVersion>0.9.0.M3</sisuVersion>
+ <guiceVersion>6.0.0</guiceVersion>
<!-- for dependencies -->
<jettyVersion>9.4.56.v20240826</jettyVersion>
<doxiaVersion>2.0.0</doxiaVersion>
@@ -227,6 +229,16 @@ under the License.
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
<version>2.0.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -245,7 +257,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -290,6 +302,13 @@ under the License.
<version>3.6.2</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ <version>${sisuVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -303,6 +322,12 @@ under the License.
<artifactId>sisu-inject-plexus</artifactId>
<version>1.4.2</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -490,10 +515,17 @@ under the License.
</dependency>
<!-- test -->
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guiceVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
+ <version>4.0.0-beta-2</version>
<scope>test</scope>
</dependency>
<dependency>