This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new c2107c26e3 Replace javax.annotation-api with jakarta.annotation-api
1.3.5
c2107c26e3 is described below
commit c2107c26e36a3e12bf045d82fcff103b9beb85e0
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Oct 25 20:05:22 2026 +0100
Replace javax.annotation-api with jakarta.annotation-api 1.3.5
javax.annotation-api's parent declares the shut-down maven.java.net
repositories. The jakarta 1.3.x jar keeps the javax.annotation
packages. It is dual-licensed EPL-2.0 or GPL-2.0 with Classpath
Exception; the distribution elects EPL-2.0. maven-core keeps exporting
the javax coordinates for plugins and extensions that declare them.
---
apache-maven/pom.xml | 4 ++--
apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 6 ++++--
pom.xml | 8 ++++----
src/graph/ReactorGraph.java | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ac06080e0f..87df1ad227 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -126,8 +126,8 @@ under the License.
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- DI Runtime -->
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index 2f95d5d771..af50f94620 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -231,7 +231,8 @@ subject to the terms and conditions of the following
licenses:
#**##foreach ( $license in $project.licenses ) ##
#* *##set ( $groupId = $project.artifact.groupId ) ##
#* *##set ( $directory = 'lib' ) ##
-#* *##if ( !$apacheMavenGroupIds.contains( $groupId ) )
+#* *### jakarta.annotation-api is dual-licensed EPL-2.0 OR GPL-2.0 with
Classpath Exception: distributed under EPL-2.0
+#* *##if ( !$apacheMavenGroupIds.contains( $groupId ) && $license.name !=
"GPL2 w/ CPE" )
#* *### advertise about each non-Maven dependency
#* *###
#* *### infer SPDX license id
@@ -240,7 +241,8 @@ subject to the terms and conditions of the following
licenses:
#* *##elseif ( $license.name == "Eclipse Public License, Version 1.0" )
#* *##set ( $spdx = 'EPL-1.0' ) ##
#* *##elseif ( $license.name == "Eclipse Public License, Version 2.0"
- || $license.url.contains(
"https://www.eclipse.org/legal/epl-v20.html"; ) )
+ || $license.url.contains(
"https://www.eclipse.org/legal/epl-v20.html"; )
+ || $license.url.contains( "www.eclipse.org/legal/epl-2.0"
) )
#* *##set ( $spdx = 'EPL-2.0' ) ##
#* *##elseif ( $license.url.contains( "www.apache.org/licenses/LICENSE-2.0"
)
|| $license.url.contains(
"https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt"; ) )
diff --git a/pom.xml b/pom.xml
index 3495634608..b28a0960a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@ under the License.
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<jakartaInjectApiVersion>2.0.1</jakartaInjectApiVersion>
- <javaxAnnotationApiVersion>1.3.2</javaxAnnotationApiVersion>
+ <jakartaAnnotationApiVersion>1.3.5</jakartaAnnotationApiVersion>
<jlineVersion>4.4.8</jlineVersion>
<jmhVersion>1.37</jmhVersion>
<junitVersion>6.1.3</junitVersion>
@@ -406,9 +406,9 @@ under the License.
</exclusions>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javaxAnnotationApiVersion}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakartaAnnotationApiVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
diff --git a/src/graph/ReactorGraph.java b/src/graph/ReactorGraph.java
index 162f14d603..5959ffff4d 100755
--- a/src/graph/ReactorGraph.java
+++ b/src/graph/ReactorGraph.java
@@ -44,7 +44,7 @@ public class ReactorGraph {
CLUSTER_PATTERNS.put("Maven Resolver 2",
Pattern.compile("^org\\.apache\\.maven\\.resolver:.*"));
CLUSTER_PATTERNS.put("Maven 4 Implementation",
Pattern.compile("^org\\.apache\\.maven:maven-(support|impl|di|core|cli|xml|jline|logging|executor|testing|classworlds):.*"));
CLUSTER_PATTERNS.put("Maven 3 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:.*)|(.*:aopalliance:.*)"));
+ CLUSTER_PATTERNS.put("Sisu",
Pattern.compile("(^org\\.eclipse\\.sisu:.*)|(.*:guice:.*)|(.*:javax.inject:.*)|(.*:jakarta.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:.*"));
