[Git][java-team/libnb-platform-java][master] 5 commits: Update platform-osgi-update.patch
Markus Koschany
gitlab at salsa.debian.org
Fri Jan 25 12:29:01 GMT 2019
Markus Koschany pushed to branch master at Debian Java Maintainers / libnb-platform-java
Commits:
19b37a09 by Markus Koschany at 2019-01-24T18:47:19Z
Update platform-osgi-update.patch
- - - - -
11c61285 by Markus Koschany at 2019-01-25T11:20:19Z
Add AutoUpdate-NEVER.patch and set the defaultCheckInterval to NEVER to
prevent automatic updates. This can be changed by users individually.
Closes: #842284
- - - - -
1eb77eeb by Markus Koschany at 2019-01-25T11:22:15Z
Update changelog
- - - - -
4dc58bee by Markus Koschany at 2019-01-25T12:06:28Z
Tighten dependency on libequinox-osgi-java.
- - - - -
046f815c by Markus Koschany at 2019-01-25T12:14:51Z
Remove antlr-runtime symlink because it is not platform specific.
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/linked-jars
- + debian/patches/AutoUpdate-NEVER.patch
- debian/patches/platform-osgi-update.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+libnb-platform18-java (10.0-2) unstable; urgency=medium
+
+ * Update platform-osgi-update.patch and return an
+ UnsupportedOperationException instead of a NULL pointer.
+ * Add AutoUpdate-NEVER.patch and set the defaultCheckInterval to NEVER to
+ prevent automatic updates. This can be changed by users individually.
+ (Closes: #842284)
+ * Remove antlr-runtime symlink because it is not platform specific.
+
+ -- Markus Koschany <apo at debian.org> Fri, 25 Jan 2019 12:21:05 +0100
+
libnb-platform18-java (10.0-1) unstable; urgency=medium
* New upstream version 10.0.
=====================================
debian/control
=====================================
@@ -18,7 +18,7 @@ Build-Depends:
junit4 (>= 4.6),
libasm-java (>= 7.0),
libbindex-java,
- libequinox-osgi-java (>= 3.9.1-3),
+ libequinox-osgi-java (>= 3.9.1-4),
libfelix-framework-java (>= 4.6.1),
libfelix-main-java,
libhamcrest-java,
@@ -44,7 +44,7 @@ Depends:
javahelp2,
junit4 (>= 4.6),
libasm-java (>= 7.0),
- libequinox-osgi-java,
+ libequinox-osgi-java (>= 3.9.1-4),
libfelix-framework-java (>= 4.6.1),
libfelix-main-java,
libhamcrest-java,
=====================================
debian/linked-jars
=====================================
@@ -1,6 +1,5 @@
$JAVADIR/jna-platform.jar platform/libs.jna.platform/external platform/modules/ext jna-platform-4.4.0.jar
$JAVADIR/jhall.jar platform/javahelp/external platform/modules/ext jhall-2.0_05.jar
-$JAVADIR/antlr3-runtime.jar ide/libs.antlr3.runtime/external ide/modules/ext antlr-runtime-3.4.jar
$JAVADIR/org.apache.felix.main.jar platform/libs.felix/external platform/modules/ext org.apache.felix.main-4.2.1.jar
$JAVADIR/jna.jar platform/libs.jna/external platform/modules/ext jna-4.4.0.jar
$JAVADIR/osgi.compendium.jar platform/libs.osgi/external platform/modules/ext org.osgi.compendium-4.2.0.jar
=====================================
debian/patches/AutoUpdate-NEVER.patch
=====================================
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 25 Jan 2019 12:16:10 +0100
+Subject: AutoUpdate NEVER
+
+Set the defaultCheckInterval to NEVER by default to prevent automatic updates
+which are mostly unnecessary on Debian systems. However it makes sense to
+enable it again for specific plugins. This can be changed by users individually.
+
+Bug-Debian: https://bugs.debian.org/842284
+Forwarded: not-needed
+---
+ .../org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java
+index f1eb866..bda248d 100644
+--- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java
++++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/AutoupdateSettings.java
+@@ -124,7 +124,7 @@ public class AutoupdateSettings {
+ defaultCheckInterval = parse (Utilities.getCustomCheckIntervalInMinutes ());
+ }
+ if (defaultCheckInterval == null) {
+- defaultCheckInterval = EVERY_WEEK;
++ defaultCheckInterval = NEVER;
+ }
+ err.log (Level.FINEST, "getPeriod () returns " + getPreferences ().getInt (PROP_PERIOD, defaultCheckInterval));
+ return getPreferences ().getInt (PROP_PERIOD, defaultCheckInterval);
=====================================
debian/patches/platform-osgi-update.patch
=====================================
@@ -2,33 +2,36 @@ From: Markus Koschany <apo at debian.org>
Date: Sat, 19 Jan 2019 16:54:20 +0100
Subject: osgi-update
-Compatibility patch with Debian's OSGI version.
+Compatibility patch with Debian's version of OSGi.
---
- platform/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ .../netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
diff --git a/platform/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/platform/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
-index a6a1dc1..664834b 100644
+index a6a1dc1..ce68825 100644
--- a/platform/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
+++ b/platform/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
-@@ -38,6 +38,8 @@ import org.osgi.framework.InvalidSyntaxException;
+@@ -38,6 +38,9 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.ServiceObjects;
+import org.osgi.framework.ServiceFactory;
++import java.lang.UnsupportedOperationException;
/**
*
-@@ -216,5 +218,11 @@ class Netbinox extends Equinox {
+@@ -216,5 +219,13 @@ class Netbinox extends Equinox {
public void addBundleListener(BundleListener bl) {
delegate.addBundleListener(bl);
}
++ @Override
+ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> refer) {
-+ return null;
++ throw new UnsupportedOperationException();
+ }
++ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String,?> dictio) {
-+ return null;
++ throw new UnsupportedOperationException();
+ }
} // end of Context
}
=====================================
debian/patches/series
=====================================
@@ -16,3 +16,4 @@ platform-osgi-update.patch
platform-xhr4j.patch
platform-harness-launchers.patch
platform-nbi.patch
+AutoUpdate-NEVER.patch
View it on GitLab: https://salsa.debian.org/java-team/libnb-platform-java/compare/0485a0fe883df72548252ef3a4f10b5e338837e1...046f815cb89b4017d8b78208938ff2cb9a78db9e
--
View it on GitLab: https://salsa.debian.org/java-team/libnb-platform-java/compare/0485a0fe883df72548252ef3a4f10b5e338837e1...046f815cb89b4017d8b78208938ff2cb9a78db9e
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/20190125/6bcf2dea/attachment.html>
More information about the pkg-java-commits
mailing list