From f795a6b899933b44b5d2c84ec311667d5eaf4134 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Apr 02 2020 22:18:05 +0000 Subject: Allow library detector to build on Java 11 --- diff --git a/eclipse.spec b/eclipse.spec index d29c55d..403ac97 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -42,7 +42,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.15 -Release: 3%{?dist} +Release: 4%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -633,6 +633,9 @@ 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/ +# Allow library detector to build on Java 11 +sed -i -e 's/target="1.1" source="1.3"/target="1.6" source="1.6"/' eclipse.jdt.debug/org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml + # The order of these mvn_package calls is important %mvn_package "::pom::" __noinstall %mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools @@ -1055,6 +1058,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Apr 02 2020 Mat Booth - 1:4.15-4 +- Allow library detector to build on Java 11 + * Sun Mar 29 2020 Mat Booth - 1:4.15-3 - Don't build and ship the test framework. We are not shipping any actual tests anyway and this allows to drop the dependency on mockito and friends.