Skip to content

Build the Maven dependency tree with Maven Resolver instead of maven-dependency-tree #9694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slachiewicz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Build the Maven dependency tree with Maven Resolver instead of maven-dependency-tree #9694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions java/maven.embedder/apichanges.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@

-->
<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.1//EN" "../../nbbuild/javadoctools/apichanges-1.1.dtd">

<!--

INFO FOR PEOPLE ADDING CHANGES:

Check the DTD (apichanges.dtd) for details on the syntax. You do not
Check the DTD (apichanges-1.1.dtd) for details on the syntax. You do not
need to regenerate the HTML, as this is part of Javadoc generation; just
change the XML. Rough syntax of a change (several parts optional):

Expand Down Expand Up @@ -83,6 +83,25 @@ is the proper place.
<!-- ACTUAL CHANGES BEGIN HERE: -->

<changes>
<change id="own-dependency-tree">
<api name="general"/>
<summary>Dependency tree no longer based on maven-dependency-tree</summary>
<version major="2" minor="90"/>
<date day="9" month="10" year="2026"/>
<author login="slachiewicz"/>
<compatibility binary="incompatible" source="incompatible" semantic="compatible" deprecation="no" addition="yes" modification="yes" deletion="yes"/>
<description>
<a href="@TOP@/org/netbeans/modules/maven/embedder/DependencyTreeFactory.html">DependencyTreeFactory</a>
now builds the tree from Maven Resolver's verbose dependency graph and returns the new
<code>org.netbeans.modules.maven.embedder.tree.DependencyNode</code>, which offers the subset of the
former API that NetBeans used. The Maven Dependency Tree library is no longer bundled, and the
<code>org.apache.maven.shared.dependency.*</code> packages are no longer exported to friends.
Update imports to the new package; use the Maven Resolver API directly where the dependency graph is needed.
</description>
<class package="org.netbeans.modules.maven.embedder" name="DependencyTreeFactory"/>
<class package="org.netbeans.modules.maven.embedder.tree" name="DependencyNode"/>
<class package="org.netbeans.modules.maven.embedder.tree" name="DependencyNodeVisitor"/>
</change>
<change id="artifact-resolution">
<api name="general"/>
<summary>Multiple scopes allowed for dependency tree query</summary>
Expand Down
1 change: 0 additions & 1 deletion java/maven.embedder/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
DC15DFF8F701B227EE523EEB7A17F77C10EAFE2F org.jdom:jdom2:2.0.6.1
5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2
18E39B277439D736A03AF4C067AC51C26BCF7A95 org.apache.maven:apache-maven:3.9.16:bin@zip
208 changes: 0 additions & 208 deletions java/maven.embedder/external/maven-dependency-tree-2.2-license.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion java/maven.embedder/manifest.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven.embedder/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/embedder/Bundle.properties
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Specification-Version: 2.89
OpenIDE-Module-Specification-Version: 2.90
3 changes: 1 addition & 2 deletions java/maven.embedder/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ is.autoload=true
javac.release=17
javac.compilerargs=-Xlint -Xlint:-serial
release.external/jdom2-2.0.6.1.jar=modules/ext/maven/jdom2-2.0.6.1.jar
release.external/maven-dependency-tree-2.2.jar=modules/ext/maven/maven-dependency-tree-2.2.jar
bundled.maven=apache-maven-3.9.16
extra.module.files=maven/
nbm.executable.files=maven/bin/mvn,maven/bin/mvnDebug,maven/bin/mvnyjp
extra.license.files=${cluster}/maven/LICENSE.txt,${cluster}/maven/NOTICE.txt
module.javadoc.packages=org.netbeans.modules.maven.embedder
module.javadoc.packages=org.netbeans.modules.maven.embedder,org.netbeans.modules.maven.embedder.tree
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
jnlp.indirect.files=modules/ext/maven/rootpackage/default-report.xml,modules/ext/maven/settings.xml
Expand Down
12 changes: 1 addition & 11 deletions java/maven.embedder/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,6 @@
<package>org.apache.maven.settings.building</package>
<package>org.apache.maven.settings.crypto</package>
<package>org.apache.maven.settings.io.xpp3</package>
<package>org.apache.maven.shared.dependency.tree</package>
<package>org.apache.maven.shared.dependency.tree.traversal</package>
<package>org.apache.maven.shared.dependency.graph</package>
<package>org.apache.maven.shared.dependency.graph.filter</package>
<package>org.apache.maven.shared.dependency.graph.traversal</package>
<package>org.apache.maven.wagon</package>
<package>org.apache.maven.wagon.authentication</package>
<package>org.apache.maven.wagon.authorization</package>
Expand Down Expand Up @@ -264,6 +259,7 @@
<package>org.jdom2.util</package>
<package>org.netbeans.modules.maven.embedder</package>
<package>org.netbeans.modules.maven.embedder.exec</package>
<package>org.netbeans.modules.maven.embedder.tree</package>
<!-- maven-resolver-api -->
<package>org.eclipse.aether</package>
<package>org.eclipse.aether.artifact</package>
Expand Down Expand Up @@ -309,12 +305,6 @@
<package>org.apache.maven.wagon.shared.http</package>
<package>org.apache.maven.wagon.providers.http.wagon.shared</package>
</friend-packages>
<!-- TODO: DROP THIS BEGIN-->
<class-path-extension>
<runtime-relative-path>ext/maven/maven-dependency-tree-2.2.jar</runtime-relative-path>
<binary-origin>external/maven-dependency-tree-2.2.jar</binary-origin>
</class-path-extension>
<!-- TODO: DROP THIS END -->
<class-path-extension>
<runtime-relative-path>ext/maven/jdom2-2.0.6.1.jar</runtime-relative-path>
<binary-origin>external/jdom2-2.0.6.1.jar</binary-origin>
Expand Down
Loading
Loading