This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 35c4ce003e Replace javax.annotation-api with jakarta.annotation-api
1.3.5
35c4ce003e is described below
commit 35c4ce003e72740ca15c48b10ae81c56087dc36b
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Oct 25 19:34:05 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, which leak into every build that depends on
maven-embedder. 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/src/main/appended-resources/META-INF/LICENSE.vm | 6 ++++--
maven-embedder/pom.xml | 4 ++--
pom.xml | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
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/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 8c4f57b1d8..6a95d284fd 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -98,8 +98,8 @@ under the License.
</dependency>
<!-- This is required for classpath scanning of annotated components -->
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/pom.xml b/pom.xml
index cec6efcdb7..a91140af4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,9 +320,9 @@ under the License.
<version>1</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>1.3.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
