diff --git a/eclipse.spec b/eclipse.spec
index 6e23cd2..d29c55d 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -42,7 +42,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.15
-Release: 2%{?dist}
+Release: 3%{?dist}
License: EPL-2.0
URL: http://www.eclipse.org/
@@ -213,7 +213,6 @@ BuildRequires: eclipse-pde
# For contributor tools
BuildRequires: eclipse-egit
BuildRequires: eclipse-emf-runtime
-BuildRequires: mockito >= 2.23.9
%endif
%endif
@@ -351,8 +350,6 @@ Summary: Tools for Eclipse Contributors
Obsoletes: %{name}-tests < 1:4.14-2
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
-Requires: hamcrest
-Requires: mockito >= 2.23.9
%description contributor-tools
This package contains tools specifically for Eclipse contributors. It includes
@@ -485,6 +482,14 @@ 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 ./tests/org.eclipse.e4.tools.test eclipse.platform.ui.tools
+
+# Disable test framework if we are not shipping tests
+%pom_disable_module features/org.eclipse.test-feature eclipse.platform.releng
+%pom_disable_module bundles/org.eclipse.test eclipse.platform.releng
+%pom_disable_module bundles/org.eclipse.test.performance eclipse.platform.releng
+%pom_disable_module bundles/org.eclipse.test.performance.win32 eclipse.platform.releng
+%pom_disable_module bundles/org.eclipse.ant.optional.junit eclipse.platform.releng
# Disable servletbridge stuff
%pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles
@@ -568,11 +573,6 @@ done
%pom_disable_module bundles/org.eclipse.swt.tools eclipse.platform.swt
%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng
-%pom_disable_module features/org.eclipse.test-feature eclipse.platform.releng
-%pom_disable_module bundles/org.eclipse.test eclipse.platform.releng
-%pom_disable_module bundles/org.eclipse.test.performance eclipse.platform.releng
-%pom_disable_module bundles/org.eclipse.test.performance.win32 eclipse.platform.releng
-%pom_disable_module bundles/org.eclipse.ant.optional.junit eclipse.platform.releng
%endif
# Include some extra features with the product that some other projects may need at
@@ -586,12 +586,6 @@ sed -i -e '/org.eclipse.ui.themes/i' \
eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
-# Prevent dep cycle
-%pom_xpath_remove "plugin[@id='org.eclipse.core.tests.harness']" eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
-
-# Don't require easymock
-%pom_xpath_remove "import[@plugin='org.easymock']" eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
-
# Include maven descriptors to allow our test execution setup to work
%pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent
@@ -642,7 +636,6 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
# The order of these mvn_package calls is important
%mvn_package "::pom::" __noinstall
%mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools
-%mvn_package "org.eclipse.test:org.eclipse.test" contributor-tools
%mvn_package "::jar:sources{,-feature}:" sdk
%mvn_package ":org.eclipse.jdt.doc.isv" sdk
%mvn_package ":org.eclipse.platform.doc.isv" sdk
@@ -654,8 +647,6 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
%mvn_package ":org.eclipse.e4{,.core}.tools*" contributor-tools
%mvn_package ":org.eclipse.releng.tools" contributor-tools
%mvn_package ":org.eclipse.swt.tools*" contributor-tools
-%mvn_package "org.eclipse.test{,.feature}:" contributor-tools
-%mvn_package ":org.eclipse.ant.optional.junit" contributor-tools
%mvn_package "org.eclipse.cvs{,.feature}:" cvs
%mvn_package "org.eclipse.team:org.eclipse.team.cvs*" cvs
%mvn_package "org.eclipse.pde{,.ui,.feature}:" pde
@@ -1064,6 +1055,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* 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.
+
* Mon Mar 23 2020 Mat Booth - 1:4.15-2
- Set compiler release to Java 8 on certain bundles