From 1b7ea00088e02a126cf0f47777031f91659a32d4 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mar 12 2019 00:36:27 +0000 Subject: Update to 2019-03 release Drop support for 32-bit architectures --- diff --git a/eclipse-fix-tests.patch b/eclipse-fix-tests.patch index dc0a0d1..6b3e8ec 100644 --- a/eclipse-fix-tests.patch +++ b/eclipse-fix-tests.patch @@ -231,33 +231,6 @@ index bc8963d..fbe4da3 100644 + } +} + ---- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig 2017-04-07 10:44:33.764607961 +0100 -+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml 2017-04-07 11:26:44.511961798 +0100 -@@ -26,4 +26,24 @@ - org.eclipse.jdt.core.tests.builder.BuilderTests - ${project.artifactId} - -+ -+ -+ -+ -+ org.eclipse.tycho -+ target-platform-configuration -+ -+ -+ -+ -+ eclipse-plugin -+ org.eclipse.jdt.annotation -+ 0.0.0 -+ -+ -+ -+ -+ -+ -+ - --- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig 2017-04-28 11:49:47.046123546 +0100 +++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28 12:05:11.947521737 +0100 @@ -156,13 +156,6 @@ @@ -274,3 +247,29 @@ index bc8963d..fbe4da3 100644 id="org.eclipse.e4.rcp.feature.group" version="" /> + ${tycho.surefire.argLine} + +- ++ ++ ++ org.eclipse.tycho ++ target-platform-configuration ++ ++ ++ ++ ++ eclipse-plugin ++ org.eclipse.jdt.annotation ++ 0.0.0 ++ ++ ++ ++ ++ + + + diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch deleted file mode 100644 index 3e49870..0000000 --- a/eclipse-mockito.patch +++ /dev/null @@ -1,337 +0,0 @@ -From 0efaa8f30c107beb904d37e2ad13913ae51f9e27 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 f0dab84a3..ecef382ab 100644 ---- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -+++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -@@ -24,7 +24,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 @@ - - - -- -+ - - - - + + + diff --git a/eclipse.spec b/eclipse.spec index b19e21e..1796c0d 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,15 +1,16 @@ # Set to 1 to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%global bootstrap 0 +%global bootstrap 1 Epoch: 1 %global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 -%global eclipse_tag I20181206-0815 +%global eclipse_rel %{version}RC2 +%global eclipse_tag S-%{eclipse_rel}-201903070500 -%global _jetty_version 9.4.14 -%global _lucene_version 7.1.0 +%global _jetty_version 9.4.15 +%global _lucene_version 7.7.0 %ifarch %{ix86} %global eclipse_arch x86 @@ -36,12 +37,12 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.10.0 -Release: 3%{?dist} +Version: 4.11 +Release: 1%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{eclipse_tag}/eclipse-platform-sources-%{eclipse_tag}.tar.xz +Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{eclipse_tag}/eclipse-platform-sources-%{eclipse_rel}.tar.xz # Can generate locally with: # git archive --format=tar --prefix=org.eclipse.linuxtools.eclipse-build-%%{eb_commit}/ \ @@ -83,9 +84,6 @@ Patch12: eclipse-fix-dropins.patch # org.w3c.dom.smil -> removed 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 @@ -111,10 +109,8 @@ Patch29: fix_ant_build.patch # Hide the p2 Droplets from cluttering Install Wizard Combo Patch30: eclipse-hide-droplets-from-install-wizard.patch -# Use the jit on 32bit arm to speed up the build -%ifarch %{arm} -BuildRequires: java-1.8.0-openjdk-aarch32-devel -%endif +# Upstream no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} BuildRequires: maven-local BuildRequires: tycho @@ -159,7 +155,7 @@ BuildRequires: apache-sshd BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.1.0 BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2 BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0 -BuildRequires: osgi(org.apache.felix.scr) >= 2.0.14 +BuildRequires: osgi(org.apache.felix.scr) >= 2.1.14 BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} @@ -172,11 +168,11 @@ BuildRequires: lucene-analysis >= %{_lucene_version} BuildRequires: lucene-queryparser >= %{_lucene_version} BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version} BuildRequires: junit >= 4.12 -BuildRequires: junit5 +BuildRequires: junit5 >= 5.4.0 BuildRequires: apiguardian BuildRequires: hamcrest BuildRequires: sat4j -BuildRequires: objectweb-asm >= 6.1.1 +BuildRequires: objectweb-asm >= 7.0 BuildRequires: sac BuildRequires: batik >= 1.10 BuildRequires: batik-css >= 1.10 @@ -196,7 +192,7 @@ BuildRequires: httpcomponents-core BuildRequires: httpcomponents-client BuildRequires: jsoup BuildRequires: xz-java -BuildRequires: mockito +BuildRequires: mockito >= 2.23.9 BuildRequires: osgi(osgi.annotation) # Build deps that are excluded when bootstrapping %if ! %{bootstrap} @@ -244,10 +240,10 @@ Requires: apache-commons-el >= 1.0-23 Requires: apache-commons-logging Requires: apache-commons-codec Requires: apache-commons-jxpath -Requires: osgi(org.apache.felix.gogo.shell) >= 1.0.0 +Requires: osgi(org.apache.felix.gogo.shell) >= 1.1.0 Requires: osgi(org.apache.felix.gogo.command) >= 1.0.2 -Requires: osgi(org.apache.felix.gogo.runtime) >= 1.0.4 -Requires: osgi(org.apache.felix.scr) >= 2.0.14 +Requires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0 +Requires: osgi(org.apache.felix.scr) >= 2.1.14 Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} @@ -298,7 +294,8 @@ BuildArch: noarch Provides: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: osgi(org.junit) >= 4.12 +Requires: junit >= 4.12 +Requires: junit5 >= 5.4.0 Requires: osgi(org.hamcrest.core) %description jdt @@ -310,7 +307,7 @@ Summary: Eclipse Plugin Development Environment Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release} -Requires: objectweb-asm >= 6.1.1 +Requires: objectweb-asm >= 7.0 %description pde Eclipse Plugin Development Environment. This package is required for @@ -333,7 +330,7 @@ Summary: Tools for Eclipse Contributors Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: easymock -Requires: mockito +Requires: mockito >= 2.23.9 %description contributor-tools This package contains tools specifically for Eclipse contributors. It includes @@ -348,10 +345,13 @@ Requires: %{name}-contributor-tools = %{epoch}:%{version}-%{release} Eclipse Tests. %prep -%setup -q %{SOURCE0} -n eclipse-platform-sources-%{eclipse_tag} +%setup -T -c + +# Extract main source +tar --strip-components=1 -xf %{SOURCE0} # Extract linuxtools/eclipse-build sources -tar --strip-components=1 -xf %{SOURCE1} +tar --strip-components=1 -xf %{SOURCE1} # Delete pre-built binary artifacts except some test data that cannot be generated find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "java10api.jar" ! -name "j9stubs.jar" \ @@ -373,10 +373,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ #%patch6 %patch12 %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 %patch20 %patch21 @@ -460,7 +456,6 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse.jdt.core/org.eclips # This part generates secondary fragments using primary fragments for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do - utils/ensure_arch.sh "$dir" x86 arm utils/ensure_arch.sh "$dir" x86_64 aarch64 done @@ -526,10 +521,8 @@ done # Fix versions in secondary arch fragments fix_files=$(grep -lr 3.107.100 eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*) -sed -i -e "s/3.107.100/3.109.0/" $fix_files -fix_files=$(grep -lr '1\.1\.[67]00' rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.*) -sed -i -e "s/1\.1\.[67]00/1.1.800/" $fix_files -sed -i -e "/Fragment-Host/s/\(bundle-version=\).*/\1\"1.0.0\"/" $fix_files +sed -i -e "s/3.107.100/3.110.0/" $fix_files +sed -i -e "/Fragment-Host/s/\(bundle-version=\).*/\1\"1.0.0\"/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.*/META-INF/MANIFEST.MF # We don't need SWT fragments since we only care for current arch %pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt @@ -649,12 +642,7 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/ %build #This is the lowest value where the build succeeds. 512m is not enough. export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" -# Ensure we get the jit on arm -%ifarch %{arm} -export JAVA_HOME=$(ls -d %{_jvmdir}/java-1.8.0-openjdk-aarch32*) -%else export JAVA_HOME=%{_jvmdir}/java -%endif # Pre-build agent jar needed for AdvancedSourceLookupSupport sed -i -e '/createSourcesJar/d' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml @@ -1030,6 +1018,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.ui.net_* %{_eclipsedir}/plugins/org.eclipse.ui.themes_* %{_eclipsedir}/plugins/org.eclipse.ui.views_* +%{_eclipsedir}/plugins/org.eclipse.ui.views.log_* %{_eclipsedir}/plugins/org.eclipse.ui.views.properties.tabbed_* %{_eclipsedir}/plugins/org.eclipse.ui.workbench_* %{_eclipsedir}/plugins/org.eclipse.ui.workbench.texteditor_* @@ -1071,6 +1060,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Mon Mar 11 2019 Mat Booth - 1:4.11-1 +- Update to 2019-03 release +- Drop support for 32-bit architectures + * Thu Jan 31 2019 Fedora Release Engineering - 1:4.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 7eb06ff..8f09089 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (eclipse-platform-sources-I20181206-0815.tar.xz) = 88a091eff1cd775c85e022f15625e12ce25655be841efa194be7278d81dbb4db85fcb0fea070a4f849b196d299bdb4179c8cbfb44ab744e3e6fba544d1ffc733 +SHA512 (eclipse-platform-sources-4.11RC2.tar.xz) = 8f60458ba88dce8552c9d9a518d90d5659dc2033f375da0ce9de54fd9328b6a7f921bf35c3c82597b8485157ffd2cb087595e36cd4dd0a273226cf07c0de9fce SHA512 (org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz) = 79780efe9eed0082ea6de6978c5b65ccf5c65a242bff24f34cd763c0ca19a695e7735442aba20f5d2fca4153f7b59c5804fdcb67fa050480dcad137d664d3ce3