From 52d62cc8bdbca8e3afd7a58a3523555621f37e89 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 20 2019 13:42:30 +0000 Subject: Disable more examples and allow contrib-tools mode to build properly --- diff --git a/eclipse-patch-out-fileupload-dep.patch b/eclipse-patch-out-fileupload-dep.patch index 5ebef1f..1dc6afc 100644 --- a/eclipse-patch-out-fileupload-dep.patch +++ b/eclipse-patch-out-fileupload-dep.patch @@ -24,3 +24,92 @@ org.eclipse.equinox.http.jetty;version="1.4.0", org.eclipse.equinox.http.servlet;version="1.1.0", org.eclipse.equinox.http.servlet.context;version="1.0.0", +--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2019-06-20 11:07:22.539088841 +0100 ++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2019-06-20 11:07:27.679071742 +0100 +@@ -20,7 +20,6 @@ + + + +- + + + +--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java.orig 2019-06-20 11:48:48.317887414 +0100 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java 2019-06-20 11:49:35.106774459 +0100 +@@ -79,10 +79,6 @@ + import javax.servlet.http.HttpSessionListener; + import javax.servlet.http.Part; + +-import org.apache.commons.fileupload.FileItem; +-import org.apache.commons.fileupload.FileUploadException; +-import org.apache.commons.fileupload.disk.DiskFileItemFactory; +-import org.apache.commons.fileupload.servlet.ServletFileUpload; + import org.eclipse.equinox.http.servlet.ExtendedHttpService; + import org.eclipse.equinox.http.servlet.RangeAwareServletContextHelper; + import org.eclipse.equinox.http.servlet.context.ContextPathCustomizer; +@@ -2665,65 +2661,6 @@ + Assert.assertEquals("bundleresource", requestAdvisor.request("testDefaultHttpContextResource")); + } + +- @Test +- public void test_commonsFileUpload() throws Exception { +- Servlet servlet = new HttpServlet() { +- private static final long serialVersionUID = 1L; +- +- @Override +- protected void doPost(HttpServletRequest req, HttpServletResponse resp) +- throws IOException, ServletException { +- +- boolean isMultipart = ServletFileUpload.isMultipartContent(req); +- Assert.assertTrue(isMultipart); +- +- DiskFileItemFactory factory = new DiskFileItemFactory(); +- +- ServletContext servletContext = this.getServletConfig().getServletContext(); +- File repository = (File) servletContext.getAttribute("javax.servlet.context.tempdir"); +- factory.setRepository(repository); +- ServletFileUpload upload = new ServletFileUpload(factory); +- +- List items = null; +- try { +- List parseRequest = upload.parseRequest(req); +- items = parseRequest; +- } catch (FileUploadException e) { +- e.printStackTrace(); +- } +- +- Assert.assertNotNull(items); +- Assert.assertFalse(items.isEmpty()); +- +- FileItem fileItem = items.get(0); +- +- String submittedFileName = fileItem.getName(); +- String contentType = fileItem.getContentType(); +- long size = fileItem.getSize(); +- +- PrintWriter writer = resp.getWriter(); +- +- writer.write(submittedFileName); +- writer.write("|"); +- writer.write(contentType); +- writer.write("|" + size); +- } +- }; +- +- Dictionary props = new Hashtable(); +- props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S16"); +- props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/Servlet16/*"); +- registrations.add(getBundleContext().registerService(Servlet.class, servlet, props)); +- +- Map> map = new HashMap>(); +- +- map.put("file", Arrays.asList(getClass().getResource("blue.png"))); +- +- Map> result = requestAdvisor.upload("Servlet16/do", map); +- +- Assert.assertEquals("200", result.get("responseCode").get(0)); +- Assert.assertEquals("blue.png|image/png|292", result.get("responseBody").get(0)); +- } + + @Test + public void test_PathEncodings_Bug540970() throws Exception { diff --git a/eclipse-pde-tp-support-droplets.patch b/eclipse-pde-tp-support-droplets.patch index 85fab23..dd23623 100644 --- a/eclipse-pde-tp-support-droplets.patch +++ b/eclipse-pde-tp-support-droplets.patch @@ -57,7 +57,7 @@ index fbd4b81..55cd40e 100644 import org.osgi.framework.Constants; /** -@@ -111,7 +114,16 @@ public class P2Utils { +@@ -139,7 +143,16 @@ try { URL bundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), new File(configurationArea.getFile(), SimpleConfiguratorManipulator.BUNDLES_INFO_PATH).getAbsolutePath()); File home = basePath.toFile(); @@ -75,7 +75,7 @@ index fbd4b81..55cd40e 100644 if (bundles == null || bundles.length == 0) { return null; } -@@ -143,11 +154,38 @@ public class P2Utils { +@@ -171,11 +184,38 @@ try { File home = basePath.toFile(); URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH)); diff --git a/eclipse.spec b/eclipse.spec index a5bc453..1f747fa 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -41,7 +41,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.12 -Release: 2%{?dist} +Release: 3%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -416,7 +416,6 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ # Optional (unused) multipart support (see patch 25) rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java -rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java # Remove python-based test rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py @@ -474,6 +473,7 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse-platform-parent/pom eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF # Disable examples +%pom_disable_module examples rt.equinox.p2 %pom_disable_module examples eclipse.platform.ui %pom_disable_module org.eclipse.debug.examples.core eclipse.platform.debug %pom_disable_module org.eclipse.debug.examples.memory eclipse.platform.debug @@ -488,6 +488,8 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse-platform-parent/pom %pom_disable_module org.eclipse.ui.genericeditor.examples eclipse.platform.text %pom_disable_module org.eclipse.ui.intro.quicklinks.examples eclipse.platform.ua %pom_disable_module org.eclipse.ui.intro.solstice.examples eclipse.platform.ua +# Except for this one example, which is used by tests +%pom_xpath_inject "pom:modules" "examples/org.eclipse.jface.examples.databinding" eclipse.platform.ui # Disable servletbridge stuff %pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles @@ -594,6 +596,7 @@ for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse done %pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2 %pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module examples/org.eclipse.jface.examples.databinding eclipse.platform.ui %endif # Include some extra features with the product that some other projects may need at @@ -1102,6 +1105,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Jun 20 2019 Mat Booth - 1:4.12-3 +- Disable more examples and allow contrib-tools mode to build properly + * Wed Jun 19 2019 Mat Booth - 1:4.12-2 - Additional fixes for ebz548211 diff --git a/explicit-hamcrest.patch b/explicit-hamcrest.patch index 0db6601..a3b3bb3 100644 --- a/explicit-hamcrest.patch +++ b/explicit-hamcrest.patch @@ -17,3 +17,13 @@ -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" +--- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates.tests/META-INF/MANIFEST.MF.orig 2019-06-20 11:25:47.959981490 +0100 ++++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates.tests/META-INF/MANIFEST.MF 2019-06-20 11:26:06.444935061 +0100 +@@ -9,6 +9,7 @@ + Require-Bundle: org.eclipse.pde.ui;bundle-version="3.10.0", + org.eclipse.pde.ui.templates;bundle-version="3.6.0", + org.junit;bundle-version="4.12.0", ++ org.hamcrest.core;bundle-version="1.3.0", + org.eclipse.core.runtime;bundle-version="3.13.0", + org.eclipse.core.resources;bundle-version="3.12.0", + org.eclipse.ui.ide;bundle-version="3.13.0",