diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch index 95ec74e..941e693 100644 --- a/eclipse-feature-plugins-to-category-ius.patch +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -1,5 +1,24 @@ ---- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.orig 2018-08-17 01:24:16.000000000 +0100 -+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2018-08-19 12:50:33.575708475 +0100 +From 92a15ec9a79258cdb22e1ebb51d4b912db38b17b Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 6 Dec 2018 11:38:58 +0000 +Subject: [PATCH 1/2] Change features bundling third-party modules to feature + requirements + +--- + .../org.eclipse.jdt-feature/feature.xml | 114 ++----------- + .../org.eclipse.pde-feature/feature.xml | 16 +- + .../org.eclipse.platform.doc.isv/pom.xml | 11 +- + .../org.eclipse.help-feature/feature.xml | 130 +++------------ + .../org.eclipse.sdk.tests/feature.xml | 59 ++----- + .../org.eclipse.test-feature/feature.xml | 56 +------ + .../org.eclipse.tips.feature/feature.xml | 11 +- + .../features/org.eclipse.e4.rcp/feature.xml | 150 ++---------------- + 8 files changed, 79 insertions(+), 468 deletions(-) + +diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +index 06887d901..364cae9d8 100644 +--- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml ++++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml @@ -19,6 +19,23 @@ %license @@ -24,12 +43,10 @@ -- + unpack="false"/> + - - +- unpack="false"/> +- @@ -139,12 +160,10 @@ -- + unpack="false"/> + - - +- unpack="false"/> +- + + eclipse-plugin +- javax.annotation +- 0.0.0 +- +- +- eclipse-plugin +- javax.el ++ javax.el-api + 0.0.0 + + +@@ -75,7 +70,7 @@ + + + eclipse-plugin +- javax.servlet ++ javax.servlet-api + 0.0.0 + + +@@ -95,7 +90,7 @@ + + + eclipse-plugin +- org.apache.jasper.glassfish ++ org.glassfish.web.javax.servlet.jsp + 0.0.0 + + +diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +index 853db711d..5195b6d59 100644 +--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml ++++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +@@ -22,69 +22,6 @@ + %license - - -- - - -- @@ -311,424 +370,398 @@ + + ---- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2018-08-19 13:57:13.249904259 +0100 -+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2018-08-19 14:03:19.527742984 +0100 -@@ -22,6 +22,23 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - +diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +index a3a7d14a0..1b2c80556 100644 +--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml ++++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +@@ -19,6 +19,16 @@ + %license + - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +@@ -421,20 +431,6 @@ + install-size="0" + version="0.0.0"/> - - - - + + - - - - - - -- - - - + + ++ ++ ++ ++ ++ ++ ++ ++ + + - +- version="0.0.0"/> - - - - - - - - - - - - - -- + version="0.0.0"/> - - -- +diff --git a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml +index 88d843b0f..d5b8195bc 100644 +--- a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml ++++ b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml +@@ -32,6 +32,10 @@ + %license + + ++ ++ ++ ++ + - - -- + +diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +index ba217da7b..464451193 100644 +--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml ++++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +@@ -22,6 +22,23 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- - - - - - - - - - - - - eclipse-plugin -- javax.annotation -- 0.0.0 -- -- -- eclipse-plugin -- javax.el -+ javax.el-api - 0.0.0 - - -@@ -75,7 +70,7 @@ - - - eclipse-plugin -- javax.servlet -+ javax.servlet-api - 0.0.0 - - -@@ -95,7 +90,7 @@ - - - eclipse-plugin -- org.apache.jasper.glassfish -+ org.glassfish.web.javax.servlet.jsp - 0.0.0 - - ---- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2018-11-29 17:25:22.652275197 +0000 -+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2018-11-29 17:31:00.129228645 +0000 -@@ -19,6 +19,17 @@ - %license - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -@@ -422,20 +433,6 @@ - version="0.0.0"/> - - +- +- - - - - +- + +@@ -164,41 +125,6 @@ + version="0.0.0" + unpack="false"/> - - - - - - -- - - - -- - -+ -+ -+ -+ -+ -+ -+ -+ -+ - -- - - + + - - + + - - - - - - -- +@@ -560,13 +451,6 @@ + version="0.0.0" + unpack="false"/> - - - ---- ./eclipse.platform.ua/org.eclipse.tips.feature/feature.xml.orig 2018-12-03 15:28:24.822448273 +0000 -+++ ./eclipse.platform.ua/org.eclipse.tips.feature/feature.xml 2018-12-03 15:29:45.204209427 +0000 -@@ -32,6 +32,10 @@ - %license - - -+ -+ -+ -+ -- -- - - +-- +2.19.1 + diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch index e979876..d20717c 100644 --- a/eclipse-mockito.patch +++ b/eclipse-mockito.patch @@ -1,17 +1,197 @@ ---- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:42:36.169928566 +0000 -+++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:56:27.970146198 +0000 -@@ -44,7 +44,7 @@ - org.eclipse.osgi.services;bundle-version="3.3.100", - org.hamcrest.core;bundle-version="1.3.0", +From 6ce6a869fed6260658b28feca5257885d64d2172 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 6 Dec 2018 11:43:10 +0000 +Subject: [PATCH 2/2] Patch to use ASM 6 and Mockito 1 + +--- + .../weaving/ClassfileTransformer.java | 4 +-- + .../internal/builder/ReferenceExtractor.java | 10 +++--- + .../internal/comparator/SignatureDecoder.java | 2 +- + .../internal/model/TypeStructureBuilder.java | 10 +++--- + .../org.eclipse.sdk.tests/feature.xml | 2 +- + .../org.eclipse.test-feature/feature.xml | 2 +- + .../META-INF/MANIFEST.MF | 3 +- + .../META-INF/MANIFEST.MF | 3 +- + .../ThemeDefinitionChangedHandlerTest.java | 2 +- + .../themes/StylingPreferencesHandlerTest.java | 4 +-- + .../WorkbenchThemeChangedHandlerTest.java | 32 +++++++++---------- + .../org.eclipse.ui.tests/META-INF/MANIFEST.MF | 2 +- + 12 files changed, 39 insertions(+), 37 deletions(-) + +diff --git a/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java b/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java +index 58657d1ec..6476bba63 100644 +--- a/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java ++++ b/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java +@@ -24,10 +24,10 @@ public class ClassfileTransformer { + private static final String STRATA_ID = "jdt"; //$NON-NLS-1$ + + /** max supported java class format major version, must match {@link #ASM_API} below **/ +- public static final int MAX_CLASS_MAJOR = Opcodes.V11; ++ public static final int MAX_CLASS_MAJOR = Opcodes.V10; + + /** supported ASM API version, must match {@link #MAX_CLASS_MAJOR} above */ +- private static final int ASM_API = Opcodes.ASM7; ++ private static final int ASM_API = Opcodes.ASM6; + + public byte[] transform(byte[] classfileBuffer, final String location) { + +diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java +index e4d50336a..2fe807ba9 100644 +--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java ++++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java +@@ -82,7 +82,7 @@ public class ReferenceExtractor extends ClassVisitor { + protected List references; + + public ClassFileSignatureVisitor() { +- super(Opcodes.ASM7); ++ super(Opcodes.ASM6); + this.references = new ArrayList<>(); + } + +@@ -250,7 +250,7 @@ public class ReferenceExtractor extends ClassVisitor { + * @param mv + */ + public ClassFileMethodVisitor(MethodVisitor mv, String name, int argumentcount) { +- super(Opcodes.ASM7, mv); ++ super(Opcodes.ASM6, mv); + this.argumentcount = argumentcount; + this.linePositionTracker = new LinePositionTracker(); + this.lastLineNumber = -1; +@@ -634,7 +634,7 @@ public class ReferenceExtractor extends ClassVisitor { + class ClassFileFieldVisitor extends FieldVisitor { + + ClassFileFieldVisitor() { +- super(Opcodes.ASM7); ++ super(Opcodes.ASM6); + } + + @Override +@@ -990,7 +990,7 @@ public class ReferenceExtractor extends ClassVisitor { + * {@link ReferenceModifiers} + */ + public ReferenceExtractor(IApiType type, Set collector, int referenceKinds) { +- super(Opcodes.ASM7, new ClassNode()); ++ super(Opcodes.ASM6, new ClassNode()); + fType = type; + this.collector = collector; + fReferenceKinds = referenceKinds; +@@ -1007,7 +1007,7 @@ public class ReferenceExtractor extends ClassVisitor { + * @param tracker + */ + protected ReferenceExtractor(IApiType type, Set collector, int referenceKinds, FieldTracker tracker) { +- super(Opcodes.ASM7, new ClassNode()); ++ super(Opcodes.ASM6, new ClassNode()); + fType = type; + this.collector = collector; + fReferenceKinds = referenceKinds; +diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java +index e6e38604e..490598b7b 100644 +--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java ++++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java +@@ -32,7 +32,7 @@ final class SignatureDecoder extends SignatureVisitor { + SignatureDescriptor signatureDescriptor; + + public SignatureDecoder(SignatureDescriptor signatureDescriptor) { +- super(Opcodes.ASM7); ++ super(Opcodes.ASM6); + this.signatureDescriptor = signatureDescriptor; + } + +diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java +index 4ff1492e8..7dc03b6aa 100644 +--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java ++++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java +@@ -57,7 +57,7 @@ public class TypeStructureBuilder extends ClassVisitor { + * unknown + */ + TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) { +- super(Opcodes.ASM7, cv); ++ super(Opcodes.ASM6, cv); + fComponent = component; + fFile = file; + } +@@ -154,7 +154,7 @@ public class TypeStructureBuilder extends ClassVisitor { + } + } + final ApiMethod method = fType.addMethod(name, desc, signature, laccess, names); +- return new MethodVisitor(Opcodes.ASM7, ++ return new MethodVisitor(Opcodes.ASM6, + super.visitMethod(laccess, name, desc, signature, exceptions)) { + @Override + public AnnotationVisitor visitAnnotation(String sig, boolean visible) { +@@ -190,7 +190,7 @@ public class TypeStructureBuilder extends ClassVisitor { + int traceCount = 0; + + public AnnotationDefaultVisitor(ApiMethod method) { +- super(Opcodes.ASM7); ++ super(Opcodes.ASM6); + this.method = method; + } + +@@ -308,7 +308,7 @@ public class TypeStructureBuilder extends ClassVisitor { + String typeName; + + public EnclosingMethodSetter(ClassVisitor cv, String typeName) { +- super(Opcodes.ASM7, cv); ++ super(Opcodes.ASM6, cv); + this.typeName = typeName.replace('.', '/'); + } + +@@ -341,7 +341,7 @@ public class TypeStructureBuilder extends ClassVisitor { + protected EnclosingMethodSetter setter; + + public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) { +- super(Opcodes.ASM7, mv); ++ super(Opcodes.ASM6, mv); + this.setter = enclosingMethodSetter; + } + +diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +index 1b2c80556..010f679d7 100644 +--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml ++++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +@@ -25,7 +25,7 @@ + + + +- ++ + + + +diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml +index 2a4871027..620359803 100644 +--- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml ++++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml +@@ -24,7 +24,7 @@ + + + +- ++ + + + ---- eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100 -+++ eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100 -@@ -38,6 +38,8 @@ - - - -+ -+ - - - ---- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100 -+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100 -@@ -57,6 +57,8 @@ - - - -+ -+ - - - --- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000 +++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000 @@ -61,6 +61,8 @@ diff --git a/eclipse.spec b/eclipse.spec index df67406..0879f61 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -6,9 +6,9 @@ Epoch: 1 %global eb_commit 44643cbda3dfd6f00fbf1b346dae7068df2a9ef9 -%global eclipse_tag I20181203-0600 +%global eclipse_tag I20181205-1800 -%global _jetty_version 9.4.11 +%global _jetty_version 9.4.14 %global _lucene_version 7.1.0 %ifarch %{ix86} @@ -37,7 +37,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.10.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -58,6 +58,9 @@ Patch1: eclipse-p2-pick-up-renamed-jars.patch # Patch for this was contributed. Unlikely to be released. Patch2: eclipse-ignore-version-when-calculating-home.patch +# Explicit requirement on hamcrest where it is used directly +Patch3: explicit-hamcrest.patch + # Add support for all arches supported by Fedora Patch4: eclipse-secondary-arches.patch @@ -68,12 +71,6 @@ Patch5: eclipse-debug-symbols.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138 Patch12: eclipse-fix-dropins.patch -# org.mockito -> org.mockito.mockito-core -# org.hamcrest-> org.hamcrest.core -Patch14: eclipse-mockito.patch - -Patch15: eclipse-support-symlink-bundles.patch - # Feature plugin definitions lock onto version of plugin at build-time. # If plugin is external, updating it breaks the feature. (version changes) # Workaround : Change definition to a 'requirement' @@ -84,7 +81,12 @@ Patch15: eclipse-support-symlink-bundles.patch # org.apache.jasper.glassfish -> org.glassfish.web.javax.servlet.jsp # javax.annotation -> javax.annotation-api # org.w3c.dom.smil -> removed -Patch16: eclipse-feature-plugins-to-category-ius.patch +Patch13: eclipse-feature-plugins-to-category-ius.patch + +# Use old ASM and Mockito on Fedora < 30 because ASM 7 and Mockito 2 are not available there +Patch14: eclipse-mockito.patch + +Patch15: eclipse-support-symlink-bundles.patch # Fix various JDT and PDE tests Patch20: eclipse-fix-tests.patch @@ -181,8 +183,8 @@ BuildRequires: batik-css >= 1.10 BuildRequires: xmlgraphics-commons >= 2.2 BuildRequires: xml-commons-apis BuildRequires: atinject -BuildRequires: eclipse-ecf-core >= 3.14.1-2 -BuildRequires: eclipse-emf-core >= 1:2.15.0-0.2 +BuildRequires: eclipse-ecf-core >= 3.14.4 +BuildRequires: eclipse-emf-core >= 1:2.16.0 BuildRequires: eclipse-license2 BuildRequires: glassfish-annotation-api BuildRequires: glassfish-el-api >= 3.0.1 @@ -264,8 +266,8 @@ Requires: batik-css >= 1.10 Requires: xmlgraphics-commons >= 2.2 Requires: xml-commons-apis Requires: atinject -Requires: eclipse-ecf-core >= 3.14.0-1 -Requires: eclipse-emf-core >= 1:2.14.0-1 +Requires: eclipse-ecf-core >= 3.14.4 +Requires: eclipse-emf-core >= 1:2.16.0 Requires: glassfish-annotation-api Requires: glassfish-el-api >= 3.0.1 Requires: glassfish-el >= 3.0.1 @@ -366,13 +368,17 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch0 %patch1 %patch2 +%patch3 %patch4 -p1 %patch5 #%patch6 %patch12 -%patch14 +%patch13 -p1 +%if 0%{?fedora} && 0%{?fedora} < 30 +# Use old ASM and Mockito on Fedora < 30 because ASM 7 and Mockito 2 are not available there +%patch14 -p1 +%endif %patch15 -%patch16 %patch20 %patch21 %patch22 @@ -603,18 +609,6 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse. ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/ -%if 0%{?fedora} == 29 -# Use old ASM and Mockito on Fedora < 30 -grep -l -Z -r "org.mockito.ArgumentMatchers" eclipse.platform.ui/tests | xargs -0 sed -i -- 's/org.mockito.ArgumentMatchers/org.mockito.Matchers/' -sed -i -e 's/populateDefinition(isNull(), isNull()/populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class)/' \ - eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse\ UI\ Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java -sed -i -e 's/Opcodes.V11/Opcodes.V10/' -e 's/Opcodes.ASM7/Opcodes.ASM6/' \ - eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java \ - eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java \ - eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java \ - eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java -%endif - # This test doesn't build on 32bit # See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=534174 rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java @@ -1086,6 +1080,11 @@ fi %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Dec 06 2018 Mat Booth - 1:4.10.0-0.3 +- Update to latest I-build +- Build against latest jetty, mockito packages +- Update requirements on EMF and ECF + * Tue Dec 04 2018 Mat Booth - 1:4.10.0-0.2 - Allow building on Fedora 29 diff --git a/explicit-hamcrest.patch b/explicit-hamcrest.patch new file mode 100644 index 0000000..0db6601 --- /dev/null +++ b/explicit-hamcrest.patch @@ -0,0 +1,19 @@ +--- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig 2018-08-20 12:54:25.245305107 +0100 ++++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF 2018-08-20 12:54:37.952261537 +0100 +@@ -33,6 +33,7 @@ + org.eclipse.ui.workbench.texteditor;resolution:=optional, + org.eclipse.ui.editors;resolution:=optional, + org.junit, ++ org.hamcrest.core, + org.eclipse.core.resources, + org.eclipse.core.variables, + org.eclipse.ui, +--- eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF.orig 2018-08-20 13:22:04.987695821 +0100 ++++ eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF 2018-08-20 13:22:28.507613518 +0100 +@@ -7,4 +7,5 @@ + Fragment-Host: org.eclipse.urischeme;bundle-version="1.0.0" + Automatic-Module-Name: org.eclipse.urischeme.tests + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +-Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)" ++Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)", ++ org.hamcrest.core;bundle-version="1.3.0" diff --git a/sources b/sources index c28a3f3..32b6bfd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (eclipse-platform-sources-I20181203-0600.tar.xz) = 3f2309a4094721fc6dfe643c86249e5d143fcf2c402b5871234bda60f330140f16d5062d86aa0c3125d43f7524aaeb9182711a0e6ced573a1efe3105c0dd03f8 +SHA512 (eclipse-platform-sources-I20181205-1800.tar.xz) = 032bee233b0b0ee18155bc9144c6a8db087d7f868c89cfbfa72e79e4c2224dbe0792cef51cfb4c7bb52920717591ecaf3b84522ea7772ffb4bced773d9957749 SHA512 (org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz) = ef02f54deefd154265122fa0191c8d69bbb135e026171de147a7fb3af83bb26523ea866d19aa7c7cc184c8e05ad55e54846a909bea69bd1bc6cd57005d055ebf