Skip to content

Commit 5aab15e

Browse files
Achal1607Achal1607
committed
some more changes
1 parent 5e222ca commit 5aab15e

File tree

2 files changed

+42
-147
lines changed

2 files changed

+42
-147
lines changed

‎build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
patches/upgrade-lsp4j.diff
9090
patches/updated-show-input-params.diff
9191
patches/java-notebooks.diff
92+
patches/magic-command.diff
9293
</string>
9394
<filterchain>
9495
<tokenfilter delimoutput=" ">

‎patches/magic-command.diff‎

Lines changed: 41 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@
127127
+ }
128128
+ }
129129
+}
130-
# This patch file was generated by NetBeans IDE
131-
# It uses platform neutral UTF-8 encoding and \n newlines.
132130
--- a/java/maven.embedder/nbproject/project.xml
133131
+++ b/java/maven.embedder/nbproject/project.xml
134132
@@ -149,13 +149,20 @@
@@ -153,7 +151,7 @@
153151
<friend>org.netbeans.modules.jbi.fuji.support</friend>
154152
<friend>org.netbeans.modules.maven</friend>
155153
<friend>org.netbeans.modules.maven.apisupport</friend>
156-
@@ -175,95 +182,25 @@
154+
@@ -175,6 +182,11 @@
157155
<friend>org.netbeans.modules.maven.refactoring</friend>
158156
<friend>org.netbeans.modules.maven.repository</friend>
159157
<friend>org.netbeans.modules.maven.search</friend>
@@ -165,155 +163,18 @@
165163
<friend>org.netbeans.modules.selenium.maven</friend>
166164
<friend>org.netbeans.modules.selenium2.maven</friend>
167165
<friend>org.netbeans.modules.testng.maven</friend>
168-
- <!-- radim kubacki -->
169-
- <friend>org.netbeans.modules.android.maven</friend>
170-
- <!-- danis@netbeans.org -->
171-
<friend>org.vaadin.netbeans.maven</friend>
172-
- <friend>org.netbeans.modules.payara.tooling</friend>
173-
- <friend>org.netbeans.modules.payara.micro</friend>
174-
- <friend>org.netbeans.modules.jakarta.transformer</friend>
175-
- <!-- NetBeans support for Google App Engine -->
176-
- <friend>org.netbeans.modules.j2ee.appengine</friend>
177-
- <friend>org.netbeans.modules.maven.util</friend>
178-
- <friend>io.github.jeddict.jcode.util</friend>
179-
- <friend>io.github.jeddict.runtime</friend>
180-
- <friend>io.github.jeddict.rest.generator</friend>
181-
- <!-- XXX <subpackages> not permitted by schema -->
182-
- <friend>org.netbeans.modules.micronaut</friend>
183-
- <package>com.google.inject</package>
184-
- <package>com.google.common.base</package>
185-
- <package>org.apache.maven</package>
186-
- <package>org.apache.maven.artifact</package>
187-
- <package>org.apache.maven.artifact.factory</package>
188-
- <package>org.apache.maven.artifact.handler.manager</package>
189-
- <package>org.apache.maven.artifact.handler</package>
190-
- <package>org.apache.maven.artifact.metadata</package>
191-
- <package>org.apache.maven.artifact.repository</package>
192-
- <package>org.apache.maven.artifact.repository.layout</package>
193-
- <package>org.apache.maven.artifact.repository.metadata.io.xpp3</package>
194-
- <package>org.apache.maven.artifact.repository.metadata</package>
195-
- <package>org.apache.maven.artifact.resolver.filter</package>
196-
- <package>org.apache.maven.artifact.resolver</package>
197-
- <package>org.apache.maven.artifact.versioning</package>
198-
- <package>org.apache.maven.building</package>
199-
- <package>org.apache.maven.cli</package>
200-
- <package>org.apache.maven.cli.configuration</package>
201-
- <package>org.apache.maven.embedder</package>
202-
- <package>org.apache.maven.execution</package>
203-
- <package>org.apache.maven.lifecycle</package>
204-
- <package>org.apache.maven.lifecycle.mapping</package>
205-
- <package>org.apache.maven.lifecycle.model</package>
206-
- <package>org.apache.maven.lifecycle.plan</package>
207-
- <package>org.apache.maven.model</package>
208-
- <package>org.apache.maven.model.building</package>
209-
- <package>org.apache.maven.model.io</package>
210-
- <package>org.apache.maven.model.io.xpp3</package>
211-
- <package>org.apache.maven.model.resolution</package>
212-
- <package>org.apache.maven.plugin</package>
213-
- <package>org.apache.maven.profiles</package>
214-
- <package>org.apache.maven.profiles.io.xpp3</package>
215-
- <package>org.apache.maven.project</package>
216-
- <package>org.apache.maven.project.path</package>
217-
- <package>org.apache.maven.repository</package>
218-
- <package>org.apache.maven.repository.legacy</package>
219-
- <package>org.apache.maven.settings</package>
220-
- <package>org.apache.maven.settings.building</package>
221-
- <package>org.apache.maven.settings.crypto</package>
222-
- <package>org.apache.maven.settings.io.xpp3</package>
223-
- <package>org.apache.maven.shared.dependency.tree</package>
224-
- <package>org.apache.maven.shared.dependency.tree.traversal</package>
225-
<package>org.apache.maven.shared.dependency.graph</package>
226-
<package>org.apache.maven.shared.dependency.graph.filter</package>
227-
<package>org.apache.maven.shared.dependency.graph.traversal</package>
228-
- <package>org.apache.maven.wagon</package>
229-
- <package>org.apache.maven.wagon.authentication</package>
230-
- <package>org.apache.maven.wagon.authorization</package>
231-
- <package>org.apache.maven.wagon.events</package>
232-
- <package>org.apache.maven.wagon.providers.file</package>
233-
- <package>org.apache.maven.wagon.providers.http</package>
234-
- <package>org.apache.maven.wagon.proxy</package>
235-
- <package>org.apache.maven.wagon.repository</package>
236-
- <package>org.apache.maven.wagon.resource</package>
237-
- <package>org.codehaus.plexus</package>
238-
- <package>org.codehaus.plexus.classworlds</package>
239-
- <package>org.codehaus.plexus.classworlds.realm</package>
240-
- <package>org.codehaus.plexus.component.annotations</package>
241-
- <package>org.codehaus.plexus.component.composition</package>
242-
- <package>org.codehaus.plexus.component.configurator.expression</package>
243-
- <package>org.codehaus.plexus.component.repository</package>
244-
- <package>org.codehaus.plexus.component.repository.exception</package>
245-
- <package>org.codehaus.plexus.configuration</package>
246-
- <package>org.codehaus.plexus.configuration.xml</package>
247-
- <package>org.codehaus.plexus.logging</package>
248-
- <package>org.codehaus.plexus.util</package>
249-
- <package>org.codehaus.plexus.util.cli</package>
250-
- <package>org.codehaus.plexus.util.dag</package>
251-
- <package>org.codehaus.plexus.util.introspection</package>
252-
- <package>org.codehaus.plexus.util.xml</package>
253-
- <package>org.codehaus.plexus.util.xml.pull</package>
254-
+ <package>org.apache.maven.shared.dependency.tree</package>
255-
+ <package>org.apache.maven.shared.dependency.tree.traversal</package>
166+
@@ -247,6 +259,11 @@
167+
<package>org.apache.maven.wagon.proxy</package>
168+
<package>org.apache.maven.wagon.repository</package>
169+
<package>org.apache.maven.wagon.resource</package>
256170
+ <package>org.apache.maven.artifact</package>
257171
+ <package>org.apache.maven.execution</package>
258172
+ <package>org.apache.maven.project</package>
259173
+ <package>org.eclipse.aether.transfer</package>
260174
+ <package>org.eclipse.aether</package>
261-
<package>org.jdom2</package>
262-
<package>org.jdom2.filter</package>
263-
<package>org.jdom2.input</package>
264-
@@ -272,52 +209,7 @@
265-
<package>org.jdom2.util</package>
266-
<package>org.netbeans.modules.maven.embedder</package>
267-
<package>org.netbeans.modules.maven.embedder.exec</package>
268-
- <!-- maven-resolver-api -->
269-
- <package>org.eclipse.aether</package>
270-
- <package>org.eclipse.aether.artifact</package>
271-
- <package>org.eclipse.aether.collection</package>
272-
- <package>org.eclipse.aether.deployment</package>
273-
- <package>org.eclipse.aether.graph</package>
274-
- <package>org.eclipse.aether.installation</package>
275-
- <package>org.eclipse.aether.metadata</package>
276-
- <package>org.eclipse.aether.repository</package>
277-
- <package>org.eclipse.aether.resolution</package>
278-
- <package>org.eclipse.aether.transfer</package>
279-
- <package>org.eclipse.aether.version</package>
280-
- <!-- maven-resolver-spi -->
281-
- <package>org.eclipse.aether.spi</package>
282-
- <package>org.eclipse.aether.spi.checksums</package>
283-
- <package>org.eclipse.aether.spi.connector</package>
284-
- <package>org.eclipse.aether.spi.connector.checksum</package>
285-
- <package>org.eclipse.aether.spi.connector.filter</package>
286-
- <package>org.eclipse.aether.spi.connector.layout</package>
287-
- <package>org.eclipse.aether.spi.connector.transport</package>
288-
- <package>org.eclipse.aether.spi.io</package>
289-
- <package>org.eclipse.aether.spi.localrepo</package>
290-
- <package>org.eclipse.aether.spi.resolution</package>
291-
- <package>org.eclipse.aether.spi.synccontext</package>
292-
- <!-- maven-resolver-util -->
293-
- <package>org.eclipse.aether.util</package>
294-
- <package>org.eclipse.aether.util.artifact</package>
295-
- <package>org.eclipse.aether.util.concurrency</package>
296-
- <package>org.eclipse.aether.util.filter</package>
297-
- <package>org.eclipse.aether.util.graph</package>
298-
- <package>org.eclipse.aether.util.graph.manager</package>
299-
- <package>org.eclipse.aether.util.graph.selector</package>
300-
- <package>org.eclipse.aether.util.graph.transformer</package>
301-
- <package>org.eclipse.aether.util.graph.traverser</package>
302-
- <package>org.eclipse.aether.util.graph.version</package>
303-
- <package>org.eclipse.aether.util.graph.visitor</package>
304-
- <package>org.eclipse.aether.util.listener</package>
305-
- <package>org.eclipse.aether.util.repository</package>
306-
- <package>org.eclipse.aether.util.version</package>
307-
-
308-
- <package>org.sonatype.plexus.components.cipher</package>
309-
- <package>org.sonatype.plexus.components.sec.dispatcher</package>
310-
- <package>org.apache.maven.wagon.shared.http</package>
311-
- <package>org.apache.maven.wagon.providers.http.wagon.shared</package>
312-
</friend-packages>
313-
- <!-- TODO: DROP THIS BEGIN-->
314-
<class-path-extension>
315-
<runtime-relative-path>ext/maven/maven-dependency-tree-2.2.jar</runtime-relative-path>
316-
<binary-origin>external/maven-dependency-tree-2.2.jar</binary-origin>
175+
<package>org.codehaus.plexus</package>
176+
<package>org.codehaus.plexus.classworlds</package>
177+
<package>org.codehaus.plexus.classworlds.realm</package>
317178
--- a/java/java.lsp.server/nbproject/project.xml
318179
+++ b/java/java.lsp.server/nbproject/project.xml
319180
@@ -479,6 +479,15 @@
@@ -332,3 +193,36 @@
332193
<code-name-base>org.netbeans.modules.nativeimage.api</code-name-base>
333194
<build-prerequisite/>
334195
<compile-dependency/>
196+
diff --git a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java
197+
index ff021ac6f7..f59cfea0f1 100644
198+
--- a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java
199+
+++ b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java
200+
@@ -109,6 +109,7 @@ import org.eclipse.aether.util.repository.DefaultAuthenticationSelector;
201+
import org.eclipse.aether.util.repository.DefaultMirrorSelector;
202+
import org.eclipse.aether.util.repository.DefaultProxySelector;
203+
import org.netbeans.modules.maven.embedder.impl.NbVersionResolver2;
204+
+import org.eclipse.aether.transfer.AbstractTransferListener;
205+
206+
/**
207+
* Handle for the embedded Maven system, used to parse POMs and more.
208+
@@ -438,6 +439,20 @@ public final class MavenEmbedder {
209+
return res;
210+
}
211+
212+
+ public ProjectBuildingResult buildProject(Artifact art, ProjectBuildingRequest req, AbstractTransferListener listener) throws ProjectBuildingException {
213+
+ if (req.getLocalRepository() == null) {
214+
+ req.setLocalRepository(this.getLocalRepository());
215+
+ }
216+
+
217+
+ MavenExecutionRequest request = this.createMavenExecutionRequest();
218+
+ req.setProcessPlugins(false);
219+
+ request.setTransferListener(listener);
220+
+ req.setRepositorySession(this.maven.newRepositorySession(request));
221+
+ ProjectBuildingResult res = this.projectBuilder.build(art, req);
222+
+ normalizePaths(res.getProject());
223+
+ return res;
224+
+ }
225+
+
226+
public MavenExecutionResult execute(MavenExecutionRequest req) {
227+
return maven.execute(req);
228+
}

0 commit comments

Comments
 (0)