[eclipse] Make changes necessary for Tycho 0.22.0.

[Roland Grunberg]

commit 39770762ff4e5b477c40b1b322433951873b4a78
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Sat Nov 29 13:30:47 2014 -0500

    Make changes necessary for Tycho 0.22.0.

 eclipse.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 422bcc3..2ae3078 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -171,8 +171,8 @@ BuildRequires: sac >= 1.3-12
 BuildRequires: batik >= 1.8
 BuildRequires: xml-commons-apis >= 1.4.01-12
 BuildRequires: atinject >= 1-6
-BuildRequires: tycho >= 0.19
-BuildRequires: tycho-extras >= 0.19
+BuildRequires: tycho >= 0.22
+BuildRequires: tycho-extras >= 0.22
 BuildRequires: eclipse-ecf-core >= 3.9.1-1
 BuildRequires: eclipse-emf-core >= 1:2.10.1-3
 BuildRequires: glassfish-jsp-api >= 2.2.1-4
@@ -435,6 +435,15 @@ done
 %pom_xpath_remove "pom:execution[pom:id[text()='mirror-org.eclipse.releng.tools']]" \
   eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository
 
+# Since Tycho 0.22.0 resources get copied into generated eclipse-repository.
+# We place some content in ${project.build.directory} and use that to place
+# it into some other assembled zip.
+# With 0.22.0 it will get placed also into the eclipse-repository zip.
+# Let's be careful where we place them to avoid duplication.
+%pom_xpath_remove "pom:resources" eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests
+%pom_remove_plugin :maven-resources-plugin eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests
+sed -i 's|\${project.build.directory}/resources|\${project.basedir}/src/main/resources|' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+
 # Remove the SWT build sections from every linux arch that is not currently being built
 # (this is not really necessary but further reduces the build time on arm by around 20
 # minutes per architecture that we are not currently building, over 2.5 hours in total)
@@ -1004,6 +1013,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Sat Nov 29 2014 Roland Grunberg <rgrunber at redhat.com> - 1:4.4.1-12
+- Make changes necessary for Tycho 0.22.0.
+
 * Thu Nov 27 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.1-11
 - Update eclipse-build snapshot
 - Rebuild for ECF symlink changes