[eclipse] Update to Kepler M6.
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Mar 18 09:19:15 UTC 2013
commit 5dda4fa4a2d05e3bc2d3f5bbc911f87cf5515158
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Mar 15 09:27:43 2013 +0100
Update to Kepler M6.
.gitignore | 5 +
eclipse-adjust-p2-dependencies.patch | 11 -
eclipse-change-build-packagings.patch | 2 +-
eclipse-fix-comaptibility-class.patch | 7 +
eclipse-help-doc-adjust-dependencies.patch | 25 +-
eclipse-no-source-for-dependencies.patch | 567 +++++-----------------------
eclipse-remove-jgit-provider.patch | 16 +-
eclipse-secondary-arches.patch | 4 +-
eclipse-test-support.patch | 360 +++++++++----------
eclipse.spec | 59 ++--
get-eclipse.sh | 5 +-
macros.eclipse | 16 -
sources | 4 +-
13 files changed, 330 insertions(+), 751 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ab8398..9addac9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,8 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
/eclipse-build-26ca46c89997ffd16c25ee54f01312b39e58094b.tar.xz
/eclipse-build-6b87956a336ea648fcd4e420eea0ce578e76e3d1.tar.xz
/eclipse-build-5d6f586d503faf96dc0397915882dbd9ca180b7e.tar.xz
+/eclipse-build-c95d70019836e224cf70a7f887d0f49f18af6b8a.tar.xz
+/eclipse-build-817d2af850a3fc1769672fe63f9bd9e647029b67.tar.xz
+/eclipse-build-e8d22ec9a71e8345829f67eae1f83edba4091bac.tar.xz
+/eclipse-build-3f54ce82ff1310076f964b1ba41cc98888fb1f5e.tar.xz
+/eclipse-build-d6063a02c1c32de4b1a262ba8a8da02bed578524.tar.xz
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index f2dec83..81c015c 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -19,7 +19,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
--<product uid="org.eclipse.platform.ide" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="false">
+-<product uid="org.eclipse.platform.ide" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
diff --git a/eclipse-fix-comaptibility-class.patch b/eclipse-fix-comaptibility-class.patch
index 10511e8..c155a80 100644
--- a/eclipse-fix-comaptibility-class.patch
+++ b/eclipse-fix-comaptibility-class.patch
@@ -58,3 +58,10 @@
+ </profile>
+ </profiles>
</project>
+--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/META-INF/MANIFEST.MF
++++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/META-INF/MANIFEST.MF
+@@ -10,3 +10,4 @@
+ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
+ J2SE-1.3
+ Eclipse-BundleShape: dir
++Require-Capability: osgi.identity; filter:="(osgi.identity=org.eclipse.core.runtime)"; resolution:=optional
diff --git a/eclipse-help-doc-adjust-dependencies.patch b/eclipse-help-doc-adjust-dependencies.patch
index 0b1fa26..8716eaa 100644
--- a/eclipse-help-doc-adjust-dependencies.patch
+++ b/eclipse-help-doc-adjust-dependencies.patch
@@ -66,23 +66,14 @@ diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.ua.tests,
org.eclipse.ua.tests.browser,
---- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.orig 2013-02-20 16:44:00.000000000 +0100
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2013-02-21 16:46:33.890708760 +0100
-@@ -37,7 +37,7 @@
- <extraRequirements>
- <requirement>
- <type>eclipse-plugin</type>
-- <id>org.apache.lucene</id>
-+ <id>org.apache.lucene.core</id>
- <versionRange>[3.5,4.0)</versionRange>
- </requirement>
- <requirement>
-@@ -48,7 +48,7 @@
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2013-03-14 11:18:11.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2013-03-14 12:29:48.067564008 +0100
+@@ -31,7 +31,7 @@
+ <extraRequirements>
<requirement>
<type>eclipse-plugin</type>
- <id>org.apache.commons.logging</id>
-- <versionRange>[1.0,1.1)</versionRange>
-+ <versionRange>[1.0,1.2)</versionRange>
+- <id>org.apache.lucene</id>
++ <id>org.apache.lucene.core</id>
+ <versionRange>[3.5,4.0)</versionRange>
</requirement>
- </extraRequirements>
- </dependency-resolution>
+ <requirement>
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 59b39e7..a93125f 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -1,452 +1,13 @@
---- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig 2013-01-28 12:12:13.000000000 +0100
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties 2013-01-28 14:02:38.478960344 +0100
-@@ -15,10 +15,7 @@
- license.html
-
-
--generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,feature at org.eclipse.e4.rcp.source,plugin at com.ibm.icu.source;version=50.1.0.qualifier;unpack="false",\
--plugin at org.apache.felix.gogo.command.source;version=0.8.0.qualifier;unpack="false",\
--plugin at org.apache.felix.gogo.runtime.source;version=0.8.0.qualifier;unpack="false",\
--plugin at org.apache.felix.gogo.shell.source;version=0.8.0.qualifier;unpack="false"
-+generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,feature at org.eclipse.e4.rcp.source
-
- generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
- feature at org.eclipse.equinox.p2.core.feature.source,\
-@@ -31,16 +28,6 @@
- plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
- plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
- plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.200.qualifier;unpack="false",\
-- plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
-- plugin at org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
-- plugin at org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
-+ plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",
-
--generate.feature at org.eclipse.e4.rcp.source=org.eclipse.e4.rcp,\
-- plugin at javax.annotation.source;version=1.1.0.qualifier;unpack="false",\
-- plugin at javax.inject.source;version=1.0.0.qualifier;unpack="false",\
-- plugin at org.apache.batik.css.source;version=1.6.0.qualifier;unpack="false",\
-- plugin at org.apache.batik.util.gui.source;version=1.6.0.qualifier;unpack="false",\
-- plugin at org.apache.batik.util.source;version=1.6.0.qualifier;unpack="false",\
-- plugin at org.w3c.dom.smil.source;version=1.0.0.qualifier;unpack="false",\
-- plugin at org.w3c.dom.svg.source;version=1.1.0.qualifier;unpack="false",\
-- plugin at org.w3c.css.sac.source;version=1.3.1.qualifier;unpack="false"
-+generate.feature at org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
---- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml.bak 2012-07-25 17:45:43.000000000 +0200
-+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml 2012-07-26 15:53:52.708568166 +0200
-@@ -31,13 +31,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.commons.codec.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.apache.commons.httpclient"
- download-size="0"
- install-size="0"
-@@ -45,13 +38,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.commons.httpclient.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
-@@ -59,13 +45,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.commons.logging.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.equinox.p2.artifact.repository"
- download-size="0"
- install-size="0"
-@@ -458,13 +437,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.ecf.filetransfer.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.ecf.identity"
- download-size="0"
- install-size="0"
-@@ -472,13 +444,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.ecf.identity.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.ecf.provider.filetransfer"
- download-size="0"
- install-size="0"
-@@ -493,13 +458,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.ecf.provider.filetransfer.httpclient.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
- download-size="0"
- install-size="0"
-@@ -508,20 +466,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.ecf.provider.filetransfer.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.ecf.provider.filetransfer.ssl"
- download-size="0"
- install-size="0"
-@@ -530,20 +474,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.ecf.provider.filetransfer.ssl.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.ecf.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.ecf.ssl"
- download-size="0"
- install-size="0"
-@@ -552,13 +482,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.ecf.ssl.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.equinox.simpleconfigurator"
- download-size="0"
- install-size="0"
---- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties.bak 2012-07-25 17:45:43.000000000 +0200
-+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties 2012-07-26 15:52:00.768876554 +0200
-@@ -11,17 +11,6 @@
- ###############################################################################
- bin.includes = feature.xml,feature.properties
-
--generate.plugin at org.apache.commons.codec.source=org.apache.commons.codec
--generate.plugin at org.apache.commons.httpclient.source=org.apache.commons.httpclient
--generate.plugin at org.apache.commons.logging.source=org.apache.commons.logging
--generate.plugin at org.eclipse.ecf.filetransfer.source=org.eclipse.ecf.filetransfer
--generate.plugin at org.eclipse.ecf.identity.source=org.eclipse.ecf.identity
--generate.plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source=org.eclipse.ecf.provider.filetransfer.httpclient
--generate.plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source=org.eclipse.ecf.provider.filetransfer.httpclient.ssl
--generate.plugin at org.eclipse.ecf.provider.filetransfer.source=org.eclipse.ecf.provider.filetransfer
--generate.plugin at org.eclipse.ecf.provider.filetransfer.ssl.source=org.eclipse.ecf.provider.filetransfer.ssl
--generate.plugin at org.eclipse.ecf.source=org.eclipse.ecf
--generate.plugin at org.eclipse.ecf.ssl.source=org.eclipse.ecf.ssl
- generate.plugin at org.eclipse.equinox.frameworkadmin.equinox.source=org.eclipse.equinox.frameworkadmin.equinox
- generate.plugin at org.eclipse.equinox.frameworkadmin.source=org.eclipse.equinox.frameworkadmin
- generate.plugin at org.eclipse.equinox.p2.artifact.repository.source=org.eclipse.equinox.p2.artifact.repository
---- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml.bak 2012-07-25 17:42:07.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml 2012-07-26 16:18:17.122501404 +0200
-@@ -356,13 +356,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.felix.gogo.command.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.apache.felix.gogo.runtime"
- download-size="0"
- install-size="0"
-@@ -370,13 +363,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.felix.gogo.runtime.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.apache.felix.gogo.shell"
- download-size="0"
- install-size="0"
-@@ -384,13 +370,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.felix.gogo.shell.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.apache.mina.core"
- download-size="0"
- install-size="0"
-@@ -398,24 +377,10 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.mina.core.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.apache.sshd.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.apache.sshd.core.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
- unpack="false"/>
-
- <plugin
---- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.orig 2012-07-25 17:41:27.000000000 +0200
-+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml 2012-07-26 17:48:14.260030722 +0200
-@@ -50,32 +50,11 @@
- unpack="false"/>
-
- <plugin
-- id="javax.servlet.jsp.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="javax.servlet.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="javax.el"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
--
-- <plugin
-- id="javax.el.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.http.jetty"
-@@ -152,40 +131,20 @@
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-- <plugin
-- id="org.apache.jasper.glassfish.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.continuation"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jetty.continuation.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
-+ unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.http"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jetty.http.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
-+ unpack="false"/>
-
-
- <plugin
-@@ -195,13 +154,6 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-- id="org.eclipse.jetty.io.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-
- <plugin
- id="org.eclipse.jetty.security"
-@@ -211,28 +163,12 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jetty.security.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
--
-- <plugin
- id="org.eclipse.jetty.server"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-- id="org.eclipse.jetty.server.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
--
- <plugin
- id="org.eclipse.jetty.servlet"
- download-size="0"
-@@ -240,25 +176,11 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-- id="org.eclipse.jetty.servlet.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
- <plugin
- id="org.eclipse.jetty.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jetty.util.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
- unpack="false"/>
-
- <plugin
---- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.bak 2012-07-27 09:19:13.000000000 +0200
-+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml 2012-07-27 09:34:17.405316598 +0200
-@@ -125,12 +125,6 @@
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-- <plugin
-- id="org.apache.jasper.glassfish"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.continuation"
---- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak 2012-07-25 17:40:44.000000000 +0200
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2012-07-30 16:28:44.017838079 +0200
-@@ -67,6 +67,12 @@
- <plugin id="org.w3c.css.sac" />
- <plugin id="org.w3c.dom.smil" />
- <plugin id="org.w3c.dom.svg" />
-+
-+ <plugin id="org.w3c.dom.svg" /><plugin id="org.apache.batik.css"/><plugin id="org.apache.batik.util"/>
-+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /><plugin id="org.apache.batik.util.gui"/>
-+ <plugin id=" org.apache.felix.gogo.command" /><plugin id="javax.inject"/><plugin id="com.ibm.icu"/>
-+ <plugin id="org.apache.felix.gogo.runtime" /><plugin id="org.w3c.css.sac"/>
-+ <plugin id="org.apache.felix.gogo.shell" /><plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc"/><plugin id="org.eclipse.equinox.launcher.gtk.linux.arm"/>
- </excludes>
- </configuration>
- </execution>
--- 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
-@@ -42,6 +42,17 @@
+@@ -42,6 +42,21 @@
<excludes>
<plugin id="org.sat4j.core" />
<plugin id="org.sat4j.pb" />
+ <plugin id="org.apache.commons.codec" />
+ <plugin id="org.apache.commons.httpclient" />
++ <plugin id="org.apache.httpcomponents.httpclient" />
++ <plugin id="org.apache.httpcomponents.httpcore" />
+ <plugin id="org.apache.commons.logging" />
+ <plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.filetransfer"/>
@@ -454,6 +15,8 @@
+ <plugin id="org.eclipse.ecf.provider.filetransfer"/>
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"/>
++ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
++ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"/>
+ <plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
+ <plugin id="org.eclipse.ecf.ssl"/>
</excludes>
@@ -479,17 +42,6 @@
</execution>
</executions>
</plugin>
---- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak 2012-08-10 09:56:55.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2012-08-10 10:09:14.758180621 +0200
-@@ -59,6 +59,8 @@
-
- <plugin id="org.eclipse.equinox.security.macosx"/>
- <plugin id="org.eclipse.equinox.security.macosx"/>
-+ <plugin id="com.jcraft.jsch"/>
-+ <plugin id="org.apache.ant"/><plugin id="org.eclipse.core.filesystem.linux.ppc"/><plugin id="org.eclipse.core.filesystem.linux.ppc64"/><plugin id="org.eclipse.core.filesystem.linux.arm"/><plugin id="org.eclipse.core.filesystem.linux.s390"/><plugin id="org.eclipse.core.filesystem.linux.s390x"/>
- </excludes>
- </configuration>
- </execution>
--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100
+++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100
@@ -39,6 +39,7 @@
@@ -500,8 +52,85 @@
<plugin id="org.eclipse.pde.doc.user"/>
</excludes>
</configuration>
---- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig 2013-02-20 16:44:00.000000000 +0100
-+++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2013-02-21 10:05:41.766751192 +0100
+--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100
++++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100
+@@ -59,6 +59,8 @@
+ <excludes>
+ <plugin id="org.eclipse.jdt" />
+ <plugin id="org.eclipse.jdt.doc.user" />
++ <plugin id="org.junit" />
++ <plugin id="org.hamcrest.core" />
+ </excludes>
+ </configuration>
+ </execution>
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.bak 2013-03-14 11:18:11.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties 2013-03-14 12:45:12.956174290 +0100
+@@ -15,10 +15,7 @@
+ license.html
+
+
+-generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,feature at org.eclipse.e4.rcp.source,plugin at com.ibm.icu.source;version=50.1.0.qualifier;unpack="false",\
+-plugin at org.apache.felix.gogo.command.source;version=0.10.0.qualifier;unpack="false",\
+-plugin at org.apache.felix.gogo.runtime.source;version=0.10.0.qualifier;unpack="false",\
+-plugin at org.apache.felix.gogo.shell.source;version=0.10.0.qualifier;unpack="false"
++generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,feature at org.eclipse.e4.rcp.source,plugin at com.ibm.icu.source;version=50.1.0.qualifier;unpack="false"
+
+ generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
+ feature at org.eclipse.equinox.p2.core.feature.source,\
+@@ -31,16 +28,6 @@
+ plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
+ plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
+ plugin at org.eclipse.ecf.provider.filetransfer.httpclient4.source;version=1.0.200.qualifier;unpack="false",\
+- plugin at org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.apache.commons.codec.source;version=1.4.0.qualifier;unpack="false,\
+- plugin at org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
++ plugin at org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source;version=1.0.0.qualifier;unpack="false"
+
+-generate.feature at org.eclipse.e4.rcp.source=org.eclipse.e4.rcp,\
+- plugin at javax.annotation.source;version=1.1.0.qualifier;unpack="false",\
+- plugin at javax.inject.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.apache.batik.css.source;version=1.6.0.qualifier;unpack="false",\
+- plugin at org.apache.batik.util.gui.source;version=1.6.0.qualifier;unpack="false",\
+- plugin at org.apache.batik.util.source;version=1.6.0.qualifier;unpack="false",\
+- plugin at org.w3c.dom.smil.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.w3c.dom.svg.source;version=1.1.0.qualifier;unpack="false",\
+- plugin at org.w3c.css.sac.source;version=1.3.1.qualifier;unpack="false"
++generate.feature at org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
+\ No newline at end of file
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak 2013-03-14 11:35:02.000000000 +0100
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2013-03-14 12:53:51.015502076 +0100
+@@ -72,6 +72,13 @@
+ <plugin id="org.w3c.css.sac"/>
+ <plugin id="org.w3c.dom.smil"/>
+ <plugin id="org.w3c.dom.svg"/>
++
++ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
++ <plugin id=" org.apache.felix.gogo.command" />
++ <plugin id="com.ibm.icu"/>
++ <plugin id="org.apache.felix.gogo.runtime" />
++ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
++ <plugin id="org.apache.felix.gogo.shell" />
+ </excludes>
+ </configuration>
+ </execution>
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak 2013-03-14 11:18:11.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2013-03-14 12:57:12.344569351 +0100
+@@ -77,6 +77,13 @@
+ <plugin id="org.eclipse.update.core.win32"/>
+ <plugin id="org.eclipse.equinox.security.macosx"/>
+ <plugin id="org.eclipse.equinox.security.macosx"/>
++
++
++ <plugin id="com.jcraft.jsch"/>
++ <plugin id="org.apache.ant"/>
++ <plugin id="org.eclipse.core.filesystem.linux.arm"/>
++ <plugin id="org.eclipse.core.filesystem.linux.s390"/>
++ <plugin id="org.eclipse.core.filesystem.linux.s390x"/>
+ </excludes>
+ </configuration>
+ </execution>
+--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.bak 2013-03-14 11:18:11.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2013-03-14 13:00:08.498377327 +0100
@@ -11,31 +11,12 @@
bin.includes=feature.xml,feature.properties
@@ -525,25 +154,15 @@
- plugin at org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
- plugin at org.apache.lucene.analysis.source;version=3.5.0.qualifier;unpack="false",\
- plugin at org.apache.lucene.core.source;version=3.5.0.qualifier;unpack="false",\
-- plugin at org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\
-- plugin at org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\
-- plugin at org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\
-- plugin at org.eclipse.jetty.security.source;version=8.1.3.qualifier;unpack="false",\
-- plugin at org.eclipse.jetty.server.source;version=8.1.3.qualifier;unpack="false",\
-- plugin at org.eclipse.jetty.servlet.source;version=8.1.3.qualifier;unpack="false",\
-- plugin at org.eclipse.jetty.util.source;version=8.1.3.qualifier;unpack="false",\
+- plugin at org.eclipse.jetty.continuation.source;version=8.1.9.qualifier;unpack="false",\
+- plugin at org.eclipse.jetty.http.source;version=8.1.9.qualifier;unpack="false",\
+- plugin at org.eclipse.jetty.io.source;version=8.1.9.qualifier;unpack="false",\
+- plugin at org.eclipse.jetty.security.source;version=8.1.9.qualifier;unpack="false",\
+- plugin at org.eclipse.jetty.server.source;version=8.1.9.qualifier;unpack="false",\
+- plugin at org.eclipse.jetty.servlet.source;version=8.1.9.qualifier;unpack="false",\
+- plugin at org.eclipse.jetty.util.source;version=8.1.9.qualifier;unpack="false",\
- plugin at javax.el.source;version=2.2.0.qualifier;unpack="false"
+-
+generate.feature at org.eclipse.help.source=org.eclipse.help
-
++
generatedVersionLength=45
---- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100
-+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100
-@@ -59,6 +59,8 @@
- <excludes>
- <plugin id="org.eclipse.jdt" />
- <plugin id="org.eclipse.jdt.doc.user" />
-+ <plugin id="org.junit" />
-+ <plugin id="org.hamcrest.core" />
- </excludes>
- </configuration>
- </execution>
diff --git a/eclipse-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch
index 6e5dccb..6e61d4b 100644
--- a/eclipse-remove-jgit-provider.patch
+++ b/eclipse-remove-jgit-provider.patch
@@ -1,6 +1,6 @@
---- eclipse-parent/pom.xml.orig 2012-12-17 15:03:11.000000000 +0100
-+++ eclipse-parent/pom.xml 2012-12-18 10:01:03.641488185 +0100
-@@ -207,7 +207,7 @@
+--- eclipse-platform-parent/pom.xml.orig 2013-03-14 11:05:42.000000000 +0100
++++ eclipse-platform-parent/pom.xml 2013-03-14 13:11:05.104112979 +0100
+@@ -271,7 +271,7 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<dependencies>
@@ -9,7 +9,7 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras.version}</version>
-@@ -216,18 +216,18 @@
+@@ -280,18 +280,18 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
<version>${tycho-extras.version}</version>
@@ -28,7 +28,7 @@
+ <!--sourceReferences>
<generate>true</generate>
- </sourceReferences>
-+ </sourceReferences -->
- </configuration>
- </plugin>
- <plugin>
++ </sourceReferences-->
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index c1b1ece..49dd7fa 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -395,8 +395,8 @@
<module>bundles/org.eclipse.core.filesystem.hpux.ia64</module>
<module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
<module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
---- eclipse-parent/pom.xml.orig 2013-01-28 14:28:39.000000000 +0100
-+++ eclipse-parent/pom.xml 2013-01-28 14:31:16.528302907 +0100
+--- eclipse-platform-parent/pom.xml.orig 2013-01-28 14:28:39.000000000 +0100
++++ eclipse-platform-parent/pom.xml 2013-01-28 14:31:16.528302907 +0100
@@ -151,29 +151,9 @@
<arch>x86_64</arch>
</environment>
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 2099723..69ab685 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -1,170 +1,8 @@
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2012-12-17 15:03:11.000000000 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2012-12-18 11:08:09.033309587 +0100
-@@ -164,98 +164,14 @@
- <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
- <target name="setupPlatform">
- <echo message="os.arch ${os.arch}" />
-- <property file="equinoxp2tests.properties" />
-- <condition
-- property="platformArchive"
-- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
-- <and>
-- <os family="unix" />
-- <not>
-- <or>
-- <or>
-- <os arch="x86_64" />
-- <os arch="amd64" />
-- </or>
-- <os family="mac" />
-- </or>
-- </not>
-- </and>
-- </condition>
-- <condition
-- property="platformArchive"
-- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
-- <and>
-- <os family="mac" />
-- <os family="unix" />
-- <or>
-- <os arch="x86_64" />
-- <os arch="amd64" />
-- </or>
-- </and>
-- </condition>
-- <condition
-- property="platformArchive"
-- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
-- <and>
-- <os family="mac" />
-- <os family="unix" />
-- <!-- should not need, as long as x86_64 rules (above) comes first
-- <os arch="i386" />
-- -->
-- </and>
-- </condition>
-- <condition
-- property="platformArchive"
-- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
-- <and>
-- <os family="windows" />
-- <os arch="x86" />
-- </and>
-- </condition>
-- <condition
-- property="platformArchive"
-- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
-- <and>
-- <os family="windows" />
-- <or>
-- <os arch="x86_64" />
-- <os arch="amd64" />
-- </or>
-- </and>
-- </condition>
-- <condition
-- property="platformArchive"
-- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
-- <and>
-- <os family="unix" />
-- <or>
-- <os arch="x86_64" />
-- <os arch="amd64" />
-- </or>
-- </and>
-- </condition>
--
-- <fail
-- unless="platformArchive"
-- message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" />
--
-- <condition
-- property="platformTarget"
-- value="platform-zip">
-- <contains
-- string="${platformArchive}"
-- substring=".zip" />
-+ <property name="platformArchive" value="${runtimeArchive}" />
-+
-+ <condition property="platformTarget" value="platform-zip">
-+ <contains string="${platformArchive}" substring=".zip" />
- </condition>
-- <condition
-- property="platformTarget"
-- value="platform-tar.gz">
-- <contains
-- string="${platformArchive}"
-- substring=".tar.gz" />
-+ <condition property="platformTarget" value="platform-tar.gz">
-+ <contains string="${platformArchive}" substring=".tar.gz" />
- </condition>
-- <fail
-- unless="platformTarget"
-- message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
- <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
- <antcall target="${platformTarget}" />
- </target>
-@@ -283,7 +199,7 @@
- <exec
- dir="${platformLocation}"
- executable="tar">
-- <arg line="-xzf ${platformArchive}" />
-+ <arg line="-xzf ../${platformArchive}" />
- </exec>
- </target>
-
-@@ -815,6 +731,17 @@
- arg2="" />
- </not>
- </condition>
-+
-+ <!-- swt needs this property to run tests -->
-+ <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
-+ <include name="${testPlugin}_*" />
-+ </dirset>
-+ <property name="testPluginFolder" refid="test.plugin.folder" />
-+ <echo>trying to find ${testPluginFolder}</echo>
-+ <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
-+ <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
-+ </condition>
-+
- <antcall target="runSuite" />
- <antcall target="genResults" />
- </target>
-@@ -1252,7 +1179,7 @@
-
- <target name="all">
-
-- <antcall target="markCurrentTime">
-+ <!-- antcall target="markCurrentTime">
- <param
- name="message"
- value="start relEng" />
-@@ -1262,7 +1189,7 @@
- <param
- name="message"
- value="end relEng" />
-- </antcall>
-+ </antcall -->
-
- <antcall target="markCurrentTime">
- <param
-@@ -1374,7 +1301,7 @@
- hang, during performance testss
- -->
- <target name="platformLR">
-- <antcall target="teamcvs" />
-+ <!-- antcall target="teamcvs" / -->
- <antcall target="jface" />
- <antcall target="swt" />
- <antcall target="uiperformance" />
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig 2012-12-17 15:03:11.000000000 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2012-12-18 11:21:53.867638480 +0100
-@@ -1,5 +1,74 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.bak 2013-03-14 11:05:42.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2013-03-14 13:31:19.161559741 +0100
+@@ -1,5 +1,72 @@
#!/usr/bin/env bash
-+
+function findXvncAndSetDisplay() {
+# if [ ${headless} == 1 ]; then
+ # Try to find Xvnc
@@ -232,18 +70,16 @@
+ fi
+}
+
-+
# This file should never exist or be needed for production machine,
# but allows an easy way for a "local user" to provide this file
# somewhere on the search path ($HOME/bin is common),
-@@ -92,11 +161,17 @@
+@@ -92,59 +159,29 @@
#necessary when invoking this script through rsh
cd $dir
-+
-+ mkdir -p /tmp/eclipse-tests-directory
-+ pushd /tmp/eclipse-tests-directory
-+ rm -rf *
++ mkdir -p /tmp/eclipse-tests-directory
++ pushd /tmp/eclipse-tests-directory
++ rm -rf *
+
if [ ! -r eclipse ]
then
@@ -257,20 +93,11 @@
fi
# run tests
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.bak 2012-12-21 14:20:27.000000000 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2012-12-21 14:24:27.800161644 +0100
-@@ -178,45 +178,16 @@
launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar`
-
-
-- # make sure there is a window manager running. See bug 379026
-- # we should not have to, but may be a quirk/bug of hudson setup
-- # assuming metacity attaches to "current" display by default (which should have
-- # already been set by Hudson). We echo its value here just for extra reference/cross-checks.
-+ findXvncAndSetDisplay
-+ setArch
++findXvncAndSetDisplay
++setArch
+
-+ ant \
++ant \
+-file "/usr/share/java/eclipse-testing/test.xml" $tests \
+-Dws=$ws -Dos=$os -Darch=$arch -Dos.arch=$arch \
+-DbuildId=v20120903-1347 -Dbasedir="/tmp/eclipse-tests-directory" \
@@ -279,6 +106,15 @@
+-Dorg.eclipse.test="3.3.100" \
+-D$installmode=true $properties
+- echo " = = = Start list environment variables in effect = = = ="
+- env
+- echo " = = = End list environment variables in effect = = = ="
+-
+- # make sure there is a window manager running. See bug 379026
+- # we should not have to, but may be a quirk/bug of hudson setup
+- # assuming metacity attaches to "current" display by default (which should have
+- # already been set by Hudson). We echo its value here just for extra reference/cross-checks.
+-
- echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz):"
- wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
- echo "Window Manager processes: $wmpss"
@@ -316,15 +152,159 @@
- else
- $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
- fi
-+cleanupXvnc
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-12-21 19:31:12.000000000 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2012-12-27 08:26:23.767346326 +0100
-@@ -1291,7 +1291,7 @@
- <antcall target="debug" />
- <antcall target="ui" />
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.bak 2013-03-14 11:05:42.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2013-03-14 13:40:32.972238775 +0100
+@@ -164,98 +164,15 @@
+ <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
+ <target name="setupPlatform">
+ <echo message="os.arch ${os.arch}" />
+- <property file="equinoxp2tests.properties" />
+- <condition
+- property="platformArchive"
+- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
+- <and>
+- <os family="unix" />
+- <not>
+- <or>
+- <or>
+- <os arch="x86_64" />
+- <os arch="amd64" />
+- </or>
+- <os family="mac" />
+- </or>
+- </not>
+- </and>
+- </condition>
+- <condition
+- property="platformArchive"
+- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
+- <and>
+- <os family="mac" />
+- <os family="unix" />
+- <or>
+- <os arch="x86_64" />
+- <os arch="amd64" />
+- </or>
+- </and>
+- </condition>
+- <condition
+- property="platformArchive"
+- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
+- <and>
+- <os family="mac" />
+- <os family="unix" />
+- <!-- should not need, as long as x86_64 rules (above) comes first
+- <os arch="i386" />
+- -->
+- </and>
+- </condition>
+- <condition
+- property="platformArchive"
+- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
+- <and>
+- <os family="windows" />
+- <os arch="x86" />
+- </and>
+- </condition>
+- <condition
+- property="platformArchive"
+- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
+- <and>
+- <os family="windows" />
+- <or>
+- <os arch="x86_64" />
+- <os arch="amd64" />
+- </or>
+- </and>
+- </condition>
+- <condition
+- property="platformArchive"
+- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
+- <and>
+- <os family="unix" />
+- <or>
+- <os arch="x86_64" />
+- <os arch="amd64" />
+- </or>
+- </and>
+- </condition>
+-
+- <fail
+- unless="platformArchive"
+- message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" />
+-
+- <condition
+- property="platformTarget"
+- value="platform-zip">
+- <contains
+- string="${platformArchive}"
+- substring=".zip" />
+- </condition>
+- <condition
+- property="platformTarget"
+- value="platform-tar.gz">
+- <contains
+- string="${platformArchive}"
+- substring=".tar.gz" />
+- </condition>
+- <fail
+- unless="platformTarget"
+- message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
++ <property name="platformArchive" value="${runtimeArchive}" />
++
++ <condition property="platformTarget" value="platform-zip">
++ <contains string="${platformArchive}" substring=".zip" />
++ </condition>
++ <condition property="platformTarget" value="platform-tar.gz">
++ <contains string="${platformArchive}" substring=".tar.gz" />
++ </condition>
++
+ <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
+ <antcall target="${platformTarget}" />
+ </target>
+@@ -283,7 +200,7 @@
+ <exec
+ dir="${platformLocation}"
+ executable="tar">
+- <arg line="-xzf ${platformArchive}" />
++ <arg line="-xzf ../${platformArchive}" />
+ </exec>
+ </target>
+
+@@ -830,6 +747,18 @@
+ arg2="" />
+ </not>
+ </condition>
++
++ <!-- swt needs this property to run tests -->
++ <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
++ <include name="${testPlugin}_*" />
++ </dirset>
++ <property name="testPluginFolder" refid="test.plugin.folder" />
++ <echo>trying to find ${testPluginFolder}</echo>
++ <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
++ <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
++ </condition>
++
++
+ <antcall target="runSuite" />
+ <antcall target="genResults" />
+ </target>
+@@ -1409,7 +1338,7 @@
+ <antcall target="e4CssSwt" />
+ <antcall target="e4UI" />
<antcall target="equinoxds" />
- <antcall target="equinoxp2discovery" />
-+ <!-- antcall target="equinoxp2discovery" /-->
++ <!--antcall target="equinoxp2discovery" /-->
<antcall target="bidi" />
<antcall target="ltkuirefactoringtests" />
<antcall target="ltkcorerefactoringtests" />
+@@ -1419,7 +1348,7 @@
+ hang, during performance testss
+ -->
+ <target name="platformLR">
+- <antcall target="teamcvs" />
++ <!--antcall target="teamcvs" /-->
+ <antcall target="jface" />
+ <antcall target="swt" />
+ <antcall target="uiperformance" />
diff --git a/eclipse.spec b/eclipse.spec
index 4654961..d11666f 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -9,11 +9,13 @@ Epoch: 1
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%global eclipse_micro 0
%global initialize 1
-%global eb_commit c95d70019836e224cf70a7f887d0f49f18af6b8a
+%global eb_commit d6063a02c1c32de4b1a262ba8a8da02bed578524
%global build_id I20130128-1400
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
+%{?scl:%global _jetty_version 9}
+%{?scl:%global _jetty_version 8}
%ifarch %{ix86}
%define eclipse_arch x86
@@ -39,7 +41,7 @@ Epoch: 1
#
# Prevent brp-java-repack-jars from being run.
%define __jar_repack 0
-
+%define __jar_repack %{nil}
#Usage
# _secondary baseArch targetArch
@@ -55,7 +57,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.24.git3fd9eca%{?dist}
+Release: 0.25.git38f1df9%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -63,7 +65,6 @@ URL: http://www.eclipse.org/
Source0: eclipse-source.tar.bz2
#http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
Source1: eclipse-build-%{eb_commit}.tar.xz
-Source2: macros.%{pkg_name}
# -com.sun.el
# +javax.el
@@ -116,8 +117,6 @@ Patch13: %{pkg_name}-build-filesystem-native-libs.patch
Patch14: %{pkg_name}-test-support.patch
-Patch15: %{pkg_name}-adjust-p2-dependencies.patch
-
Patch17: %{pkg_name}-secondary-arches.patch
Patch18: %{pkg_name}-debug-symbols.patch
@@ -150,6 +149,7 @@ BuildRequires: java-devel >= 1:1.7.0
BuildRequires: java-javadoc >= 1:1.7.0
BuildRequires: libXt-devel
BuildRequires: webkitgtk-devel
+BuildRequires: webkitgtk3
BuildRequires: geronimo-annotation >= 1.0-7
BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:50
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
@@ -159,9 +159,8 @@ BuildRequires: jsch >= 0:0.1.46-2
BuildRequires: apache-commons-el >= 1.0-22
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-codec >= 1.6-2
-BuildRequires: jakarta-commons-httpclient >= 1:3.1-7
-BuildRequires: felix-gogo-command >= 0.12
-BuildRequires: felix-gogo-shell >= 0.10.0-3
+BuildRequires: %{?scl_prefix}felix-gogo-command >= 0.12
+BuildRequires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3
BuildRequires: osgi(org.eclipse.jetty.util) >= 9
BuildRequires: osgi(org.eclipse.jetty.server) >= 9
BuildRequires: osgi(org.eclipse.jetty.http) >= 9
@@ -183,14 +182,16 @@ BuildRequires: atinject >= 1-6
BuildRequires: tycho >= 0.16
BuildRequires: tycho-extras >= 0.16
BuildRequires: eclipse-emf-core >= 1:2.8.1
-BuildRequires: eclipse-ecf-core
+BuildRequires: %{?scl_prefix}eclipse-ecf-core
BuildRequires: tomcat-servlet-3.0-api
BuildRequires: tomcat-el-2.2-api
BuildRequires: glassfish-jsp-api >= 2.2.1-4
BuildRequires: cglib
BuildRequires: glassfish-jsp >= 2.2.5
BuildRequires: cbi-plugins
-BuildRequires: xml-maven-plugin
+BuildRequires: xml-maven-plugin
+BuildRequires: httpcomponents-core
+BuildRequires: httpcomponents-client
%if %{bootstrap} != 1
BuildRequires: eclipse-pde
%endif
@@ -211,7 +212,9 @@ Group: Development/Tools
Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: gtk2
+Requires: gtk3
Requires: webkitgtk
+Requires: webkitgtk3
%description swt
SWT Library for GTK+-2.0.
@@ -236,9 +239,8 @@ Requires: ant-scripts
Requires: apache-commons-el >= 1.0-23
Requires: apache-commons-logging
Requires: apache-commons-codec >= 1.6-2
-Requires: jakarta-commons-httpclient >= 1:3.1-7
-Requires: felix-gogo-command >= 0.12
-Requires: felix-gogo-shell >= 0.10.0-3
+Requires: %{?scl_prefix}felix-gogo-command >= 0.12
+Requires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3
Requires: osgi(org.eclipse.jetty.util) >= 9
Requires: osgi(org.eclipse.jetty.server) >= 9
Requires: osgi(org.eclipse.jetty.http) >= 9
@@ -255,7 +257,7 @@ Requires: xml-commons-apis >= 1.4.01-6
Requires: batik >= 1.8
Requires: atinject >= 1-6
Requires: geronimo-annotation >= 1.0-7
-Requires: eclipse-ecf-core
+Requires: %{?scl_prefix}eclipse-ecf-core
Requires: eclipse-emf-core >= 2.8.1
Requires: tomcat-servlet-3.0-api
Requires: tomcat-el-2.2-api
@@ -264,6 +266,8 @@ Requires: glassfish-jsp >= 2.2.5
Requires: %{?scl_prefix}icu4j-eclipse >= 1:50
Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
+Requires: httpcomponents-core
+Requires: httpcomponents-client
%{?scl:Requires: %scl_runtime}
Provides: %{name}-cvs-client = %{epoch}:%{eclipse_version}-%{release}
Obsoletes: %{name}-cvs-client < 1:3.3.2-20
@@ -281,7 +285,6 @@ Group: Development/Tools
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-cvs-client = %{epoch}:%{eclipse_version}-%{release}
Requires: junit >= 4.10-5
-Requires: jakarta-commons-httpclient >= 1:3.1-7
Requires: hamcrest >= 0:1.1-11
Requires: java-javadoc >= 1:1.7.0
@@ -338,7 +341,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch12
%patch13
%patch14
-%patch15
%patch17
%patch18
%patch20
@@ -471,20 +473,21 @@ done
#fake dependencies that don't exist in fedora
./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* %{_javadir} %{_bindir} -makejar
-#./dependencies/./fake_junit3_dependency.sh .m2/p2/repo-sdk/plugins/org.junit_* %{_javadir} -makejar
cp -r /usr/share/java/emf/eclipse/features/* .m2/p2/repo-sdk/features/
-sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-parent/pom.xml
-sed -i -e 's@!long at long@' eclipse-parent/pom.xml
+sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom.xml
+sed -i -e 's@!long at long@' eclipse-platform-parent/pom.xml
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
find eclipse.platform.ua -name pom.xml -exec sed -i -e 's at org.apache.lucene<@org.apache.lucene.core<@g' {} \;
+
+
%build
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx900m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
-mvn-rpmbuild -f eclipse-parent/pom.xml \
+mvn-rpmbuild -f eclipse-platform-parent/pom.xml \
install \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck
@@ -711,11 +714,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
-# Install eclipse macros file
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
-
-
##############
# Tests
@@ -780,7 +778,6 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/.eclipseproduct
%config %{_libdir}/%{pkg_name}/eclipse.ini
%config %{_sysconfdir}/eclipse.ini
-%{_sysconfdir}/rpm/macros.%{pkg_name}
%{?!scl:%{_datadir}/applications/*}
%{?!scl:%{_datadir}/pixmaps/}
%{?!scl:%{_datadir}/icons/*/*/apps/*}
@@ -807,7 +804,8 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util.gui_*
%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util_*
%{_libdir}/%{pkg_name}/plugins/org.apache.commons.codec_*
-%{_libdir}/%{pkg_name}/plugins/org.apache.commons.httpclient_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.httpcomponents.httpclient_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.httpcomponents.httpcore_*
%{_libdir}/%{pkg_name}/plugins/org.apache.commons.logging_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.command_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.runtime_*
@@ -943,7 +941,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.director.app_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.ssl_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf_*
@@ -1010,6 +1010,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Thu Mar 14 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.25.git38f1df9
+- Update to latest upstream.
+
* Tue Mar 5 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.24.git3fd9eca
- Add depmap for org.eclipse.jetty.orbit
- Resolves: rhbz#917619
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 9ae207f..557a981 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,13 +1,14 @@
#!/bin/bash
+set -e
rm -rf R4_platform-aggregator
-rm eclipse-source.tar.bz2
+rm -rf eclipse-source.tar.bz2
git clone --recurse-submodules git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git R4_platform-aggregator
pushd R4_platform-aggregator
-find . -type d -name ".git" -exec rm -rf {} \;
+find . -type d -name "\.git" -exec rm -rf {} \;
find . -type f -name "*.class" -exec rm -rf {} \;
diff --git a/sources b/sources
index bdfa28e..00f48cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0dd697f9be2dd37e22412f8d9eb67d25 eclipse-source.tar.bz2
-b1b201c168740230a93936552124f2cd eclipse-build-c95d70019836e224cf70a7f887d0f49f18af6b8a.tar.xz
+3fb33bcb7ab9a191f6edcce95faa4e71 eclipse-build-d6063a02c1c32de4b1a262ba8a8da02bed578524.tar.xz
+ad3e929396a938efba96ea8c53c177b6 eclipse-source.tar.bz2
More information about the scm-commits
mailing list