From 03b08aee677947847f79ac4fdcff0665e32fcc2f Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: May 05 2015 17:05:27 +0000
Subject: Update to latest I-build to fix bundle dep cycle in PDE builds


- Add test framework to contributor tools subpackage
- Update eclipse-build snapshot to symlink and require xz-java

---

diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 1e33c97..c4cd862 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -59,10 +59,10 @@
      id="org.eclipse.pde.api.tools.ee.feature"
      version="0.0.0" />
    <bundle
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml.orig	2014-05-26 18:59:41.877846054 +0300
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml	2014-05-26 19:06:27.070278740 +0300
-@@ -128,30 +128,10 @@
-                 </repository>
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml.orig	2015-05-05 11:43:27.284457130 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml	2015-05-05 11:47:54.058051862 +0100
+@@ -118,30 +118,10 @@
+                 <!-- source repositories to mirror from -->
  
                  <repository>
 -                  <url>${project.baseUri}/../rcp/target/repository</url>
diff --git a/eclipse-lucene-4.patch b/eclipse-lucene-4.patch
index c4dffe7..e8de4ca 100644
--- a/eclipse-lucene-4.patch
+++ b/eclipse-lucene-4.patch
@@ -457,12 +457,12 @@ index a8177c3..cd99e8a 100644
   org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100"
  Bundle-ActivationPolicy: lazy
  Bundle-Vendor: Eclipse.org
- Import-Package: javax.servlet;version="2.4.0",
-- javax.servlet.http;version="2.4.0",
+ Import-Package: javax.servlet;version="3.1.0",
+- javax.servlet.http;version="3.1.0",
 - org.apache.lucene.index;core=split;version="[3.5.0,4.0.0)",
 - org.apache.lucene.search;core=split;version="[3.5.0,4.0.0)",
 - org.apache.lucene.store;core=split;version="[3.5.0,4.0.0)"
-+ javax.servlet.http;version="2.4.0"
++ javax.servlet.http;version="3.1.0"
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Export-Package: org.eclipse.ua.tests,
   org.eclipse.ua.tests.browser,
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 6b726ec..3a877d2 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -1,6 +1,6 @@
 --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak	2012-07-25 17:45:43.000000000 +0200
 +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml	2012-07-31 07:41:13.103636303 +0200
-@@ -40,6 +40,24 @@
+@@ -40,6 +40,25 @@
                <excludes>
                  <plugin id="org.sat4j.core"/>
                  <plugin id="org.sat4j.pb"/>
@@ -22,6 +22,7 @@
 +		 <plugin id="org.eclipse.equinox.security.macosx"/>
 +		 <plugin id="org.eclipse.equinox.security.win32.x86"/>
 +		 <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
++                <plugin id="org.tukaani.xz" />
                </excludes>
              </configuration>
            </execution>
diff --git a/eclipse-remove-weaving.patch b/eclipse-remove-weaving.patch
index d1dc14b..efb7d7b 100644
--- a/eclipse-remove-weaving.patch
+++ b/eclipse-remove-weaving.patch
@@ -13,13 +13,10 @@
           id="org.eclipse.team.tests.cvs.core"
           download-size="0"
           install-size="0"
-@@ -391,21 +385,6 @@
+@@ -391,18 +385,6 @@
           install-size="0"
           version="0.0.0"/>
  
--<!-- org.aspectj.runtime is required for equinox.region tests. 
--     If they are ever moved/removed org.aspectj.runtime should 
--     be moved/removed to with them -->
 -   <plugin
 -         id="org.aspectj.runtime"
 -         download-size="0"
diff --git a/eclipse-webkit2-support.patch b/eclipse-webkit2-support.patch
index d61ad02..dfdc66d 100644
--- a/eclipse-webkit2-support.patch
+++ b/eclipse-webkit2-support.patch
@@ -1654,6 +1654,6 @@ index 763c1fe..b7fbb02 100644
 +	if(WEBKIT2){
 +		return;
 +	}
- 	assertTrue(Browser9.test());
- }
- 
+ 	if (isRunningOnEclipseOrgHudsonGTK) {
+ 		System.out.println("Test_BrowserSuite.testBrowser1() skipped, see bug 465721");
+ 		return;
diff --git a/eclipse.spec b/eclipse.spec
index d18c509..f98c799 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -11,8 +11,8 @@ Epoch:                  1
 %global eclipse_major   4
 %global eclipse_minor   5
 %global eclipse_micro   0
-%global eb_commit       7977571ebe7f8dac837c52e9707f363c832814b7
-%global eclipse_tag     I20150428-0100
+%global eb_commit       8d16bd89056f3917619b272873dfd7bc15df8919
+%global eclipse_tag     I20150504-2000
 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
 %global _jetty_version  9.2.9
 
@@ -37,7 +37,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.15.git201504280100%{?dist}
+Release:        0.16.git201505042000%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -163,7 +163,7 @@ BuildRequires: batik-css >= 1.8-0.17
 BuildRequires: xml-commons-apis >= 1.4.01-12
 BuildRequires: atinject >= 1-18
 BuildRequires: atinject-tck >= 1-18
-BuildRequires: tycho >= 0.22
+BuildRequires: tycho >= 0.22.0-15
 BuildRequires: tycho-extras >= 0.22
 BuildRequires: cbi-plugins
 BuildRequires: eclipse-ecf-core >= 3.9.3-1
@@ -175,6 +175,7 @@ BuildRequires: glassfish-servlet-api >= 3.1.0
 BuildRequires: xml-maven-plugin
 BuildRequires: httpcomponents-core >= 4.4.1-1
 BuildRequires: httpcomponents-client >= 4.4.1-1
+BuildRequires: xz-java
 BuildRequires: mockito
 BuildRequires: osgi(osgi.annotation)
 %if ! %{bootstrap}
@@ -247,6 +248,7 @@ Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
 Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
 Requires: httpcomponents-core >= 4.4.1-1
 Requires: httpcomponents-client >= 4.4.1-1
+Requires: xz-java
 
 Obsoletes: %{name}-rcp < 1:4.3.0
 Provides: %{name}-rcp = 1:%{eclipse_version}-%{release}
@@ -505,6 +507,8 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
 %mvn_package ":org.eclipse.e4{,.core}.tools*" contributor-tools
 %mvn_package ":org.eclipse.releng.tools" contributor-tools
 %mvn_package ":org.eclipse.swt.tools{,.feature}" contributor-tools
+%mvn_package "org.eclipse.test{,.feature}:" contributor-tools
+%mvn_package ":org.eclipse.ant.optional.junit" contributor-tools
 %mvn_package "*:*" __noinstall
 
 %build
@@ -706,7 +710,6 @@ chmod a+x  $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/dropins/sdk/plugins/org.eclipse
 #replace pde reference
 sed -i "s@/usr/share/eclipse@%{libdir}/%{pkg_name}@" $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/dropins/sdk/plugins/org.eclipse.pde.build_*/templates/package-build/build.properties
 
-
 ##############
 # Tests
 ##############
@@ -844,11 +847,20 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ant.core_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.compare_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.compare.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.commands_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.contenttype_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.beans_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.observable_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.property_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.expressions_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.externaltools_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filebuffers_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filesystem*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.jobs_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.net*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.resources_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.runtime_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.runtime.compatibility_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.variables_*
@@ -861,6 +873,7 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.http.servlet_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.jsp.jasper_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.help_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.help.base_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.help.ui_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.help.webapp_*
@@ -876,6 +889,7 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.team.core_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.team.ui_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.text_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.browser_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.cheatsheets_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.console_*
@@ -890,8 +904,10 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.navigator_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.navigator.resources_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.net_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.themes_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.views_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.views.properties.tabbed_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.workbench_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.workbench.texteditor_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.commands_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.contexts_*
@@ -960,17 +976,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.director.app_*
 %{_libdir}/%{pkg_name}/plugins/org.sat4j.core_*
 %{_libdir}/%{pkg_name}/plugins/org.sat4j.pb_*
+%{_libdir}/%{pkg_name}/plugins/org.tukaani.xz_*
 %{_libdir}/%{pkg_name}/plugins/org.w3c.css.sac_*
 %{_libdir}/%{pkg_name}/plugins/org.w3c.dom.svg_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.commands_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.contenttype_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.beans_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.observable_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.property_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.expressions_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.jobs_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.runtime_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.app_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.bidi_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.common_*
@@ -982,13 +990,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.registry_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.simpleconfigurator_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.util_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.help_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.jface.databinding_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.jface_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.rcp_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.themes_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.workbench_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.update.configurator_*
 %{_libdir}/%{pkg_name}/readme
 %{_libdir}/%{pkg_name}/artifacts.xml
@@ -1025,6 +1029,11 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Tue May 05 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.16.git201505042000
+- Update to latest I-build to fix bundle dep cycle in PDE builds
+- Add test framework to contributor tools subpackage
+- Update eclipse-build snapshot to symlink and require xz-java
+
 * Wed Apr 29 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.15.git201504280100
 - Contibutor-tools subpackage should be archful due to native methods
 
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 23674cb..da5cb27 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=I20150428-0100
+TAG=I20150504-2000
 
 rm -rf R4_platform-aggregator-$TAG
 rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index ba0142d..6d626f8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-18619dbfdc45becaaa5b89c89bcf5b9d  R4_platform-aggregator-I20150428-0100.tar.xz
-251493909b97467c1352f8beb6923982  org.eclipse.linuxtools.eclipse-build-7977571ebe7f8dac837c52e9707f363c832814b7.tar.bz2
+567f7b6c0c581fd66aa713a247f0edc1  R4_platform-aggregator-I20150504-2000.tar.xz
+722db3df70580f773ec46d839d18f7ea  org.eclipse.linuxtools.eclipse-build-8d16bd89056f3917619b272873dfd7bc15df8919.tar.bz2