This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 46b3c2990e Adding org.eclipse.lsp4j.debug asnd
org.eclipse.lsp4j.jsonrpc.debug dependencies
new 297109f9b8 Merge pull request #5971 from albilu/master
46b3c2990e is described below
commit 46b3c2990e7734f0be53448d01281b18a855092a
Author: Al Bilu <[email protected]>
AuthorDate: Sat May 20 10:39:50 2023 +0200
Adding org.eclipse.lsp4j.debug asnd org.eclipse.lsp4j.jsonrpc.debug
dependencies
---
ide/lsp.client/external/binaries-list | 2 ++
ide/lsp.client/external/lsp4j-0.13.0-license.txt | 2 +-
ide/lsp.client/nbproject/project.properties | 4 +++-
ide/lsp.client/nbproject/project.xml | 8 ++++++++
nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 +++-
5 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ide/lsp.client/external/binaries-list
b/ide/lsp.client/external/binaries-list
index 0832017290..dd1dd5db2f 100644
--- a/ide/lsp.client/external/binaries-list
+++ b/ide/lsp.client/external/binaries-list
@@ -18,6 +18,8 @@
E95BD5C2A465A40A66C9DC098BF95C237B80C4EB
org.eclipse.lsp4j:org.eclipse.lsp4j:0.13.0
82848D7796D399F3E5109B7331A143D7C649B520
org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.13.0
0B50BD2A6AF496803F72176AD066532DAE62574E
org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.13.0
+A491B7AC91B35EC177DE629518D5A68A9C7878FC
org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.13.0
+68AB471B1FED84FABA25D6CE9005B9369B503A74
org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug:0.13.0
A57306D5D523A4750FA09B2708062EA4972AFEA2
org.eclipse.xtend:org.eclipse.xtend.lib:2.24.0
D8F5566BA67748ED9E91856E077EE99F00E86653
org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.24.0
53FBD66084B08850258E61C838CC1FB94335E718
org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.24.0
diff --git a/ide/lsp.client/external/lsp4j-0.13.0-license.txt
b/ide/lsp.client/external/lsp4j-0.13.0-license.txt
index 7ba9d3c0c4..2729106479 100644
--- a/ide/lsp.client/external/lsp4j-0.13.0-license.txt
+++ b/ide/lsp.client/external/lsp4j-0.13.0-license.txt
@@ -4,7 +4,7 @@ Version: 0.13.0
License: EPL-v20
URL: http://www.eclipse.org/
Description: Eclipse Language Server Protocol Library
-Files: org.eclipse.lsp4j-0.13.0.jar org.eclipse.lsp4j.generator-0.13.0.jar
org.eclipse.lsp4j.jsonrpc-0.13.0.jar
+Files: org.eclipse.lsp4j-0.13.0.jar org.eclipse.lsp4j.generator-0.13.0.jar
org.eclipse.lsp4j.jsonrpc-0.13.0.jar org.eclipse.lsp4j.debug-0.13.0.jar
org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/ide/lsp.client/nbproject/project.properties
b/ide/lsp.client/nbproject/project.properties
index 77cfdb51c0..eb47142d69 100644
--- a/ide/lsp.client/nbproject/project.properties
+++ b/ide/lsp.client/nbproject/project.properties
@@ -21,7 +21,9 @@ javadoc.arch=${basedir}/arch.xml
release.external/org.eclipse.lsp4j-0.13.0.jar=modules/ext/org.eclipse.lsp4j-0.13.0.jar
release.external/org.eclipse.lsp4j.generator-0.13.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.13.0.jar
release.external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
+release.external/org.eclipse.lsp4j.debug-0.13.0.jar=modules/ext/org.eclipse.lsp4j.debug-0.13.0.jar
+release.external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
release.external/org.eclipse.xtend.lib-2.24.0.jar=modules/ext/org.eclipse.xtend.lib-2.24.0.jar
release.external/org.eclipse.xtend.lib.macro-2.24.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.24.0.jar
release.external/org.eclipse.xtext.xbase.lib-2.24.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.24.0.jar
-spec.version.base=1.21.0
+spec.version.base=1.22.0
\ No newline at end of file
diff --git a/ide/lsp.client/nbproject/project.xml
b/ide/lsp.client/nbproject/project.xml
index 02825de63c..e95efcb12a 100644
--- a/ide/lsp.client/nbproject/project.xml
+++ b/ide/lsp.client/nbproject/project.xml
@@ -437,6 +437,14 @@
<runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+
<runtime-relative-path>ext/org.eclipse.lsp4j.debug-0.13.0.jar</runtime-relative-path>
+
<binary-origin>external/org.eclipse.lsp4j.debug-0.13.0.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+
<runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar</runtime-relative-path>
+
<binary-origin>external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar</binary-origin>
+ </class-path-extension>
</data>
</configuration>
</project>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index fa1b9a745d..dc8b29749b 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -24,7 +24,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar
java/performance/external/jav
# bundled maven conflicts with other libraries
java/maven.embedder/external/apache-maven-3.9.2-bin.zip
ide/slf4j.api/external/slf4j-api-1.7.36.jar
-java/maven.embedder/external/apache-maven-3.9.2-bin.zip
platform/o.apache.commons.lang3/external/commons-lang3-3.12.0.jar
+java/maven.embedder/external/apache-maven-3.9.2-bin.zip
platform/o.apache.commons.lang3/external/commons-lang3-3.12.0.jar
# Used to parse data during build, but need to as a lib for ide cluster
nbbuild/external/json-simple-1.1.1.jar
ide/libs.json_simple/external/json-simple-1.1.1.jar
@@ -75,6 +75,8 @@ enterprise/javaee7.api/external/javax.annotation-api-1.2.jar
java/maven.indexer/
# ide/lsp.client and java/java.lsp.server both use LSP libraries, but are
independent:
ide/lsp.client/external/org.eclipse.lsp4j-0.13.0.jar
java/java.lsp.server/external/org.eclipse.lsp4j-0.13.0.jar
+ide/lsp.client/external/org.eclipse.lsp4j.debug-0.13.0.jar
java/java.lsp.server/external/org.eclipse.lsp4j.debug-0.13.0.jar
+ide/lsp.client/external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
java/java.lsp.server/external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
ide/lsp.client/external/org.eclipse.lsp4j.generator-0.13.0.jar
java/java.lsp.server/external/org.eclipse.lsp4j.generator-0.13.0.jar
ide/lsp.client/external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
java/java.lsp.server/external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
ide/lsp.client/external/org.eclipse.xtend.lib-2.24.0.jar
java/java.lsp.server/external/org.eclipse.xtend.lib-2.24.0.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
