[Git][java-team/netbeans][master] 5 commits: Drop javaewah-version.patch
Markus Koschany
gitlab at salsa.debian.org
Tue Feb 26 14:11:03 GMT 2019
Markus Koschany pushed to branch master at Debian Java Maintainers / netbeans
Commits:
195f179b by Markus Koschany at 2019-02-12T13:32:43Z
Drop javaewah-version.patch
- - - - -
8180fc4d by Markus Koschany at 2019-02-12T13:33:43Z
Tighten dependency on libjavaewah-java (>= 0.7.9)
- - - - -
f9dcf274 by Markus Koschany at 2019-02-12T13:34:00Z
Start new changelog entry
- - - - -
c97572a8 by Markus Koschany at 2019-02-26T13:06:25Z
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.
Closes: #920707
Thanks: Jan Lahoda and Jaroslav Tulach for the help and support.
- - - - -
dffb2370 by Markus Koschany at 2019-02-26T13:11:00Z
Update changelog
- - - - -
9 changed files:
- debian/changelog
- debian/control
- debian/patches/disable-Git-support.patch
- debian/patches/disable-nativeexecution-module.patch
- − debian/patches/javaewah-version.patch
- debian/patches/nb-javac.patch
- debian/patches/netbeans-cluster-properties.patch
- debian/patches/o.apache.commons.io.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+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 at 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.
=====================================
debian/control
=====================================
@@ -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,
=====================================
debian/patches/disable-Git-support.patch
=====================================
@@ -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,\
=====================================
debian/patches/disable-nativeexecution-module.patch
=====================================
@@ -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,\
=====================================
debian/patches/javaewah-version.patch deleted
=====================================
@@ -1,22 +0,0 @@
-From: Markus Koschany <apo at 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>
=====================================
debian/patches/nb-javac.patch
=====================================
@@ -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.**
=====================================
debian/patches/netbeans-cluster-properties.patch
=====================================
@@ -5,8 +5,8 @@ Subject: netbeans-cluster-properties
Disable unsupported clusters.
---
nbbuild/build.properties | 4 --
- nbbuild/cluster.properties | 127 +--------------------------------------------
- 2 files changed, 1 insertion(+), 130 deletions(-)
+ nbbuild/cluster.properties | 128 +--------------------------------------------
+ 2 files changed, 1 insertion(+), 131 deletions(-)
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
index 545ba04..7f9a3f9 100644
@@ -38,7 +38,7 @@ index 545ba04..7f9a3f9 100644
masterfs,\
masterfs.ui,\
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 8fdc4fb..3fef8df 100644
+index 8fdc4fb..fcb4f94 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -22,7 +22,6 @@ clusters.prefix=libnb
@@ -65,13 +65,13 @@ index 8fdc4fb..3fef8df 100644
nb.cluster.php,\
nb.cluster.websvccommon,\
nb.cluster.nb
-@@ -89,15 +86,12 @@ clusters.config.java.list=\
+@@ -89,15 +86,11 @@ clusters.config.java.list=\
${clusters.config.platform.list},\
nb.cluster.ide,\
nb.cluster.extide,\
- nb.cluster.websvccommon,\
nb.cluster.java,\
- nb.cluster.javafx,\
+- nb.cluster.javafx,\
- nb.cluster.profiler,\
nb.cluster.nb
@@ -81,7 +81,7 @@ index 8fdc4fb..3fef8df 100644
nb.cluster.enterprise
clusters.config.identity.list=\
-@@ -114,7 +108,6 @@ clusters.config.jdev.list=\
+@@ -114,7 +107,6 @@ clusters.config.jdev.list=\
nb.cluster.extide,\
nb.cluster.websvccommon,\
nb.cluster.java,\
@@ -89,7 +89,7 @@ index 8fdc4fb..3fef8df 100644
nb.cluster.jira,\
nb.cluster.odcs
-@@ -281,10 +274,6 @@ nb.cluster.ide=\
+@@ -281,10 +273,6 @@ nb.cluster.ide=\
api.java.classpath,\
api.xml,\
api.xml.ui,\
@@ -100,7 +100,7 @@ index 8fdc4fb..3fef8df 100644
c.google.gson,\
c.google.guava,\
c.googlecode.javaewah.JavaEWAH,\
-@@ -292,7 +281,6 @@ nb.cluster.ide=\
+@@ -292,7 +280,6 @@ nb.cluster.ide=\
c.jcraft.jzlib,\
code.analysis,\
core.browser,\
@@ -108,7 +108,7 @@ index 8fdc4fb..3fef8df 100644
core.ide,\
core.multitabs.project,\
csl.api,\
-@@ -313,7 +301,6 @@ nb.cluster.ide=\
+@@ -313,7 +300,6 @@ nb.cluster.ide=\
db.sql.visualeditor,\
dbapi,\
defaults,\
@@ -116,7 +116,7 @@ index 8fdc4fb..3fef8df 100644
diff,\
dlight.nativeexecution,\
dlight.nativeexecution.nb,\
-@@ -369,8 +356,6 @@ nb.cluster.ide=\
+@@ -369,8 +355,6 @@ nb.cluster.ide=\
html.editor.lib,\
html.lexer,\
html.parser,\
@@ -125,7 +125,7 @@ index 8fdc4fb..3fef8df 100644
hudson,\
hudson.git,\
hudson.mercurial,\
-@@ -403,15 +388,11 @@ nb.cluster.ide=\
+@@ -403,15 +387,11 @@ nb.cluster.ide=\
libs.json_simple,\
libs.jvyamlb,\
libs.lucene,\
@@ -141,7 +141,7 @@ index 8fdc4fb..3fef8df 100644
notifications,\
o.apache.commons.codec,\
o.apache.commons.httpclient,\
-@@ -420,29 +401,8 @@ nb.cluster.ide=\
+@@ -420,29 +400,8 @@ nb.cluster.ide=\
o.apache.commons.logging,\
o.apache.ws.commons.util,\
o.apache.xml.resolver,\
@@ -171,7 +171,7 @@ index 8fdc4fb..3fef8df 100644
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -478,7 +438,6 @@ nb.cluster.ide=\
+@@ -478,7 +437,6 @@ nb.cluster.ide=\
spellchecker.apimodule,\
spellchecker.bindings.htmlxml,\
spellchecker.bindings.properties,\
@@ -179,7 +179,7 @@ index 8fdc4fb..3fef8df 100644
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -540,7 +499,6 @@ nb.cluster.java.depends=\
+@@ -540,7 +498,6 @@ nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.extide,\
nb.cluster.platform,\
@@ -187,7 +187,7 @@ index 8fdc4fb..3fef8df 100644
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -550,7 +508,6 @@ nb.cluster.java=\
+@@ -550,7 +507,6 @@ nb.cluster.java=\
ant.kit,\
api.debugger.jpda,\
api.java,\
@@ -195,7 +195,7 @@ index 8fdc4fb..3fef8df 100644
beans,\
classfile,\
dbschema,\
-@@ -561,8 +518,6 @@ nb.cluster.java=\
+@@ -561,8 +517,6 @@ nb.cluster.java=\
debugger.jpda.kit,\
debugger.jpda.projects,\
debugger.jpda.projectsui,\
@@ -204,7 +204,7 @@ index 8fdc4fb..3fef8df 100644
debugger.jpda.ui,\
debugger.jpda.visual,\
editor.htmlui,\
-@@ -572,18 +527,14 @@ nb.cluster.java=\
+@@ -572,18 +526,14 @@ nb.cluster.java=\
form.nb,\
form.refactoring,\
hudson.ant,\
@@ -223,7 +223,7 @@ index 8fdc4fb..3fef8df 100644
j2ee.persistenceapi,\
java.api.common,\
java.completion,\
-@@ -633,40 +584,14 @@ nb.cluster.java=\
+@@ -633,40 +583,14 @@ nb.cluster.java=\
javaee.injection,\
javawebstart,\
jellytools.java,\
@@ -264,7 +264,7 @@ index 8fdc4fb..3fef8df 100644
nashorn.execution,\
performance,\
performance.java,\
-@@ -674,18 +599,12 @@ nb.cluster.java=\
+@@ -674,18 +598,12 @@ nb.cluster.java=\
projectimport.eclipse.j2se,\
refactoring.java,\
selenium2.java,\
@@ -283,7 +283,7 @@ index 8fdc4fb..3fef8df 100644
whitelist,\
xml.jaxb,\
xml.tools.java
-@@ -702,13 +621,10 @@ nb.cluster.apisupport.depends=\
+@@ -702,13 +620,10 @@ nb.cluster.apisupport.depends=\
nb.cluster.harness
nb.cluster.apisupport=\
apisupport.ant,\
@@ -297,7 +297,7 @@ index 8fdc4fb..3fef8df 100644
timers
nb.cluster.enterprise.dir=enterprise
-@@ -716,8 +632,6 @@ nb.cluster.enterprise.depends=\
+@@ -716,8 +631,6 @@ nb.cluster.enterprise.depends=\
nb.cluster.java,\
nb.cluster.ide,\
nb.cluster.extide,\
@@ -306,7 +306,7 @@ index 8fdc4fb..3fef8df 100644
nb.cluster.websvccommon,\
nb.cluster.platform,\
nb.cluster.harness
-@@ -767,8 +681,6 @@ nb.cluster.enterprise=\
+@@ -767,8 +680,6 @@ nb.cluster.enterprise=\
libs.elimpl,\
libs.glassfish_logging,\
libs.jstl,\
@@ -315,7 +315,7 @@ index 8fdc4fb..3fef8df 100644
performance.javaee,\
performance.scripting,\
performance.web,\
-@@ -843,7 +755,6 @@ nb.cluster.nb.depends=\
+@@ -843,7 +754,6 @@ nb.cluster.nb.depends=\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -323,7 +323,7 @@ index 8fdc4fb..3fef8df 100644
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
-@@ -873,7 +784,6 @@ nb.cluster.profiler=\
+@@ -873,7 +783,6 @@ nb.cluster.profiler=\
lib.profiler.charts,\
lib.profiler.common,\
lib.profiler.ui,\
@@ -331,7 +331,7 @@ index 8fdc4fb..3fef8df 100644
profiler,\
profiler.api,\
profiler.attach,\
-@@ -898,7 +808,6 @@ nb.cluster.php.depends=\
+@@ -898,7 +807,6 @@ nb.cluster.php.depends=\
nb.cluster.platform,\
nb.cluster.ide,\
nb.cluster.extide,\
@@ -339,7 +339,7 @@ index 8fdc4fb..3fef8df 100644
nb.cluster.websvccommon
nb.cluster.php=\
hudson.php,\
-@@ -955,9 +864,7 @@ nb.cluster.groovy=\
+@@ -955,9 +863,7 @@ nb.cluster.groovy=\
groovy.kit,\
groovy.refactoring,\
groovy.samples,\
@@ -350,7 +350,7 @@ index 8fdc4fb..3fef8df 100644
nb.cluster.mobility.dir=mobility
nb.cluster.mobility.depends=\
-@@ -1058,7 +965,6 @@ nb.cluster.cnd=\
+@@ -1058,7 +964,6 @@ nb.cluster.cnd=\
cnd.utils,\
cnd.utils.ui,\
jellytools.cnd,\
@@ -358,7 +358,7 @@ index 8fdc4fb..3fef8df 100644
libs.dbx.support
validation.nb.cluster.cnd=\
cnd.kit
-@@ -1112,8 +1018,6 @@ nb.cluster.jira=\
+@@ -1112,8 +1017,6 @@ nb.cluster.jira=\
o.apache.axis,\
o.apache.commons.discovery,\
o.codehaus.jettison,\
@@ -367,7 +367,7 @@ index 8fdc4fb..3fef8df 100644
o.joda.time
nb.cluster.team.dir=extra
-@@ -1122,7 +1026,6 @@ nb.cluster.team.depends=\
+@@ -1122,7 +1025,6 @@ nb.cluster.team.depends=\
nb.cluster.platform,\
nb.cluster.ide
nb.cluster.team=\
@@ -375,7 +375,7 @@ index 8fdc4fb..3fef8df 100644
c.tasktop.c2c.server.cloud.api,\
c.tasktop.c2c.server.common.api,\
c.tasktop.c2c.server.profile.api,\
-@@ -1131,7 +1034,6 @@ nb.cluster.team=\
+@@ -1131,7 +1033,6 @@ nb.cluster.team=\
c.tasktop.c2c.server.wiki.api,\
kenai,\
kenai.kit,\
@@ -383,7 +383,7 @@ index 8fdc4fb..3fef8df 100644
kenai.ui,\
lib.cvsclient,\
o.codehaus.jackson.core,\
-@@ -1208,7 +1110,6 @@ nb.cluster.stableuc=\
+@@ -1208,7 +1109,6 @@ nb.cluster.stableuc=\
libs.oracle.cloud,\
libs.ppawtlayout,\
loadgenerator,\
@@ -391,7 +391,7 @@ index 8fdc4fb..3fef8df 100644
mobility.antext,\
mobility.cldcplatform.catalog,\
mobility.deployment.ftpscp,\
-@@ -1281,7 +1182,6 @@ nb.cluster.betauc=\
+@@ -1281,7 +1181,6 @@ nb.cluster.betauc=\
contrib/modulemanager,\
contrib/quickfilechooser,\
contrib/selenium,\
@@ -399,7 +399,7 @@ index 8fdc4fb..3fef8df 100644
contrib/selenium.php,\
contrib/selenium.server,\
o.apache.jmeter.module,\
-@@ -1423,9 +1323,6 @@ nb.cluster.webcommon=\
+@@ -1423,9 +1322,6 @@ nb.cluster.webcommon=\
cordova.platforms,\
cordova.platforms.android,\
extbrowser.chrome,\
@@ -409,7 +409,7 @@ index 8fdc4fb..3fef8df 100644
javascript.bower,\
javascript.cdnjs,\
javascript.grunt,\
-@@ -1435,30 +1332,10 @@ nb.cluster.webcommon=\
+@@ -1435,30 +1331,10 @@ nb.cluster.webcommon=\
javascript.nodejs,\
javascript.v8debug,\
javascript.v8debug.ui,\
@@ -440,7 +440,7 @@ index 8fdc4fb..3fef8df 100644
libs.plist,\
netserver,\
selenium2.webclient,\
-@@ -1512,11 +1389,9 @@ nb.cluster.javafx.depends=\
+@@ -1512,11 +1388,9 @@ nb.cluster.javafx.depends=\
nb.cluster.extide,\
nb.cluster.platform,\
nb.cluster.java,\
=====================================
debian/patches/o.apache.commons.io.patch
=====================================
@@ -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,\
=====================================
debian/patches/series
=====================================
@@ -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
View it on GitLab: https://salsa.debian.org/java-team/netbeans/compare/07bdb220d2a1cf63ec50705261247ad38a106dc8...dffb2370029751a9c254e69f29735c12fc4dc06e
--
View it on GitLab: https://salsa.debian.org/java-team/netbeans/compare/07bdb220d2a1cf63ec50705261247ad38a106dc8...dffb2370029751a9c254e69f29735c12fc4dc06e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190226/6eed5aca/attachment.html>
More information about the pkg-java-commits
mailing list