This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-4.0.x by this push:
new c5bd4d7ac6 Add backward compatibility dependencies to maven-compat
(#11301) (#11339)
c5bd4d7ac6 is described below
commit c5bd4d7ac600781390364bccf06eb7fe581bdd1e
Author: Guillaume Nodet <[email protected]>
AuthorDate: Mon Oct 27 14:23:34 2025 +0100
Add backward compatibility dependencies to maven-compat (#11301) (#11339)
* Add backward compatibility dependencies to maven-compat
(fixes #11299)
* Add aopalliance to sisu box
---------
(cherry picked from commit 151d576e96ccc24a4d1a25ec1d5e0f38f90b7003)
Co-authored-by: Christoph Läubrich <[email protected]>
Co-authored-by: copilot-swe-agent[bot]
<[email protected]>
---
compat/maven-compat/pom.xml | 19 +++++++++++++++----
src/graph/ReactorGraph.java | 2 +-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/compat/maven-compat/pom.xml b/compat/maven-compat/pom.xml
index ee2f6cdd5b..e584686e79 100644
--- a/compat/maven-compat/pom.xml
+++ b/compat/maven-compat/pom.xml
@@ -150,12 +150,21 @@ under the License.
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
- <scope>provided</scope>
+ <!-- only for backward compatibility otherwhise would be provided -->
+ <scope>compile</scope>
</dependency>
+ <dependency>
+ <!-- only for backward compatibility -->
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ </dependency>
+
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
- <scope>provided</scope>
+ <!-- only for backward compatibility otherwhise would be provided -->
+ <scope>compile</scope>
</dependency>
<!-- ONLY version here; nothing else use or should use this dependency -->
<dependency>
@@ -166,7 +175,8 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <scope>provided</scope>
+ <!-- only for backward compatibility otherwhise would be provided -->
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -183,7 +193,8 @@ under the License.
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<classifier>classes</classifier>
- <scope>test</scope>
+ <!-- only for backward compatibility otherwhise would be test-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/src/graph/ReactorGraph.java b/src/graph/ReactorGraph.java
index 1c605f8f81..cb5fea8bca 100755
--- a/src/graph/ReactorGraph.java
+++ b/src/graph/ReactorGraph.java
@@ -44,7 +44,7 @@ public class ReactorGraph {
CLUSTER_PATTERNS.put("Maven Resolver",
Pattern.compile("^org\\.apache\\.maven\\.resolver:.*"));
CLUSTER_PATTERNS.put("Maven Implementation",
Pattern.compile("^org\\.apache\\.maven:maven-(support|impl|di|core|cli|xml|jline|logging|executor|testing):.*"));
CLUSTER_PATTERNS.put("Maven Compatibility",
Pattern.compile("^org\\.apache\\.maven:maven-(artifact|builder-support|compat|embedder|model|model-builder|plugin-api|repository-metadata|resolver-provider|settings|settings-builder|toolchain-builder|toolchain-model):.*"));
- CLUSTER_PATTERNS.put("Sisu",
Pattern.compile("(^org\\.eclipse\\.sisu:.*)|(.*:guice:.*)|(.*:javax.inject:.*)|(.*:javax.annotation-api:.*)"));
+ CLUSTER_PATTERNS.put("Sisu",
Pattern.compile("(^org\\.eclipse\\.sisu:.*)|(.*:guice:.*)|(.*:javax.inject:.*)|(.*:javax.annotation-api:.*)|(.*:aopalliance:.*)"));
CLUSTER_PATTERNS.put("Plexus",
Pattern.compile("^org\\.codehaus\\.plexus:.*"));
CLUSTER_PATTERNS.put("XML Parsing",
Pattern.compile("(.*:woodstox-core:.*)|(.*:stax2-api:.*)"));
CLUSTER_PATTERNS.put("Wagon",
Pattern.compile("^org\\.apache\\.maven\\.wagon:.*"));