...
 
Commits (5)
netbeans (10.0-3) UNRELEASED; urgency=medium
* Drop javaewah-version.patch
* Tighten dependency on libjavaewah-java (>= 0.7.9)
* Start new changelog entry
* Disable the javafx.cluster because JavaFX will not work with OpenJDK 11 and.
Netbeans 10.
Update nb-javac.patch and hide some classes from the CLASSPATH. nb-javac needs
to override classfiles in the JDK and some OSGi metadata is only present in the
prebuilt version from the plugin portal. This has to be added to fix the
sealing violation error.
Thanks to Jan Lahoda and Jaroslav Tulach for the help and support.
(Closes: #920707)
-- Markus Koschany <apo@debian.org> Tue, 26 Feb 2019 14:10:50 +0100
netbeans (10.0-2) unstable; urgency=medium
* Replace NoJavacHelper.patch with Unsafe.patch which is much better.
......
......@@ -42,7 +42,7 @@ Build-Depends:
libhttpclient-java,
libicu4j-4.4-java,
libini4j-java,
libjavaewah-java,
libjavaewah-java (>= 0.7.9),
libjaxb-api-java,
libjaxb-java,
libjemmy2-java,
......@@ -124,6 +124,7 @@ Depends:
libhttpclient-java,
libicu4j-4.4-java,
libini4j-java,
libjavaewah-java (>= 0.7.9),
libjaxb-api-java,
libjaxb-java,
libjgit-java,
......
......@@ -22,10 +22,10 @@ index 7f9a3f9..f490274 100644
refactoring.java,\
server,\
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 3fef8df..8cd7dbb 100644
index fcb4f94..a3d34f1 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -277,8 +277,6 @@ nb.cluster.ide=\
@@ -276,8 +276,6 @@ nb.cluster.ide=\
c.google.gson,\
c.google.guava,\
c.googlecode.javaewah.JavaEWAH,\
......@@ -34,7 +34,7 @@ index 3fef8df..8cd7dbb 100644
code.analysis,\
core.browser,\
core.ide,\
@@ -345,7 +343,6 @@ nb.cluster.ide=\
@@ -344,7 +342,6 @@ nb.cluster.ide=\
extexecution.impl,\
extexecution.process,\
extexecution.process.jdk9,\
......@@ -42,7 +42,7 @@ index 3fef8df..8cd7dbb 100644
gototest,\
gsf.codecoverage,\
gsf.testrunner,\
@@ -381,10 +378,8 @@ nb.cluster.ide=\
@@ -380,10 +377,8 @@ nb.cluster.ide=\
libs.commons_compress,\
libs.commons_net,\
libs.freemarker,\
......@@ -53,7 +53,7 @@ index 3fef8df..8cd7dbb 100644
libs.json_simple,\
libs.jvyamlb,\
libs.lucene,\
@@ -401,8 +396,6 @@ nb.cluster.ide=\
@@ -400,8 +395,6 @@ nb.cluster.ide=\
o.apache.commons.logging,\
o.apache.ws.commons.util,\
o.apache.xml.resolver,\
......
......@@ -29,10 +29,10 @@ index e752f61..2328cb1 100644
<code-name-base>org.netbeans.modules.editor.bookmarks</code-name-base>
<run-dependency>
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 8cd7dbb..5816595 100644
index a3d34f1..b8b01ad 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -300,9 +300,6 @@ nb.cluster.ide=\
@@ -299,9 +299,6 @@ nb.cluster.ide=\
dbapi,\
defaults,\
diff,\
......
From: Markus Koschany <apo@debian.org>
Date: Wed, 16 Jan 2019 01:15:34 +0100
Subject: javaewah-version
Should JavaEWAH be updated?
---
ide/o.eclipse.jgit/nbproject/project.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ide/o.eclipse.jgit/nbproject/project.xml b/ide/o.eclipse.jgit/nbproject/project.xml
index b3b7a73..fa92725 100644
--- a/ide/o.eclipse.jgit/nbproject/project.xml
+++ b/ide/o.eclipse.jgit/nbproject/project.xml
@@ -34,7 +34,7 @@
<code-name-base>com.googlecode.javaewah.JavaEWAH</code-name-base>
<compile-dependency/>
<run-dependency>
- <specification-version>0.7.9</specification-version>
+ <specification-version>0.6.12</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
......@@ -6,25 +6,27 @@ The nb-javac module is not properly detected by Netbeans. Only when we add
these jar files from libnb-javaparser-java to the Class-Path it works. However
now there is another problem, a security exception: sealing violation
---
java/libs.javacapi/manifest.mf | 1 +
java/libs.javacimpl/manifest.mf | 1 +
2 files changed, 2 insertions(+)
java/libs.javacapi/manifest.mf | 2 ++
java/libs.javacimpl/manifest.mf | 2 ++
2 files changed, 4 insertions(+)
diff --git a/java/libs.javacapi/manifest.mf b/java/libs.javacapi/manifest.mf
index 5177edf..1f11b0a 100644
index 5177edf..6fc60ab 100644
--- a/java/libs.javacapi/manifest.mf
+++ b/java/libs.javacapi/manifest.mf
@@ -4,3 +4,4 @@ OpenIDE-Module-Implementation-Version: 3
@@ -4,3 +4,5 @@ OpenIDE-Module-Implementation-Version: 3
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javacapi/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/libs/javacapi/layer.xml
OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2
+Class-Path: ext/nb-javac-9-api.jar
+OpenIDE-Module-Hide-Classpath-Packages: com.sun.javadoc.**, com.sun.source.**, javax.annotation.processing.**, javax.lang.model.**, javax.tools.**, com.sun.tools.javac.** com.sun.tools.javac.**, com.sun.tools.javadoc.**, com.sun.tools.javap.**, com.sun.tools.classfile.**, com.sun.tools.doclint.**
diff --git a/java/libs.javacimpl/manifest.mf b/java/libs.javacimpl/manifest.mf
index b7e1087..8a6914d 100644
index b7e1087..bb47220 100644
--- a/java/libs.javacimpl/manifest.mf
+++ b/java/libs.javacimpl/manifest.mf
@@ -3,3 +3,4 @@ OpenIDE-Module: org.netbeans.libs.javacimpl/1
@@ -3,3 +3,5 @@ OpenIDE-Module: org.netbeans.libs.javacimpl/1
OpenIDE-Module-Implementation-Version: 25
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javacimpl/Bundle.properties
OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2
+Class-Path: ext/nb-javac-9-impl.jar
+OpenIDE-Module-Hide-Classpath-Packages: com.sun.tools.javac.**, com.sun.tools.javadoc.**, com.sun.tools.javap.**, com.sun.tools.classfile.**, com.sun.tools.doclint.**
......@@ -11,10 +11,10 @@ Netbeans 8.1.
1 file changed, 1 deletion(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 5816595..dc1c802 100644
index b8b01ad..fb41c76 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -388,7 +388,6 @@ nb.cluster.ide=\
@@ -387,7 +387,6 @@ nb.cluster.ide=\
notifications,\
o.apache.commons.codec,\
o.apache.commons.httpclient,\
......
......@@ -20,7 +20,6 @@ netbeans-javacc.patch
netbeans-dlight.nativeexecution.patch
netbeans-extexecution.patch
netbeans-libs.jaxb.patch
javaewah-version.patch
xml.wsdl.model.patch
netbeans-CommandLineParser.patch
osgi-update.patch
......