From 9878b40fb3531bee47b148b1a4dc3129709a7a86 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 18 Dec 2021 11:05:57 +0100 Subject: [PATCH] Drop noinstantiate, noreference --- pom.xml | 13 ------------- .../graph/internal/maven30/ConflictResolver.java | 12 ++++++------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 4a3c3fa..08fc42f 100644 --- a/pom.xml +++ b/pom.xml @@ -187,19 +187,6 @@ org.apache.maven.shared.dependency.graph* - - - - noinstantiate - a - Restriction: - - - noreference - a - Restriction: - - diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/maven30/ConflictResolver.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/maven30/ConflictResolver.java index 5770d63..329c028 100644 --- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/maven30/ConflictResolver.java +++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/maven30/ConflictResolver.java @@ -743,7 +743,7 @@ private boolean deriveOptional( DependencyNode node, Object conflictId ) * A context used to hold information that is relevant for deriving the scope of a child dependency. * * @see ScopeDeriver - * @noinstantiate This class is not intended to be instantiated by clients in production code, the constructor may + * This class is not intended to be instantiated by clients in production code, the constructor may * change without notice and only exists to enable unit testing. */ public static final class ScopeContext @@ -760,7 +760,7 @@ public static final class ScopeContext * * @param parentScope The scope of the parent dependency, may be {@code null}. * @param childScope The scope of the child dependency, may be {@code null}. - * @noreference This class is not intended to be instantiated by clients in production code, the constructor may + * This class is not intended to be instantiated by clients in production code, the constructor may * change without notice and only exists to enable unit testing. */ public ScopeContext( String parentScope, String childScope ) @@ -818,7 +818,7 @@ public void setDerivedScope( String derivedScope ) /** * A conflicting dependency. * - * @noinstantiate This class is not intended to be instantiated by clients in production code, the constructor may + * This class is not intended to be instantiated by clients in production code, the constructor may * change without notice and only exists to enable unit testing. */ public static final class ConflictItem @@ -878,7 +878,7 @@ public static final class ConflictItem * of {@link ConflictResolver.ConflictItem#OPTIONAL_TRUE} and * {@link ConflictResolver.ConflictItem#OPTIONAL_FALSE}. * @param scopes The derived scopes of the conflicting dependency, must not be {@code null}. - * @noreference This class is not intended to be instantiated by clients in production code, the constructor may + * This class is not intended to be instantiated by clients in production code, the constructor may * change without notice and only exists to enable unit testing. */ public ConflictItem( DependencyNode parent, DependencyNode node, int depth, int optionalities, @@ -1000,7 +1000,7 @@ public String toString() * * @see VersionSelector * @see ScopeSelector - * @noinstantiate This class is not intended to be instantiated by clients in production code, the constructor may + * This class is not intended to be instantiated by clients in production code, the constructor may * change without notice and only exists to enable unit testing. */ public static final class ConflictContext @@ -1035,7 +1035,7 @@ public static final class ConflictContext * {@code null}. * @param conflictIds The mapping from dependency node to conflict id, must not be {@code null}. * @param items The conflict items in this context, must not be {@code null}. - * @noreference This class is not intended to be instantiated by clients in production code, the constructor may + * This class is not intended to be instantiated by clients in production code, the constructor may * change without notice and only exists to enable unit testing. */ public ConflictContext( DependencyNode root, Object conflictId, Map conflictIds,