diff --git a/eclipse-ecf-feature-deps.patch b/eclipse-ecf-feature-deps.patch index f4f8917..d1f2370 100644 --- a/eclipse-ecf-feature-deps.patch +++ b/eclipse-ecf-feature-deps.patch @@ -1,9 +1,22 @@ ---- releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml.orig 2016-03-15 12:16:43.331358322 +0000 -+++ releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml 2016-03-15 12:18:02.362383644 +0000 -@@ -34,32 +34,11 @@ - version="0.0.0" - unpack="false"/> +--- releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml.orig 2018-05-15 10:08:53.167669287 +0100 ++++ releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml 2018-05-15 10:10:29.460140752 +0100 +@@ -27,6 +27,10 @@ + + + ++ ++ ++ ++ + + +- - -+ -+ -+ -+ -+ -+ + unpack="false"/> --- releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml.orig 2016-09-15 16:17:49.933927862 +0100 @@ -63,31 +70,33 @@ unpack="false"/> ---- releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml.orig 2016-12-04 06:16:14.000000000 +0000 -+++ releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml 2017-01-04 12:03:11.312697101 +0000 -@@ -30,6 +30,7 @@ +--- releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml.orig 2018-05-15 10:06:12.993548459 +0100 ++++ releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml 2018-05-15 10:06:50.070344950 +0100 +@@ -32,6 +32,7 @@ -+ ++ - +- unpack="false"/> +- - -- +- version="0.0.0" + unpack="false"/> + --- releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml.orig 2016-12-04 06:16:14.000000000 +0000 +++ releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml 2017-01-04 12:05:48.238868061 +0000 -@@ -48,11 +48,4 @@ +@@ -50,11 +50,4 @@ version="0.0.0" unpack="false"/> diff --git a/eclipse-ecf.spec b/eclipse-ecf.spec index 57603e9..54701ab 100644 --- a/eclipse-ecf.spec +++ b/eclipse-ecf.spec @@ -4,7 +4,7 @@ # bootstrapping %global __requires_exclude .*org\.eclipse\.equinox.* -%global git_tag cbdbf69e0efb4fc0e1261d5280562bc42861ef52 +%global git_tag 61bbda32a81cab934bca838321dc8238cf494aa8 # Set this flag to avoid building additional providers when their # dependencies are not available @@ -14,8 +14,8 @@ %bcond_with bootstrap Name: eclipse-ecf -Version: 3.13.8 -Release: 2%{?dist} +Version: 3.14.0 +Release: 1%{?dist} Summary: Eclipse Communication Framework (ECF) Eclipse plug-in License: EPL @@ -25,13 +25,12 @@ Source0: http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.ec # Change how feature deps are specified, to avoid embedding versions Patch0: eclipse-ecf-feature-deps.patch -# These imports are provided by the system bundle because they are part of the JRE -Patch1: remove-unnecessary-imports.patch +# Support changes for OSGi R7 +Patch1: osgi-r7-support.patch BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: maven-plugin-build-helper -BuildRequires: eclipse-filesystem BuildRequires: eclipse-license BuildRequires: osgi-annotation BuildRequires: xpp3-minimal @@ -57,7 +56,6 @@ compliant implementation of the OSGi Remote Services standard. %package core Summary: Eclipse ECF Core -Requires: eclipse-filesystem Requires: httpcomponents-client Requires: httpcomponents-core @@ -88,13 +86,7 @@ find . -type f -name "*.jar" -exec rm {} \; find . -type f -name "*.class" -exec rm {} \; %patch0 -%patch1 - -# Relax dep on asm -sed -i -e 's/org.objectweb.asm;.*,/org.objectweb.asm,/' \ - protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF -sed -i -e '/org.objectweb.asm/s/compatible/greaterOrEqual/' \ - releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml +%patch1 -p1 # Correction for content of runtime package %pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.presence']" releng/features/org.eclipse.ecf.core/feature.xml @@ -153,8 +145,10 @@ sed -i -e '/examples/d' -e '/tests/d' pom.xml # Use system libs ln -s $(build-classpath osgi-annotation) osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/osgi/osgi.annotation.jar +%if %{with providers} ln -s $(build-classpath xpp3-minimal) protocols/bundles/org.jivesoftware.smack/jars/xpp.jar ln -s $(build-classpath irclib) providers/bundles/org.eclipse.ecf.provider.irc/lib/irclib.jar +%endif %if %{with bootstrap} # Only build core modules when bootstrapping @@ -174,11 +168,19 @@ ln -s $(build-classpath irclib) providers/bundles/org.eclipse.ecf.provider.irc/l providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl " -%mvn_package "::jar:{sources,sources-feature}:" __noinstall %endif +# TODO: Figure out why this is necessary.... +sed -i -e '/Require-Bundle:/a\ org.eclipse.osgi.services,' framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF + +# Don't install poms %mvn_package "::{pom,target}::" __noinstall + +%if %{with bootstrap} +%mvn_package "::jar:{sources,sources-feature}:" __noinstall +%else %mvn_package "::jar:{sources,sources-feature}:" sdk +%endif %mvn_package ":org.eclipse.ecf.{core,sdk}" sdk %mvn_package ":org.eclipse.ecf.docshare*" sdk for p in $(grep ' - 3.14.0-1 +- Update to Photon release + * Wed Feb 07 2018 Fedora Release Engineering - 3.13.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/osgi-r7-support.patch b/osgi-r7-support.patch new file mode 100644 index 0000000..74aa7ab --- /dev/null +++ b/osgi-r7-support.patch @@ -0,0 +1,137 @@ +From a32814514f8ca2ae14fff1cbb8468efea62017ae Mon Sep 17 00:00:00 2001 +From: slewis +Date: Thu, 26 Apr 2018 12:47:29 -0700 +Subject: Fix for improper push to master. + +Change-Id: I878c8386626e40bdbee4b74e8018bd3a524b85f8 +--- + .../eclipse/ecf/core/util/SystemLogService.java | 22 ++++++++++++++++++++++ + .../ethz/iks/slp/impl/OSGiPlatformAbstraction.java | 21 +++++++++++++++++++++ + .../remoteservice/eventadmin/LogTracker.java | 22 ++++++++++++++++++++++ + 3 files changed, 65 insertions(+) + +diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java +index 7826b08..5524d06 100644 +--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java ++++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java +@@ -13,8 +13,10 @@ package org.eclipse.ecf.core.util; + + import java.text.SimpleDateFormat; + import java.util.Date; ++import org.osgi.framework.Bundle; + import org.osgi.framework.ServiceReference; + import org.osgi.service.log.LogService; ++import org.osgi.service.log.Logger; + + /** + * +@@ -100,4 +102,24 @@ public class SystemLogService implements LogService { + doLog(sr, level, message, exception); + } + ++ public Logger getLogger(String name) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Logger getLogger(Class clazz) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(String name, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(Class clazz, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(Bundle bundle, String name, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ + } +diff --git a/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java b/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java +index cc74014..8dc99d8 100644 +--- a/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java ++++ b/protocols/bundles/ch.ethz.iks.slp/src/main/java/ch/ethz/iks/slp/impl/OSGiPlatformAbstraction.java +@@ -23,6 +23,7 @@ import org.osgi.framework.ServiceEvent; + import org.osgi.framework.ServiceListener; + import org.osgi.framework.ServiceReference; + import org.osgi.service.log.LogService; ++import org.osgi.service.log.Logger; + + import ch.ethz.iks.slp.impl.filter.Filter; + +@@ -217,5 +218,25 @@ public class OSGiPlatformAbstraction implements PlatformAbstraction, + log(null, level, message, t); + } + ++ public Logger getLogger(String name) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Logger getLogger(Class clazz) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(String name, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(Class clazz, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(Bundle bundle, String name, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ + } + } +diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java +index 3bdf952..08f68e1 100644 +--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java ++++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/src/org/eclipse/ecf/internal/remoteservice/eventadmin/LogTracker.java +@@ -14,9 +14,11 @@ import java.io.PrintStream; + import java.util.Calendar; + import java.util.Date; + ++import org.osgi.framework.Bundle; + import org.osgi.framework.BundleContext; + import org.osgi.framework.ServiceReference; + import org.osgi.service.log.LogService; ++import org.osgi.service.log.Logger; + import org.osgi.util.tracker.ServiceTracker; + + /** +@@ -62,6 +64,26 @@ public class LogTracker extends ServiceTracker implements LogService { + log(reference, level, message, null); + } + ++ public Logger getLogger(String name) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Logger getLogger(Class clazz) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(String name, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(Class clazz, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public L getLogger(Bundle bundle, String name, Class loggerType) { ++ throw new UnsupportedOperationException(); ++ } ++ + public synchronized void log(ServiceReference reference, int level, + String message, Throwable exception) { + ServiceReference[] references = getServiceReferences(); +-- +cgit v1.1 + + diff --git a/remove-unnecessary-imports.patch b/remove-unnecessary-imports.patch deleted file mode 100644 index 54f9b6c..0000000 --- a/remove-unnecessary-imports.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF.orig 2017-06-15 12:16:20.353223891 +0100 -+++ server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF 2017-06-15 12:16:44.296971311 +0100 -@@ -19,10 +19,8 @@ - Export-Package: org.eclipse.ecf.internal.server.generic;version="6.0.0";x-internal:=true, - org.eclipse.ecf.server.generic;version="7.1.0", - org.eclipse.ecf.server.generic.app;version="6.0.0" --Import-Package: javax.xml.parsers, -- org.osgi.framework, -+Import-Package: org.osgi.framework, - org.osgi.service.log, -- org.osgi.util.tracker, -- org.w3c.dom -+ org.osgi.util.tracker - Bundle-RequiredExecutionEnvironment: J2SE-1.4 - Bundle-ActivationPolicy: lazy ---- osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF.orig 2017-06-15 12:19:47.211041775 +0100 -+++ osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF 2017-06-15 12:19:59.472912427 +0100 -@@ -11,8 +11,7 @@ - org.eclipse.ecf.osgi.services.remoteserviceadmin;version="1.3.0" - Require-Bundle: org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy;bundle-version="1.0.0", - org.eclipse.equinox.common --Import-Package: javax.xml.parsers, -- org.eclipse.ecf.core;version="3.0.0", -+Import-Package: org.eclipse.ecf.core;version="3.0.0", - org.eclipse.ecf.core.events;version="3.1.0", - org.eclipse.ecf.core.identity;version="3.2.0", - org.eclipse.ecf.core.jobs;version="1.1.0", -@@ -31,8 +30,7 @@ - org.osgi.service.event, - org.osgi.service.log, - org.osgi.service.remoteserviceadmin;version="1.1", -- org.osgi.util.tracker, -- org.xml.sax -+ org.osgi.util.tracker - DynamicImport-Package: * - Bundle-ActivationPolicy: lazy - Provide-Capability: osgi.extender; osgi.extender=osgi.remoteserviceadmin; version:Version=1.1; uses:="org.osgi.service.remoteserviceadmin",