From 7aea65021748eca4c312ed50cdee07023f1aac09 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: May 10 2019 15:18:41 +0000 Subject: Don't build and ship tests --- diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec index d12fb25..206fb6f 100644 --- a/eclipse-mylyn.spec +++ b/eclipse-mylyn.spec @@ -7,7 +7,7 @@ Name: eclipse-mylyn Summary: Eclipse Mylyn main feature. Version: 3.25.0 -Release: 0.7%{?dist} +Release: 0.8%{?dist} License: EPL-1.0 URL: http://www.eclipse.org/mylyn @@ -74,10 +74,6 @@ BuildRequires: xmlrpc-common >= 3.1.3 BuildRequires: xmlrpc-server >= 3.1.3 BuildRequires: google-gson BuildRequires: guava20 -BuildRequires: junit -BuildRequires: hamcrest -BuildRequires: objenesis -BuildRequires: mockito BuildRequires: tika >= 1.17 BuildRequires: tika-parsers >= 1.17 @@ -85,6 +81,7 @@ Requires: eclipse-platform # Added in F31 Obsoletes: %{name}-tasks-web <= 3.25.0-1 +Obsoletes: %{name}-tests <= 3.25.0-1 %description Mylyn integrates task support into Eclipse. It supports offline editing @@ -138,7 +135,7 @@ License: EPL-2.0 The EPUB framework in Mylyn Docs offers API to create, manipulate, read and write EPUB formatted files. -%package tasks-trac +%package tasks-trac Summary: Mylyn Tasks Connector: Trac %description tasks-trac @@ -207,14 +204,6 @@ Requires: %{name}-versions-subclipse = %{version}-%{release} %description sdk Sources for all Mylyn bundles. -%package tests -Summary: Mylyn test bundles -Requires: eclipse-tests -Requires: eclipse-swtbot - -%description tests -All the test bundles for mylyn packages. - %prep %setup -q -n eclipse-mylyn-%{tag}-fetched-src @@ -228,14 +217,11 @@ All the test bundles for mylyn packages. # Relax version constraint on jsoup find -name MANIFEST.MF -exec grep -l -e 'org\.jsoup' {} \; | xargs sed -i -e '/org\.jsoup/s/1.8.3/1.6.1/' -#remove tests that fail to compile -%pom_disable_module org.eclipse.mylyn.wikitext.osgi.tests org.eclipse.mylyn.docs/wikitext/ui -%pom_disable_module org.eclipse.mylyn.wikitext.asciidoc.tests org.eclipse.mylyn.docs/wikitext/ui -%pom_disable_module org.eclipse.mylyn.wikitext.ui.tests org.eclipse.mylyn.docs/wikitext/ui -rm org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.ui.tests/src/org/eclipse/mylyn/commons/ui/ShellDragSupportTest.java -rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java -rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java -rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java +# Don't build and ship test bundles +%pom_disable_module org.eclipse.mylyn.wikitext.tests org.eclipse.mylyn.docs/wikitext/core +for pom in $(find -maxdepth 3 -name pom.xml) ; do + sed -i -e '/tests<\/module>/d' -e '/test-feature<\/module>/d' $pom +done # Add docs build back in %pom_xpath_inject "pom:modules" "org.eclipse.mylyn.docs/docs" @@ -262,9 +248,7 @@ for site in $(grep -l -r --include="pom.xml" eclipse-update-site .) ; do done %pom_disable_module repository org.eclipse.mylyn.docs/{epub/core,wikitext/core} %pom_disable_module targets org.eclipse.mylyn.docs/{docs,epub/ui,wikitext/ui} -%pom_xpath_remove "pom:configuration/pom:target" org.eclipse.mylyn.docs/docs -%pom_xpath_remove "pom:configuration/pom:target" org.eclipse.mylyn.docs/wikitext/ui -%pom_xpath_remove "pom:configuration/pom:target" org.eclipse.mylyn.docs/epub/ui +%pom_xpath_remove "pom:configuration/pom:target" org.eclipse.mylyn.docs/{docs,wikitext/ui,epub/ui} %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin org.eclipse.mylyn.docs/wikitext/ui %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin org.eclipse.mylyn.docs/epub/ui @@ -278,9 +262,9 @@ done # Disable modules we can't build yet %pom_disable_module org.eclipse.mylyn.reviews -sed -i -e '/\(gerrit\|reviews\)/d' org.eclipse.mylyn/org.eclipse.mylyn.tests/META-INF/MANIFEST.MF -sed -i -e '/All\(Gerrit\|Reviews\)Tests;/d' -e 's/AllGerritTests.class,//' -e '/addTest(All\(Gerrit\|Reviews\)Tests/d' \ - org.eclipse.mylyn/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/All*Tests.java +rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java +rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonUiPlugin.java +rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonStartup.java %pom_xpath_remove "plugin[contains(@id, '.source')]" \ org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.sdk-feature/feature.xml \ @@ -301,10 +285,7 @@ sed -i -e '/All\(Gerrit\|Reviews\)Tests;/d' -e 's/AllGerritTests.class,//' -e '/ %pom_disable_module org.eclipse.mylyn.subclipse.core org.eclipse.mylyn.versions %pom_disable_module org.eclipse.mylyn.subclipse.ui org.eclipse.mylyn.versions %pom_disable_module org.eclipse.mylyn.cdt-feature org.eclipse.mylyn.context -%pom_disable_module org.eclipse.mylyn.cdt.tests org.eclipse.mylyn.context %pom_disable_module org.eclipse.mylyn.cdt.ui org.eclipse.mylyn.context -sed -i -e '/cdt.tests/d' org.eclipse.mylyn/org.eclipse.mylyn.tests/META-INF/MANIFEST.MF -sed -i -e '/AllCdtTests/d' org.eclipse.mylyn/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllNonConnectorTests.java %pom_xpath_remove "includes[@id='org.eclipse.cdt.mylyn']" \ org.eclipse.mylyn.context/org.eclipse.mylyn.context.sdk-feature/feature.xml %pom_remove_dep :org.eclipse.mylyn.wikitext org.eclipse.mylyn.docs/epub/core/org.eclipse.mylyn.docs.epub.core @@ -318,35 +299,15 @@ rm org.eclipse.mylyn.docs/epub/core/org.eclipse.mylyn.docs.epub.core/src/org/ecl %pom_disable_module org.eclipse.mylyn.commons.identity.ui org.eclipse.mylyn.commons %pom_disable_module org.eclipse.mylyn.help.sdk org.eclipse.mylyn.tasks -# Don't build wikitext integration tests -%pom_disable_module org.eclipse.mylyn.wikitext.tests org.eclipse.mylyn.docs/wikitext/core - -# Correct bundle names -sed -i -e "s/org.hamcrest;/org.hamcrest.core;/g" `find . -name MANIFEST.MF` -%if 0%{?fedora} && 0%{?fedora} < 30 -sed -i -e "s/org.mockito;/org.mockito.mockito-core;/g" `find . -name MANIFEST.MF` -%else -# Fix or disable some tests not ported to mockito 2 -sed -i -e "/org.mockito/s/;bundle-version=\".*\"//" `find . -name MANIFEST.MF` -sed -i -e "/^import/s/Matchers\.argThat/hamcrest.MockitoHamcrest.argThat/" \ - org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui.tests/src/org/eclipse/mylyn/internal/tasks/ui/migrator/ConnectorMigratorTest.java -rm org.eclipse.mylyn.context/org.eclipse.mylyn.context.tasks.ui.tests/src/org/eclipse/mylyn/internal/context/tasks/ui/ContextTaskActivationListenerTest.java -sed -i -e '/ContextTaskActivationListenerTest/d' org.eclipse.mylyn.context/org.eclipse.mylyn.context.tasks.ui.tests/src/org/eclipse/mylyn/context/tasks/ui/tests/AllContextTasksUiTests.java -%endif - # Use default buildtimestamp source %pom_remove_dep :tycho-buildtimestamp-jgit org.eclipse.mylyn/org.eclipse.mylyn-parent %pom_remove_dep :tycho-sourceref-jgit org.eclipse.mylyn/org.eclipse.mylyn-parent sed -i -e "//,+3d" org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml -# Add descriptors to allow tests to run -sed -i -e "s@false<@true<@" org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml - # Fix parent pom versions %pom_xpath_set pom:parent/pom:version "%{parentpomversion}" org.eclipse.mylyn.docs/docs/pom.xml -# Be more tolerant for objenesis, gson and guava -sed -i -e "/org.objenesis;bundle-version/s/1.0.0,2.0.0/1.0.0,3.0.0/g" $(find -name MANIFEST.MF) +# Be more tolerant for gson and guava sed -i -e "/com.google.guava;bundle-version/s/21.0.0,22.0.0/18.0.0,22.0.0/g" $(find -name MANIFEST.MF) sed -i -e "/com.google.gson.*version/s/2.7.0,2.[89].0/2.2.0,2.9.0/g" $(find -name MANIFEST.MF) sed -i -e "s/21\.0/18.0/" $(find org.eclipse.mylyn.docs -name pom.xml) @@ -362,7 +323,6 @@ for mod in $(grep -l 'org.eclipse.jdt.annotation' $(find -name build.properties) done %mvn_package "::{target,pom}::" __noinstall -%mvn_package ":*.test{s,_feature}" tests %mvn_package "::jar:sources:" sdk %mvn_package ":*.sdk{,_feature}" sdk %mvn_package ":org.eclipse.mylyn.tests.util" sdk @@ -458,9 +418,10 @@ install %{SOURCE6} \ %files sdk -f .mfiles-sdk -%files tests -f .mfiles-tests - %changelog +* Fri May 10 2019 Mat Booth - 3.25.0-0.8 +- Don't build and ship tests + * Thu May 09 2019 Mat Booth - 3.25.0-0.7 - Drop ship incubating components, they are not maintained upstream