You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/12/18 10:09:33 UTC
[maven-dependency-tree] branch next updated (8d1ec3e -> 86641fd)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git.
discard 8d1ec3e Drop noinstantiate
new 86641fd Drop noinstantiate, noreference
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8d1ec3e)
\
N -- N -- N refs/heads/next (86641fd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven-verify.yml | 29 ----------------------
.../graph/internal/maven30/ConflictResolver.java | 6 ++---
2 files changed, 3 insertions(+), 32 deletions(-)
delete mode 100644 .github/workflows/maven-verify.yml
[maven-dependency-tree] 01/01: Drop noinstantiate, noreference
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git
commit 86641fd129f5e615336a69146177d872c221d50b
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Dec 18 11:05:57 2021 +0100
Drop noinstantiate, noreference
---
.github/workflows/maven-verify.yml | 29 ----------------------
pom.xml | 13 ----------
.../graph/internal/maven30/ConflictResolver.java | 12 ++++-----
3 files changed, 6 insertions(+), 48 deletions(-)
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
deleted file mode 100644
index 7a38e97..0000000
--- a/.github/workflows/maven-verify.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: Verify
-
-on:
- push:
- branches-ignore:
- - dependabot/**
- pull_request:
-
-jobs:
- build:
- name: Verify
- uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v1
diff --git a/pom.xml b/pom.xml
index 4a3c3fa..08fc42f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,19 +187,6 @@
<packages>org.apache.maven.shared.dependency.graph*</packages>
</group>
</groups>
- <tags>
- <!-- from org.eclipse.aether:aether:1.1.0 -->
- <tag>
- <name>noinstantiate</name>
- <placement>a</placement>
- <head>Restriction:</head>
- </tag>
- <tag>
- <name>noreference</name>
- <placement>a</placement>
- <head>Restriction:</head>
- </tag>
- </tags>
</configuration>
</plugin>
</plugins>
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 @@ public final class ConflictResolver
* 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 final class ConflictResolver
*
* @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 final class ConflictResolver
/**
* 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 final class ConflictResolver
* 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 final class ConflictResolver
*
* @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 final class ConflictResolver
* {@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<DependencyNode, Object> conflictIds,