[Git][java-team/equinox-bundles][master] Enabled most of the remaining bundles

Emmanuel Bourg gitlab at salsa.debian.org
Thu Jul 12 13:50:13 BST 2018


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / equinox-bundles


Commits:
a827b16a by Emmanuel Bourg at 2018-07-12T14:47:50+02:00
Enabled most of the remaining bundles

- - - - -


7 changed files:

- debian/build.xml
- debian/bundles
- debian/changelog
- debian/control
- + debian/patches/jetty-compatibility.patch
- debian/patches/osgi-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/build.xml
=====================================
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -30,7 +30,6 @@
 
   <!-- Equinox Console plug-in -->
   <target name="org.eclipse.equinox.console">
-    <!-- TODO requires org.eclipse.osgi with the ResolutionReport class from the 'supplement' directory -->
     <make-bundle name="org.eclipse.equinox.console">
       <pathelement path="/usr/share/java/org.apache.felix.gogo.runtime.jar"/>
     </make-bundle>
@@ -73,17 +72,29 @@
     </make-bundle>
   </target>
 
+  <!-- Equinox Jetty Http Service -->
   <target name="org.eclipse.equinox.http.jetty" depends="org.eclipse.equinox.http.servlet">
-    <make-bundle name="org.eclipse.equinox.http.jetty" depends="org.eclipse.equinox.http.servlet"/>
+    <make-bundle name="org.eclipse.equinox.http.jetty" depends="org.eclipse.equinox.http.servlet">
+      <pathelement path="/usr/share/java/jetty9-http.jar"/>
+      <pathelement path="/usr/share/java/jetty9-server.jar"/>
+      <pathelement path="/usr/share/java/jetty9-servlet.jar"/>
+      <pathelement path="/usr/share/java/jetty9-util.jar"/>
+    </make-bundle>
+  </target>
+
+  <!-- Equinox Jetty Http Service Starter -->
+  <target name="org.eclipse.equinox.http.jetty.starter" depends="org.eclipse.equinox.http.jetty">
+    <make-bundle name="org.eclipse.equinox.http.jetty.starter" depends="org.eclipse.equinox.http.jetty"/>
   </target>
 
-  <!-- Http Service Registry Extensions -->
+  <!-- Equinox Http Service Registry Extensions -->
   <target name="org.eclipse.equinox.http.registry" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry">
     <make-bundle name="org.eclipse.equinox.http.registry" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry"/>
   </target>
 
-  <target name="org.eclipse.equinox.http.servletbridge" depends="org.eclipse.equinox.http.servlet">
-    <make-bundle name="org.eclipse.equinox.http.servletbridge" depends="org.eclipse.equinox.http.servlet"/>
+  <!-- Equinox Servletbridge Http Service -->
+  <target name="org.eclipse.equinox.http.servletbridge" depends="org.eclipse.equinox.http.servlet,org.eclipse.equinox.servletbridge">
+    <make-bundle name="org.eclipse.equinox.http.servletbridge" depends="org.eclipse.equinox.http.servlet,org.eclipse.equinox.servletbridge"/>
   </target>
 
   <!-- Equinox IO Connector Service -->
@@ -145,7 +156,6 @@
 
   <!-- Equinox Transformer Hook Framework Extension -->
   <target name="org.eclipse.equinox.transforms.hook">
-    <!-- TODO requires org.eclipse.osgi with the classes from the 'container' directory -->
     <make-bundle name="org.eclipse.equinox.transforms.hook"/>
   </target>
 
@@ -171,7 +181,6 @@
 
   <!-- Equinox Weaving Hook -->
   <target name="org.eclipse.equinox.weaving.hook">
-    <!-- TODO requires org.eclipse.osgi with the classes from the 'container' directory -->
     <make-bundle name="org.eclipse.equinox.weaving.hook"/>
   </target>
 


=====================================
debian/bundles
=====================================
--- a/debian/bundles
+++ b/debian/bundles
@@ -1,26 +1,33 @@
 # List of bundles to build
-#org.eclipse.equinox.app
-#org.eclipse.equinox.bidi
+org.eclipse.equinox.app
+org.eclipse.equinox.bidi
 org.eclipse.equinox.cm
 org.eclipse.equinox.common
 org.eclipse.equinox.concurrent
+org.eclipse.equinox.console
 org.eclipse.equinox.coordinator
 org.eclipse.equinox.device
-#org.eclipse.equinox.ds
+org.eclipse.equinox.ds
 org.eclipse.equinox.event
-#org.eclipse.equinox.http.jetty
-#org.eclipse.equinox.http.registry
-#org.eclipse.equinox.http.servlet
+org.eclipse.equinox.http.jetty
+org.eclipse.equinox.http.jetty.starter
+org.eclipse.equinox.http.registry
+org.eclipse.equinox.http.servlet
+org.eclipse.equinox.http.servletbridge
 org.eclipse.equinox.io
 org.eclipse.equinox.ip
 org.eclipse.equinox.jsp.jasper
-#org.eclipse.equinox.jsp.jasper.registry
+org.eclipse.equinox.jsp.jasper.registry
 org.eclipse.equinox.metatype
-#org.eclipse.equinox.preferences
-#org.eclipse.equinox.registry
+org.eclipse.equinox.preferences
+org.eclipse.equinox.registry
 org.eclipse.equinox.region
-#org.eclipse.equinox.security
+org.eclipse.equinox.security
 org.eclipse.equinox.servletbridge
+org.eclipse.equinox.transforms.hook
+org.eclipse.equinox.transforms.xslt
 org.eclipse.equinox.useradmin
 org.eclipse.equinox.util
+org.eclipse.equinox.weaving.caching
+org.eclipse.equinox.weaving.hook
 org.eclipse.equinox.wireadmin


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+equinox-bundles (4.7.3-2) UNRELEASED; urgency=medium
+
+  * Enabled most of the remaining bundles
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 Jul 2018 14:15:32 +0200
+
 equinox-bundles (4.7.3-1) unstable; urgency=medium
 
   * Initial release (Closes: #903575)


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,10 @@ Build-Depends:
  debhelper (>= 11~),
  default-jdk,
  libcommons-fileupload-java,
-# libeclipse-core-jobs-java,
- libequinox-osgi-java,
+ libeclipse-core-jobs-java,
+ libeclipse-osgi-java,
  libfelix-gogo-runtime-java,
+ libjetty9-java,
  libosgi-compendium-java,
  libservlet3.1-java,
  libtomcat8-java,
@@ -19,29 +20,29 @@ Vcs-Git: https://salsa.debian.org/java-team/equinox-bundles.git
 Vcs-Browser: https://salsa.debian.org/java-team/equinox-bundles
 Homepage: http://www.eclipse.org/equinox/bundles/
 
-#Package: libequinox-app-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle:Depends}
-#Description: Eclipse Equinox Application Container
-# The Equinox Bundles project is tasked with implementing all add-on services
-# detailed in the OSGi specifications including the output of the various OSGi
-# Expert groups. In addition, the bundles component team defines and produces
-# bundles and services that are of general utility to OSGi systems and
-# programmers.
-# .
-# This package contains the org.eclipse.equinox.app bundle.
-
-#Package: libequinox-bidi-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle:Depends}
-#Description: Eclipse Equinox Bidirectional Text Support
-# The Equinox Bundles project is tasked with implementing all add-on services
-# detailed in the OSGi specifications including the output of the various OSGi
-# Expert groups. In addition, the bundles component team defines and produces
-# bundles and services that are of general utility to OSGi systems and
-# programmers.
-# .
-# This package contains the org.eclipse.equinox.bidi bundle.
+Package: libequinox-app-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Application Container
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.app bundle.
+
+Package: libequinox-bidi-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Bidirectional Text Support
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.bidi bundle.
 
 Package: libequinox-cm-java
 Architecture: all
@@ -79,6 +80,18 @@ Description: Eclipse Equinox Concurrent API
  .
  This package contains the org.eclipse.equinox.concurrent bundle.
 
+Package: libequinox-console-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Console plug-in
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.console bundle.
+
 Package: libequinox-coordinator-java
 Architecture: all
 Depends: ${misc:Depends}, ${bundle:Depends}
@@ -103,6 +116,18 @@ Description: Eclipse Equinox Device Access Service
  .
  This package contains the org.eclipse.equinox.device bundle.
 
+Package: libequinox-ds-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Declarative Services
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.ds bundle.
+
 Package: libequinox-event-java
 Architecture: all
 Depends: ${misc:Depends}, ${bundle:Depends}
@@ -115,17 +140,65 @@ Description: Eclipse Equinox Event Admin
  .
  This package contains the org.eclipse.equinox.event bundle.
 
-#Package: libequinox-http-registry-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle:Depends}
-#Description: Eclipse Equinox HTTP Registry
-# The Equinox Bundles project is tasked with implementing all add-on services
-# detailed in the OSGi specifications including the output of the various OSGi
-# Expert groups. In addition, the bundles component team defines and produces
-# bundles and services that are of general utility to OSGi systems and
-# programmers.
-# .
-# This package contains the org.eclipse.equinox.http.registry bundle.
+Package: libequinox-http-jetty-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}, libjetty9-java
+Description: Eclipse Equinox Jetty HTTP Service
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.http.jetty bundle.
+
+Package: libequinox-http-jetty-starter-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Jetty HTTP Service Starter
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.http.jetty.starter bundle.
+
+Package: libequinox-http-registry-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox HTTP Registry
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.http.registry bundle.
+
+Package: libequinox-http-servlet-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox HTTP Services Servlet
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.http.servlet bundle.
+
+Package: libequinox-http-servletbridge-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Servletbridge HTTP Service
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.http.servletbridge bundle.
 
 Package: libequinox-io-java
 Architecture: all
@@ -163,17 +236,17 @@ Description: Eclipse Equinox Jasper Jsp Support Bundle
  .
  This package contains the org.eclipse.equinox.jsp.jasper bundle.
 
-#Package: libequinox-jsp-jasper-registry-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle:Depends}
-#Description: Eclipse Equinox Jasper Jsp Registry Support Plug-in
-# The Equinox Bundles project is tasked with implementing all add-on services
-# detailed in the OSGi specifications including the output of the various OSGi
-# Expert groups. In addition, the bundles component team defines and produces
-# bundles and services that are of general utility to OSGi systems and
-# programmers.
-# .
-# This package contains the org.eclipse.equinox.jsp.jasper.registry bundle.
+Package: libequinox-jsp-jasper-registry-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Jasper Jsp Registry Support Plug-in
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.jsp.jasper.registry bundle.
 
 Package: libequinox-metatype-java
 Architecture: all
@@ -187,17 +260,17 @@ Description: Eclipse Equinox Meta Type
  .
  This package contains the org.eclipse.equinox.metatype bundle.
 
-#Package: libequinox-preferences-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle:Depends}
-#Description: Eclipse Preferences Mechanism
-# The Equinox Bundles project is tasked with implementing all add-on services
-# detailed in the OSGi specifications including the output of the various OSGi
-# Expert groups. In addition, the bundles component team defines and produces
-# bundles and services that are of general utility to OSGi systems and
-# programmers.
-# .
-# This package contains the org.eclipse.equinox.preferences bundle.
+Package: libequinox-preferences-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Preferences Mechanism
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.preferences bundle.
 
 Package: libequinox-region-java
 Architecture: all
@@ -211,29 +284,29 @@ Description: Eclipse Equinox Region
  .
  This package contains the org.eclipse.equinox.region bundle.
 
-#Package: libequinox-registry-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle:Depends}
-#Description: Eclipse Extension Registry Support
-# The Equinox Bundles project is tasked with implementing all add-on services
-# detailed in the OSGi specifications including the output of the various OSGi
-# Expert groups. In addition, the bundles component team defines and produces
-# bundles and services that are of general utility to OSGi systems and
-# programmers.
-# .
-# This package contains the org.eclipse.equinox.registry bundle.
-
-#Package: libequinox-security-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle:Depends}
-#Description: Eclipse Equinox Java Authentication and Authorization Service (JAAS)
-# The Equinox Bundles project is tasked with implementing all add-on services
-# detailed in the OSGi specifications including the output of the various OSGi
-# Expert groups. In addition, the bundles component team defines and produces
-# bundles and services that are of general utility to OSGi systems and
-# programmers.
-# .
-# This package contains the org.eclipse.equinox.security bundle.
+Package: libequinox-registry-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Extension Registry Support
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.registry bundle.
+
+Package: libequinox-security-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Java Authentication and Authorization Service (JAAS)
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.security bundle.
 
 Package: libequinox-servletbridge-java
 Architecture: all
@@ -247,6 +320,30 @@ Description: Eclipse Equinox Servletbridge
  .
  This package contains the org.eclipse.equinox.servletbridge bundle.
 
+Package: libequinox-transforms-hook-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Transformer Hook Framework Extension
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.transforms.hook bundle.
+
+Package: libequinox-transforms-xslt-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Transforms XSLT
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.transforms.xslt bundle.
+
 Package: libequinox-useradmin-java
 Architecture: all
 Depends: ${misc:Depends}, ${bundle:Depends}
@@ -271,6 +368,30 @@ Description: Eclipse Equinox Util
  .
  This package contains the org.eclipse.equinox.util bundle.
 
+Package: libequinox-weaving-caching-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Weaving Caching
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.weaving.caching bundle.
+
+Package: libequinox-weaving-hook-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle:Depends}
+Description: Eclipse Equinox Weaving Hook
+ The Equinox Bundles project is tasked with implementing all add-on services
+ detailed in the OSGi specifications including the output of the various OSGi
+ Expert groups. In addition, the bundles component team defines and produces
+ bundles and services that are of general utility to OSGi systems and
+ programmers.
+ .
+ This package contains the org.eclipse.equinox.weaving.hook bundle.
+
 Package: libequinox-wireadmin-java
 Architecture: all
 Depends: ${misc:Depends}, ${bundle:Depends}


=====================================
debian/patches/jetty-compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/jetty-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of Jetty in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
++++ b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
+@@ -217,7 +217,7 @@
+ 		contextWorkDir.mkdir();
+ 		httpContext.setAttribute(CONTEXT_TEMPDIR, contextWorkDir);
+ 		SessionHandler handler = new SessionHandler();
+-		handler.setMaxInactiveInterval(Details.getInt(dictionary, JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL, -1));
++		handler.getSessionManager().setMaxInactiveInterval(Details.getInt(dictionary, JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL, -1));
+ 		httpContext.setSessionHandler(handler);
+ 
+ 		return httpContext;


=====================================
debian/patches/osgi-compatibility.patch
=====================================
--- a/debian/patches/osgi-compatibility.patch
+++ b/debian/patches/osgi-compatibility.patch
@@ -1,14 +1,14 @@
 Description: Fixes the compatibility with the version of the OSGi specification in Debian
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
---- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
-+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
-@@ -67,7 +67,7 @@
- 		boolean shouldRegister = !"false".equalsIgnoreCase(context.getProperty(PROP_REGISTER_PERF_SERVICE)); //$NON-NLS-1$
- 		if (shouldRegister) {
- 			preferencesService = bundleContext.registerService(IPreferencesService.class, PreferencesService.getDefault(), new Hashtable<String, Object>());
--			osgiPreferencesService = bundleContext.registerService(org.osgi.service.prefs.PreferencesService.class, new OSGiPreferencesServiceManager(bundleContext), null);
-+			osgiPreferencesService = bundleContext.registerService(org.osgi.service.prefs.PreferencesService.class, (org.osgi.service.prefs.PreferencesService) new OSGiPreferencesServiceManager(bundleContext), null);
- 		}
- 		// use the string for the class name here in case the registry isn't around
- 		registryServiceTracker = new ServiceTracker<>(bundleContext, "org.eclipse.core.runtime.IExtensionRegistry", this); //$NON-NLS-1$
+--- a/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/Activator.java
++++ b/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/Activator.java
+@@ -28,7 +28,7 @@
+ 		logTracker = new ServiceTracker(context, FrameworkLog.class.getName(), null);
+ 		logTracker.open();
+ 
+-		Properties properties = new Properties();
++		java.util.Dictionary<String, Object> properties = new java.util.Hashtable<String, Object>();
+ 		properties.put("equinox.transformerType", "xslt"); //$NON-NLS-1$ //$NON-NLS-2$
+ 
+ 		Object transformer = new XSLTStreamTransformer(logTracker);


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 osgi-compatibility.patch
+jetty-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/equinox-bundles/commit/a827b16a49fad6804cebdec50fa1441d53e88f77

-- 
View it on GitLab: https://salsa.debian.org/java-team/equinox-bundles/commit/a827b16a49fad6804cebdec50fa1441d53e88f77
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/20180712/397562ac/attachment.html>


More information about the pkg-java-commits mailing list