This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8113c5139eed8a8b5f9883b5e105f820868d13f0
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Mar 15 11:27:22 2022 +0100
Do not use non released api for annotations
---
maven-core-api/pom.xml | 6 ------
.../src/main/java/org/apache/maven/api/Artifact.java | 4 ++--
.../src/main/java/org/apache/maven/api/Dependency.java | 6 +++---
.../src/main/java/org/apache/maven/api/Event.java | 2 +-
.../src/main/java/org/apache/maven/api/Exclusion.java | 2 +-
.../src/main/java/org/apache/maven/api/Listener.java | 2 +-
.../main/java/org/apache/maven/api/MojoExecution.java | 2 +-
.../src/main/java/org/apache/maven/api/Node.java | 2 +-
.../main/java/org/apache/maven/api/NodeVisitor.java | 6 ++++--
.../src/main/java/org/apache/maven/api/Project.java | 2 +-
.../java/org/apache/maven/api/RemoteRepository.java | 2 +-
.../src/main/java/org/apache/maven/api/Repository.java | 2 +-
.../src/main/java/org/apache/maven/api/Session.java | 4 ++--
.../main/java/org/apache/maven/api/SessionData.java | 6 +++---
.../api/{Listener.java => annotations/Immutable.java} | 15 +++++++--------
.../api/{Listener.java => annotations/Nonnull.java} | 18 ++++++++++++------
.../api/{Listener.java => annotations/Nullable.java} | 15 +++++++--------
.../api/{Listener.java => annotations/ThreadSafe.java} | 15 +++++++--------
.../maven/api/services/ArtifactDeployerRequest.java | 2 +-
.../maven/api/services/ArtifactFactoryRequest.java | 2 +-
.../maven/api/services/ArtifactInstallerRequest.java | 4 ++--
.../org/apache/maven/api/services/ArtifactManager.java | 2 +-
.../maven/api/services/ArtifactResolverRequest.java | 2 +-
.../org/apache/maven/api/services/BaseRequest.java | 2 +-
.../apache/maven/api/services/DependencyCollector.java | 2 +-
.../maven/api/services/DependencyCollectorRequest.java | 2 +-
.../maven/api/services/DependencyFactoryRequest.java | 2 +-
.../maven/api/services/DependencyResolverRequest.java | 4 ++--
.../org/apache/maven/api/services/ProjectBuilder.java | 2 +-
.../maven/api/services/ProjectBuilderRequest.java | 4 ++--
.../maven/api/services/ProjectBuilderResult.java | 2 +-
.../org/apache/maven/api/services/ProjectManager.java | 2 +-
.../java/org/apache/maven/api/services/Service.java | 2 +-
.../apache/maven/internal/impl/DefaultArtifact.java | 2 +-
.../maven/internal/impl/DefaultArtifactDeployer.java | 2 +-
.../maven/internal/impl/DefaultArtifactInstaller.java | 2 +-
.../maven/internal/impl/DefaultArtifactManager.java | 2 +-
.../maven/internal/impl/DefaultArtifactResolver.java | 2 +-
.../apache/maven/internal/impl/DefaultDependency.java | 4 ++--
.../internal/impl/DefaultDependencyCollector.java | 2 +-
.../maven/internal/impl/DefaultLocalRepository.java | 2 +-
.../org/apache/maven/internal/impl/DefaultProject.java | 4 ++--
.../maven/internal/impl/DefaultProjectBuilder.java | 2 +-
.../maven/internal/impl/DefaultProjectManager.java | 2 +-
.../maven/internal/impl/DefaultRemoteRepository.java | 2 +-
.../org/apache/maven/internal/impl/DefaultSession.java | 4 ++--
46 files changed, 89 insertions(+), 90 deletions(-)
diff --git a/maven-core-api/pom.xml b/maven-core-api/pom.xml
index e70bbca..46af6de 100644
--- a/maven-core-api/pom.xml
+++ b/maven-core-api/pom.xml
@@ -38,12 +38,6 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
index e00a74a..98ed400 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
@@ -19,8 +19,8 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.Immutable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Immutable;
import java.nio.file.Path;
import java.util.Optional;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
b/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
index d0a966d..ea208bf 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
@@ -19,9 +19,9 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
+import org.apache.maven.api.annotations.Immutable;
import java.util.Collection;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Event.java
b/maven-core-api/src/main/java/org/apache/maven/api/Event.java
index 77c30ae..37da3d5 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Event.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Event.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.Optional;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Exclusion.java
b/maven-core-api/src/main/java/org/apache/maven/api/Exclusion.java
index c87b99b..11922c4 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Exclusion.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Exclusion.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nullable;
public interface Exclusion
{
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
b/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
index 3d83a88..11ff825 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
/**
* A listener for session events.
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/MojoExecution.java
b/maven-core-api/src/main/java/org/apache/maven/api/MojoExecution.java
index cc0d621..1761ab9 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/MojoExecution.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/MojoExecution.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.model.Plugin;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Node.java
b/maven-core-api/src/main/java/org/apache/maven/api/Node.java
index e475268..3c4ae40 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Node.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Node.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.concurrent.Immutable;
+import org.apache.maven.api.annotations.Immutable;
import java.util.List;
import java.util.Optional;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/NodeVisitor.java
b/maven-core-api/src/main/java/org/apache/maven/api/NodeVisitor.java
index 102c13c..2f245ae 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/NodeVisitor.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/NodeVisitor.java
@@ -20,6 +20,8 @@ package org.apache.maven.api;
*/
+import org.apache.maven.api.annotations.Nonnull;
+
/**
* Defines a hierarchical visitor for collecting dependency node trees.
*
@@ -35,7 +37,7 @@ public interface NodeVisitor
* @return <code>true</code> to visit the specified dependency node's
children, <code>false</code> to skip the
* specified dependency node's children and proceed to its next
sibling
*/
- boolean enter( Node node );
+ boolean enter( @Nonnull Node node );
/**
* Ends the visit to the specified dependency node.
@@ -44,5 +46,5 @@ public interface NodeVisitor
* @return <code>true</code> to visit the specified dependency node's next
sibling, <code>false</code> to skip the
* specified dependency node's next siblings and proceed to its
parent
*/
- boolean leave( Node node );
+ boolean leave( @Nonnull Node node );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Project.java
b/maven-core-api/src/main/java/org/apache/maven/api/Project.java
index 386dda4..844d6b3 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Project.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Project.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.List;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/RemoteRepository.java
b/maven-core-api/src/main/java/org/apache/maven/api/RemoteRepository.java
index 1790b98..399c6d8 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/RemoteRepository.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/RemoteRepository.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
public interface RemoteRepository extends Repository
{
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Repository.java
b/maven-core-api/src/main/java/org/apache/maven/api/Repository.java
index dd7ac92..2f2d651 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Repository.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Repository.java
@@ -19,7 +19,7 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
public interface Repository
{
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Session.java
b/maven-core-api/src/main/java/org/apache/maven/api/Session.java
index bf484da..03955e5 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Session.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Session.java
@@ -19,8 +19,8 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.ThreadSafe;
import java.nio.file.Path;
import java.util.Arrays;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/SessionData.java
b/maven-core-api/src/main/java/org/apache/maven/api/SessionData.java
index bc4d688..7b1b9c3 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/SessionData.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/SessionData.java
@@ -19,9 +19,9 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
+import org.apache.maven.api.annotations.ThreadSafe;
import java.util.function.Supplier;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Immutable.java
similarity index 77%
copy from maven-core-api/src/main/java/org/apache/maven/api/Listener.java
copy to
maven-core-api/src/main/java/org/apache/maven/api/annotations/Immutable.java
index 3d83a88..865f8d0 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Immutable.java
@@ -1,4 +1,4 @@
-package org.apache.maven.api;
+package org.apache.maven.api.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,12 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
-/**
- * A listener for session events.
- */
-@FunctionalInterface
-public interface Listener
+@Documented
+@Retention( RetentionPolicy.CLASS )
+public @interface Immutable
{
- void onEvent( @Nonnull Event event );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Nonnull.java
similarity index 64%
copy from maven-core-api/src/main/java/org/apache/maven/api/Listener.java
copy to
maven-core-api/src/main/java/org/apache/maven/api/annotations/Nonnull.java
index 3d83a88..7b536e1 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Nonnull.java
@@ -1,4 +1,4 @@
-package org.apache.maven.api;
+package org.apache.maven.api.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,19 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
/**
- * A listener for session events.
+ * The annotated element must not be null.
+ * <p>
+ * Annotated fields must not be null after construction has completed.
+ * <p>
+ * When this annotation is applied to a method it applies to the method return
value.
*/
-@FunctionalInterface
-public interface Listener
+@Documented
+@Retention( RetentionPolicy.CLASS )
+public @interface Nonnull
{
- void onEvent( @Nonnull Event event );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Nullable.java
similarity index 77%
copy from maven-core-api/src/main/java/org/apache/maven/api/Listener.java
copy to
maven-core-api/src/main/java/org/apache/maven/api/annotations/Nullable.java
index 3d83a88..e50dc3d 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/annotations/Nullable.java
@@ -1,4 +1,4 @@
-package org.apache.maven.api;
+package org.apache.maven.api.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,12 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
-/**
- * A listener for session events.
- */
-@FunctionalInterface
-public interface Listener
+@Documented
+@Retention( RetentionPolicy.CLASS )
+public @interface Nullable
{
- void onEvent( @Nonnull Event event );
}
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
b/maven-core-api/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
similarity index 77%
copy from maven-core-api/src/main/java/org/apache/maven/api/Listener.java
copy to
maven-core-api/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
index 3d83a88..4cad589 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Listener.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
@@ -1,4 +1,4 @@
-package org.apache.maven.api;
+package org.apache.maven.api.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,12 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
-/**
- * A listener for session events.
- */
-@FunctionalInterface
-public interface Listener
+@Documented
+@Retention( RetentionPolicy.CLASS )
+public @interface ThreadSafe
{
- void onEvent( @Nonnull Event event );
}
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
index f3d865b..84a78a5 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.Collection;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
index 2a0c0c6..82cc44a 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.Session;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
index dd6874e..9a62a22 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
@@ -19,8 +19,8 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.util.Collection;
import java.util.Collections;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactManager.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactManager.java
index 48488a5..cf9e211 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactManager.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactManager.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
index b902d56..16bfee8 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.Objects;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/BaseRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/BaseRequest.java
index c5eb047..515257a 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/BaseRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/BaseRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollector.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollector.java
index 8c8cc53..2d222b7 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollector.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollector.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.Session;
import org.apache.maven.api.Artifact;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
index d3e2aaa..b2ff8d1 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyFactoryRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyFactoryRequest.java
index 85b079d..eafac2e 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyFactoryRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyFactoryRequest.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java
index 0f8c67c..e20e857 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java
@@ -19,8 +19,8 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
index 58d479c..78d10b0 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
index 2c36c56..e5f7299 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
@@ -19,8 +19,8 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.nio.file.Path;
import java.util.Optional;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
index 6476a85..ea88e02 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectManager.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectManager.java
index 3904281..f667322 100644
---
a/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectManager.java
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ProjectManager.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/Service.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/Service.java
index d43da3a..fcf8d87 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/services/Service.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/services/Service.java
@@ -19,7 +19,7 @@ package org.apache.maven.api.services;
* under the License.
*/
-import javax.annotation.concurrent.ThreadSafe;
+import org.apache.maven.api.annotations.ThreadSafe;
@ThreadSafe
public interface Service
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
index f2532f9..5ff2ff4 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.io.File;
import java.nio.file.Path;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
index 9dde305..39df5f1 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import javax.inject.Named;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
index 592e495..06a0cc4 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.util.Collection;
import java.util.List;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
index d007f93..5b4ee5d 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
index a084055..bc5b58b 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import java.util.Objects;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
index 190ab9e..c3dccd6 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
@@ -19,8 +19,8 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.util.Collection;
import java.util.Objects;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
index 74045d6..1a5efb2 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import javax.inject.Named;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
index 2207bb9..9372576 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import java.nio.file.Path;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
index 8aaf7a1..bbcc62e 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
@@ -19,8 +19,8 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.io.File;
import java.nio.file.Path;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
index 819d35d..98841c8 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import javax.inject.Inject;
import java.io.File;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
index 079d181..78ddff4 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import java.nio.file.Path;
import java.util.Collection;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java
index 68bc32d..e56d542 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java
@@ -19,7 +19,7 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
+import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.RemoteRepository;
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
index 08c296d..588f3f9 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
@@ -19,8 +19,8 @@ package org.apache.maven.internal.impl;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
import java.io.File;
import java.nio.file.Path;
