diff --git a/.gitignore b/.gitignore
index f3d8d06..3e15f63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,6 @@ eclipse-4.2.0-I20120405-1114-src.tar.bz2
/results_eclipse
/.m2
/.xmvn
-/R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2
+/.build-*.log
/org.eclipse.linuxtools.eclipse-build-*.tar.bz2
+/org.eclipse.linuxtools.eclipse-build-*/
diff --git a/eclipse-bug-404448.patch b/eclipse-bug-404448.patch
deleted file mode 100644
index e1f7654..0000000
--- a/eclipse-bug-404448.patch
+++ /dev/null
@@ -1,222 +0,0 @@
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"
-@@ -11321,6 +11321,24 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
- }
- #endif
-
-+#ifndef NO__1gtk_1image_1set_1from_1gicon
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1gicon)
-+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
-+{
-+ OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon_FUNC);
-+/*
-+ gtk_image_set_from_gicon((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2);
-+*/
-+ {
-+ OS_LOAD_FUNCTION(fp, gtk_image_set_from_gicon)
-+ if (fp) {
-+ ((void (CALLING_CONVENTION*)(GtkImage *, GIcon *, GtkIconSize))fp)((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2);
-+ }
-+ }
-+ OS_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon_FUNC);
-+}
-+#endif
-+
- #ifndef NO__1gtk_1image_1set_1from_1pixbuf
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h"
-@@ -175,6 +175,7 @@
- #define gtk_icon_info_free_LIB LIB_GTK
- #define gtk_icon_set_render_icon_LIB LIB_GTK
- #define gtk_icon_theme_lookup_by_gicon_LIB LIB_GTK
-+#define gtk_image_set_from_gicon_LIB LIB_GTK
- #define gdk_keyboard_ungrab_LIB LIB_GDK
- #define gtk_icon_theme_get_default_LIB LIB_GTK
- #define gtk_menu_item_remove_submenu_LIB LIB_GTK
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c"
-@@ -818,6 +818,7 @@ char * OS_nativeFunctionNames[] = {
- "_1gtk_1image_1menu_1item_1set_1image",
- "_1gtk_1image_1new",
- "_1gtk_1image_1new_1from_1pixbuf",
-+ "_1gtk_1image_1set_1from_1gicon",
- "_1gtk_1image_1set_1from_1pixbuf",
- "_1gtk_1init_1check",
- "_1gtk_1label_1get_1layout",
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h"
-@@ -828,6 +828,7 @@ typedef enum {
- _1gtk_1image_1menu_1item_1set_1image_FUNC,
- _1gtk_1image_1new_FUNC,
- _1gtk_1image_1new_1from_1pixbuf_FUNC,
-+ _1gtk_1image_1set_1from_1gicon_FUNC,
- _1gtk_1image_1set_1from_1pixbuf_FUNC,
- _1gtk_1init_1check_FUNC,
- _1gtk_1label_1get_1layout_FUNC,
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java"
-@@ -8266,6 +8266,21 @@ public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*in
- }
- }
- /**
-+ * @method flags=dynamic
-+ * @param image cast=(GtkImage *)
-+ * @param gicon cast=(GIcon *)
-+ * @param size cast=(GtkIconSize)
-+ */
-+public static final native void _gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size);
-+public static final void gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size) {
-+ lock.lock();
-+ try {
-+ _gtk_image_set_from_gicon(image, gicon, size);
-+ } finally {
-+ lock.unlock();
-+ }
-+}
-+/**
- * @param argc cast=(int *)
- * @param argv cast=(char ***)
- */
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java"
-@@ -875,11 +875,11 @@ public void setImage (Image image) {
- imageList = new ImageList ();
- int imageIndex = imageList.add (image);
- long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
-- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf(imageHandle, pixbuf);
- if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
- OS.gtk_widget_show (imageHandle);
- } else {
-- OS.gtk_image_set_from_pixbuf (imageHandle, 0);
-+ gtk_image_set_from_pixbuf (imageHandle, 0);
- OS.gtk_widget_show (labelHandle);
- OS.gtk_widget_hide (imageHandle);
- }
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java"
-@@ -535,11 +535,11 @@ public void setImage (Image image) {
- imageList = new ImageList ();
- int imageIndex = imageList.add (image);
- long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
-- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
- OS.gtk_widget_show (imageHandle);
- } else {
-- OS.gtk_image_set_from_pixbuf (imageHandle, 0);
-+ gtk_image_set_from_pixbuf (imageHandle, 0);
- OS.gtk_widget_show (labelHandle);
- OS.gtk_widget_hide (imageHandle);
- }
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java"
-@@ -535,11 +535,11 @@ public void setImage (Image image) {
- imageList = new ImageList ();
- int imageIndex = imageList.add (image);
- long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
-- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- OS.gtk_widget_hide (labelHandle);
- OS.gtk_widget_show (imageHandle);
- } else {
-- OS.gtk_image_set_from_pixbuf (imageHandle, 0);
-+ gtk_image_set_from_pixbuf (imageHandle, 0);
- OS.gtk_widget_show (labelHandle);
- OS.gtk_widget_hide (imageHandle);
- }
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java"
-@@ -307,10 +307,10 @@ public void setImage (Image image) {
- imageList.put (imageIndex, image);
- }
- long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
-- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- OS.gtk_widget_show (imageHandle);
- } else {
-- OS.gtk_image_set_from_pixbuf (imageHandle, 0);
-+ gtk_image_set_from_pixbuf (imageHandle, 0);
- OS.gtk_widget_hide (imageHandle);
- }
- }
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java"
-@@ -553,10 +553,10 @@ public void setImage (Image image) {
- int imageIndex = headerImageList.indexOf (image);
- if (imageIndex == -1) imageIndex = headerImageList.add (image);
- long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
-- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- OS.gtk_widget_show (imageHandle);
- } else {
-- OS.gtk_image_set_from_pixbuf (imageHandle, 0);
-+ gtk_image_set_from_pixbuf (imageHandle, 0);
- OS.gtk_widget_hide (imageHandle);
- }
- }
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java"
-@@ -608,7 +608,7 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
- int index = imageList.indexOf (hotImage);
- if (index != -1 && imageHandle != 0) {
- long /*int*/ pixbuf = imageList.getPixbuf (index);
-- OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf(imageHandle, pixbuf);
- }
- }
- }
-@@ -652,7 +652,7 @@ long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {
- int index = imageList.indexOf (image);
- if (index != -1 && imageHandle != 0) {
- long /*int*/ pixbuf = imageList.getPixbuf (index);
-- OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf(imageHandle, pixbuf);
- }
- }
- }
-@@ -998,9 +998,9 @@ public void setImage (Image image) {
- imageList.put (imageIndex, image);
- }
- long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
-- OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf(imageHandle, pixbuf);
- } else {
-- OS.gtk_image_set_from_pixbuf(imageHandle, 0);
-+ gtk_image_set_from_pixbuf(imageHandle, 0);
- }
- /*
- * If Text/Image of a tool-item changes, then it is
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java"
-@@ -550,10 +550,10 @@ public void setImage (Image image) {
- int imageIndex = headerImageList.indexOf (image);
- if (imageIndex == -1) imageIndex = headerImageList.add (image);
- long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
-- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-+ gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- OS.gtk_widget_show (imageHandle);
- } else {
-- OS.gtk_image_set_from_pixbuf (imageHandle, 0);
-+ gtk_image_set_from_pixbuf (imageHandle, 0);
- OS.gtk_widget_hide (imageHandle);
- }
- }
---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java"
-+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java"
-@@ -2171,4 +2171,13 @@ void gtk_widget_get_preferred_size (long /*int*/ widget, GtkRequisition requisit
- OS.gtk_widget_size_request (widget, requisition);
- }
- }
-+
-+void gtk_image_set_from_pixbuf (long /*int*/ imageHandle, long /*int*/ pixbuf){
-+ if (OS.GTK3) {
-+ OS.gtk_image_set_from_gicon(imageHandle, pixbuf, OS.GTK_ICON_SIZE_SMALL_TOOLBAR);
-+ } else {
-+ OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
-+ }
-+}
-+
- }
diff --git a/eclipse-bug-408505.patch b/eclipse-bug-408505.patch
deleted file mode 100644
index f83afe0..0000000
--- a/eclipse-bug-408505.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java.bak 2013-01-28 12:16:08.000000000 +0100
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java 2013-02-19 13:22:29.529926456 +0100
-@@ -987,7 +987,17 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
- allocation.width = width;
- allocation.height = height;
- }
-- OS.gtk_widget_size_allocate (topHandle, allocation);
-+ /*
-+ * The widget needs to be shown before its size is allocated
-+ * in GTK 3.8 otherwise its allocation return 0
-+ */
-+ if (OS.GTK_VERSION >= OS.VERSION (3, 8, 0) && !OS.gtk_widget_get_visible(handle)) {
-+ OS.gtk_widget_show(handle);
-+ OS.gtk_widget_size_allocate (topHandle, allocation);
-+ OS.gtk_widget_hide(handle);
-+ } else {
-+ OS.gtk_widget_size_allocate (topHandle, allocation);
-+ }
- }
- /*
- * Bug in GTK. Widgets cannot be sized smaller than 1x1.
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 6575c3f..5ad2457 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -1,6 +1,6 @@
--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.orig 2014-03-12 10:25:46.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 2014-03-12 12:17:01.623708316 +0000
-@@ -46,7 +46,7 @@
+@@ -50,7 +50,7 @@
SDKProfile
@@ -15,12 +15,12 @@
--
-+
+-
++
-@@ -161,6 +161,7 @@
+@@ -167,6 +167,7 @@
@@ -31,7 +31,7 @@
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.orig 2014-03-12 10:25:46.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2014-03-12 12:17:01.625708314 +0000
@@ -34,5 +34,6 @@
- osgistarter.config.launcher
+ sdk
equinox.starterkit.product
eclipse-junit-tests
+ jdtpde
@@ -50,3 +50,19 @@
+ version="0.0.0"
+ unpack="false"/>
+--- eclipse.platform.releng.tychoeclipsebuilder/jdtpde/pom.xml.orig 2014-03-25 11:20:26.959967304 +0000
++++ eclipse.platform.releng.tychoeclipsebuilder/jdtpde/pom.xml 2014-03-25 11:20:41.710980911 +0000
+@@ -17,11 +17,11 @@
+
+ org.eclipse
+ eclipse-platform-parent
+- 4.3.0-SNAPSHOT
++ 4.4.0-SNAPSHOT
+ ../../eclipse-platform-parent
+
+
+ org.eclipse.jdt.update-site
+- 4.3.0-SNAPSHOT
++ 4.4.0-SNAPSHOT
+ eclipse-repository
+
diff --git a/eclipse-do-not-run-as-root.patch b/eclipse-do-not-run-as-root.patch
deleted file mode 100644
index e5ebfd7..0000000
--- a/eclipse-do-not-run-as-root.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2012-05-05 14:41:12.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2012-05-18 15:28:28.553493782 +0200
-@@ -235,6 +235,9 @@
- protected BufferedWriter log = null;
- protected boolean newSession = true;
-
-+ private boolean forbiddenMasterEclipse;
-+ private static final String FORBIDDEN_MASTER_ECLIPSE = "-preventMasterEclipseLaunch";
-+
- // for variable substitution
- public static final String VARIABLE_DELIM_STRING = "$"; //$NON-NLS-1$
- public static final char VARIABLE_DELIM_CHAR = '$';
-@@ -555,6 +558,12 @@
- setupVMProperties();
- processConfiguration();
-
-+if (forbiddenMasterEclipse && System.getProperty(PROP_SHARED_CONFIG_AREA) == null) { //$NON-NLS-1$
-+ System.err.println("This application should not be run by the owner of the shared configuration.");
-+ System.setProperty(PROP_EXITCODE, "" + 14); //$NON-NLS-1$
-+ return;
-+ }
-+
- // need to ensure that getInstallLocation is called at least once to initialize the value.
- // Do this AFTER processing the configuration to allow the configuration to set
- // the install location.
-@@ -1532,6 +1541,10 @@
- // passed thru this arg (i.e., do not set found = true)
- continue;
- }
-+ if (args[i].equalsIgnoreCase(FORBIDDEN_MASTER_ECLIPSE)) {
-+ forbiddenMasterEclipse = true;
-+ found = true;
-+ }
-
- // check if development mode should be enabled for the entire platform
- // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -),
diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch
index 4d5df65..706fc23 100644
--- a/eclipse-fix-dropins.patch
+++ b/eclipse-fix-dropins.patch
@@ -1,14 +1,6 @@
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
-@@ -7,6 +7,7 @@
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Ericsson AB - ongoing development
-+ * Red Hat, Inc. - Bug 408138
- ******************************************************************************/
- package org.eclipse.equinox.internal.p2.engine;
-
-@@ -38,6 +39,7 @@ import org.xml.sax.SAXException;
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java.orig 2014-03-24 10:49:00.000000000 +0000
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java 2014-03-24 15:39:32.122246214 +0000
+@@ -39,6 +39,7 @@
public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
@@ -16,9 +8,9 @@
private static final String SIMPLE_PROFILE_REGISTRY_INTERNAL = "_simpleProfileRegistry_internal_"; //$NON-NLS-1$
private static final String PROFILE_REGISTRY = "profile registry"; //$NON-NLS-1$
private static final String PROFILE_PROPERTIES_FILE = "state.properties"; //$NON-NLS-1$
-@@ -263,6 +265,14 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
- internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_NEW);
- internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getBaseTimestamp(profile.getProfileId()), getBaseTimestamp(id));
+@@ -266,6 +267,14 @@
+ //fragments support - remeber the property
+ internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getExtTimeStamp(), getExtTimeStamp());
agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp()));
+
+ // this looks like a hack, but:
@@ -31,19 +23,20 @@
} else {
//This is the first time we create the shared profile. Tag it as such and also remember the timestamp of the base
internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL);
-@@ -279,6 +289,12 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
+@@ -299,6 +308,13 @@
if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null)
return false;
+ // if the property is set by OSGI, and there is no new timestamp (because of the previous condition)
+ // ignore current profile. This will happen only once, because SERVICE_SHARED_INSTALL_NEW_TIMESTAMP
+ // is set during profile reset.
-+ if ("true".equals(System.getProperty(PROP_IGNORE_USER_CONFIGURATION))){ //$NON-NLS-1$ //$NON-NLS-2$
++ if ("true".equals(System.getProperty(PROP_IGNORE_USER_CONFIGURATION))) { //$NON-NLS-1$ //$NON-NLS-2$
+ System.setProperty(PROP_IGNORE_USER_CONFIGURATION, "processed_and_unset"); //$NON-NLS-1$ //$NON-NLS-2$
-+ return true;}
++ return true;
++ }
String baseTimestamp = getBaseTimestamp(profile.getProfileId());
- if (baseTimestamp == null)
- return false;
+ String extTimestamp = getExtTimeStamp();
+ if (baseTimestamp == null) {
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
@@ -570,6 +570,7 @@
@@ -84,7 +77,7 @@
}
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2013-06-10 09:33:20.000000000 +0200
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2013-06-11 15:44:28.654682088 +0200
-@@ -151,7 +151,7 @@
+@@ -145,7 +145,7 @@
}
public boolean performCancel() {
diff --git a/eclipse-help-doc-adjust-dependencies.patch b/eclipse-help-doc-adjust-dependencies.patch
index e810ba5..52105b2 100644
--- a/eclipse-help-doc-adjust-dependencies.patch
+++ b/eclipse-help-doc-adjust-dependencies.patch
@@ -20,27 +20,6 @@ index c63d1e1..8e7cc30 100644
download-size="0"
install-size="0"
version="0.0.0"
-diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
-index a12f6d8..b16a0a3 100644
---- a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
-+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
-@@ -31,13 +31,13 @@
-
-
- eclipse-plugin
-- org.apache.lucene
-- [3.5,4.0)
-+ org.apache.lucene.core
-+ [3.5,5.0)
-
-
- eclipse-plugin
- org.apache.lucene.analysis
-- [3.5,4.0)
-+ [3.5,5.0)
-
-
-
diff --git a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
index 0af7e6b..1985d9e 100644
--- a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -73,57 +52,3 @@ index 12beb8e..e20ea19 100644
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.ua.tests,
org.eclipse.ua.tests.browser,
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/pom.xml b/eclipse.platform.ua/org.eclipse.ua.tests/pom.xml
-index 06eb56f..d7b592d 100644
---- a/eclipse.platform.ua/org.eclipse.ua.tests/pom.xml
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/pom.xml
-@@ -20,4 +20,29 @@
- org.eclipse.ua.tests
- 3.3.600-SNAPSHOT
- eclipse-test-plugin
-+
-+
-+
-+
-+ org.eclipse.tycho
-+ target-platform-configuration
-+
-+
-+
-+
-+ eclipse-plugin
-+ org.apache.lucene.core
-+ [3.0,5.0)
-+
-+
-+ eclipse-plugin
-+ org.apache.lucene.analysis
-+ [3.0,5.0)
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/eclipse.platform.ua/pom.xml b/eclipse.platform.ua/pom.xml
-index 927e027..c2480a8 100644
---- a/eclipse.platform.ua/pom.xml
-+++ b/eclipse.platform.ua/pom.xml
-@@ -59,12 +59,12 @@
-
- eclipse-plugin
- org.apache.lucene
-- [3.5,4.0)
-+ [3.5,5.0)
-
-
- eclipse-plugin
- org.apache.lucene.analysis
-- [3.5,4.0)
-+ [3.5,5.0)
-
-
-
-
diff --git a/eclipse-ignore-version-when-calculating-home.patch b/eclipse-ignore-version-when-calculating-home.patch
index c465921..7d5ce7c 100644
--- a/eclipse-ignore-version-when-calculating-home.patch
+++ b/eclipse-ignore-version-when-calculating-home.patch
@@ -1,6 +1,6 @@
---- rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java.orig 2012-05-05 14:40:27.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java 2012-05-18 09:18:35.819051000 +0200
-@@ -317,7 +317,7 @@
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.orig 2014-03-24 12:06:59.530918305 +0000
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2014-03-24 12:07:42.709932098 +0000
+@@ -1362,7 +1362,7 @@
String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
if (appVersion == null || appVersion.trim().length() == 0)
appVersion = ""; //$NON-NLS-1$
@@ -9,9 +9,9 @@
} catch (IOException e) {
// Do nothing if we get an exception. We will default to a standard location
// in the user's home dir.
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.bak 2013-05-29 08:55:02.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2013-05-29 12:54:07.106821218 +0200
-@@ -1359,7 +1359,7 @@
+--- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java.orig 2014-03-24 12:05:52.666896971 +0000
++++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java 2014-03-24 12:06:46.076914704 +0000
+@@ -296,7 +296,7 @@
String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
if (appVersion == null || appVersion.trim().length() == 0)
appVersion = ""; //$NON-NLS-1$
diff --git a/eclipse-jetty-9.patch b/eclipse-jetty-9.patch
index e797f33..f0aec8c 100644
--- a/eclipse-jetty-9.patch
+++ b/eclipse-jetty-9.patch
@@ -35,7 +35,7 @@ index deb06c3..f993d0e 100755
+ org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.util.ssl;version="[9.0.0,10.0.0)",
org.osgi.framework;version="1.3.0",
- org.osgi.service.cm;version="1.2.0",
+ org.osgi.service.cm;version="[1.4, 2.0)",
org.osgi.service.startlevel;version="1.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -252,10 +252,23 @@ index d55a157..0000000
- if ((name == null && this.localName == null) || (name != null && name.equals(this.localName)))
- return this;
- return new Logger(name);
-diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
-index c9224bd..4435b86 100755
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java.orig 2014-03-24 10:46:20.000000000 +0000
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java 2014-03-24 14:59:31.662164402 +0000
+@@ -169,6 +169,12 @@ public class EquinoxStdErrLog implements Logger {
+ realLogger.debug(thrown);
+ }
+
++ public void debug(String msg, long value) {
++ if (threshold > DEBUG)
++ return;
++ realLogger.debug(msg, value);
++ }
++
+ public void ignore(Throwable ignored) {
+ // Just post this to debug
+ debug(ignored);
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java.orig 2014-03-24 10:46:20.000000000 +0000
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java 2014-03-24 14:59:31.662164402 +0000
@@ -18,21 +18,21 @@
import org.eclipse.equinox.http.jetty.JettyConstants;
import org.eclipse.equinox.http.jetty.JettyCustomizer;
@@ -283,26 +296,25 @@ index c9224bd..4435b86 100755
private static final String CONTEXT_TEMPDIR = "javax.servlet.context.tempdir"; //$NON-NLS-1$
private static final String DIR_PREFIX = "pid_"; //$NON-NLS-1$
private static final String INTERNAL_CONTEXT_CLASSLOADER = "org.eclipse.equinox.http.jetty.internal.ContextClassLoader"; //$NON-NLS-1$
-@@ -69,18 +69,38 @@
+@@ -68,18 +68,38 @@
JettyCustomizer customizer = createJettyCustomizer(dictionary);
- Connector httpConnector = createHttpConnector(dictionary);
-- if (null != customizer)
-- httpConnector = (Connector) customizer.customizeHttpConnector(httpConnector, dictionary);
+ /**
+ * May be modified by createHttp(s)Connector.
+ */
+ HttpConfiguration http_config = new HttpConfiguration();
-
-- if (httpConnector != null)
++
+ ServerConnector httpConnector = createHttpConnector(dictionary, server, http_config);
+
+ ServerConnector httpsConnector = createHttpsConnector(dictionary, server, http_config);
+
-+ if (null != customizer)
+ if (null != customizer)
+- httpConnector = (Connector) customizer.customizeHttpConnector(httpConnector, dictionary);
+ httpConnector = (ServerConnector) customizer.customizeHttpConnector(httpConnector, dictionary);
-+
+
+- if (httpConnector != null)
+ if (httpConnector != null) {
+ try {
+ httpConnector.open();
@@ -329,7 +341,7 @@ index c9224bd..4435b86 100755
ServletHolder holder = new ServletHolder(new InternalHttpServiceServlet());
holder.setInitOrder(0);
-@@ -112,9 +132,74 @@
+@@ -111,11 +131,76 @@
try {
server.start();
} catch (Exception e) {
@@ -337,8 +349,8 @@ index c9224bd..4435b86 100755
+ //throw new ConfigurationException(pid, e.getMessage(), e);
}
servers.put(pid, server);
-+ }
-+
+ }
+
+ private ServerConnector createHttpsConnector(@SuppressWarnings("rawtypes") Dictionary dictionary, Server server, HttpConfiguration http_config) {
+ ServerConnector httpsConnector = null;
+ if (isHttpsEnabled(dictionary)) {
@@ -402,61 +414,45 @@ index c9224bd..4435b86 100755
+ httpConnector.setIdleTimeout(DEFAULT_IDLE_TIMEOUT);
+ }
+ return httpConnector;
- }
-
++ }
++
public synchronized void shutdown() throws Exception {
-@@ -125,176 +210,46 @@
+ for (Iterator it = servers.values().iterator(); it.hasNext();) {
+ Server server = it.next();
+@@ -124,155 +209,46 @@
servers.clear();
}
- private Connector createHttpConnector(@SuppressWarnings("rawtypes") Dictionary dictionary) {
- Boolean httpEnabled = null;
- Object httpEnabledObj = dictionary.get(JettyConstants.HTTP_ENABLED);
-- if (httpEnabledObj instanceof Boolean)
-- {
-- httpEnabled = (Boolean) httpEnabledObj;
+- if (httpEnabledObj instanceof Boolean) {
+- httpEnabled = (Boolean) httpEnabledObj;
+- } else if (httpEnabledObj instanceof String) {
+- httpEnabled = Boolean.parseBoolean(httpEnabledObj.toString());
- }
-- else
-- if (httpEnabledObj instanceof String)
-- {
-- httpEnabled = Boolean.parseBoolean(httpEnabledObj.toString());
-- }
- if (httpEnabled != null && !httpEnabled.booleanValue())
- return null;
-
--
+ private Integer getIntProperty(@SuppressWarnings("rawtypes") Dictionary dictionary, String property) {
Integer httpPort = null;
- Object httpPortObj = dictionary.get(JettyConstants.HTTP_PORT);
-- if (httpPortObj instanceof Integer)
-- {
+ Object httpPortObj = dictionary.get(property);
-+ if (httpPortObj instanceof Integer) {
+ if (httpPortObj instanceof Integer) {
httpPort = (Integer) httpPortObj;
-+ } else if (httpPortObj instanceof String) {
-+ httpPort = Integer.valueOf(httpPortObj.toString());
+ } else if (httpPortObj instanceof String) {
+ httpPort = Integer.valueOf(httpPortObj.toString());
}
-- else
-- if (httpPortObj instanceof String)
-- {
-- httpPort = Integer.valueOf(httpPortObj.toString());
-- }
- if (httpPort == null)
- return null;
-
- Boolean nioEnabled = null;
- Object nioEnabledObj = dictionary.get(JettyConstants.HTTP_NIO);
-- if (nioEnabledObj instanceof Boolean)
-- {
-- nioEnabled = (Boolean) nioEnabledObj;
-+ if (httpPort == null) {
-+ throw new IllegalArgumentException("Expected " + property + "property, but it is not set."); //$NON-NLS-1$//$NON-NLS-2$
- }
-- else
-- if (nioEnabledObj instanceof String)
-- {
-- nioEnabled = Boolean.parseBoolean(nioEnabledObj.toString());
-- }
+- if (nioEnabledObj instanceof Boolean) {
+- nioEnabled = (Boolean) nioEnabledObj;
+- } else if (nioEnabledObj instanceof String) {
+- nioEnabled = Boolean.parseBoolean(nioEnabledObj.toString());
+- }
- if (nioEnabled == null)
- nioEnabled = getDefaultNIOEnablement();
-
@@ -480,7 +476,9 @@ index c9224bd..4435b86 100755
- // this would be unexpected since we're opening the next available port
- e.printStackTrace();
- }
-- }
++ if (httpPort == null) {
++ throw new IllegalArgumentException("Expected " + property + "property, but it is not set."); //$NON-NLS-1$//$NON-NLS-2$
+ }
- return connector;
+ return httpPort;
}
@@ -524,33 +522,21 @@ index c9224bd..4435b86 100755
+ private boolean isHttpsEnabled(@SuppressWarnings("rawtypes") Dictionary dictionary) {
+ Boolean httpsEnabled = false;
Object httpsEnabledObj = dictionary.get(JettyConstants.HTTPS_ENABLED);
-- if (httpsEnabledObj instanceof Boolean)
-- {
-- httpsEnabled = (Boolean) httpsEnabledObj;
-+ if (httpsEnabledObj instanceof Boolean) {
-+ httpsEnabled = (Boolean) httpsEnabledObj;
-+ } else if (httpsEnabledObj instanceof String) {
-+ httpsEnabled = Boolean.parseBoolean(httpsEnabledObj.toString());
+ if (httpsEnabledObj instanceof Boolean) {
+ httpsEnabled = (Boolean) httpsEnabledObj;
+ } else if (httpsEnabledObj instanceof String) {
+ httpsEnabled = Boolean.parseBoolean(httpsEnabledObj.toString());
}
-- else
-- if (httpsEnabledObj instanceof String)
-- {
-- httpsEnabled = Boolean.parseBoolean(httpsEnabledObj.toString());
-- }
- if (httpsEnabled == null || !httpsEnabled.booleanValue())
- return null;
-
- Integer httpsPort = null;
- Object httpsPortObj = dictionary.get(JettyConstants.HTTPS_PORT);
-- if (httpsPortObj instanceof Integer)
-- {
+- if (httpsPortObj instanceof Integer) {
- httpsPort = (Integer) httpsPortObj;
+- } else if (httpsPortObj instanceof String) {
+- httpsPort = Integer.valueOf(httpsPortObj.toString());
- }
-- else
-- if (httpsPortObj instanceof String)
-- {
-- httpsPort = Integer.valueOf(httpsPortObj.toString());
-- }
- if (httpsPort == null)
- return null;
-
@@ -611,51 +597,3 @@ index c9224bd..4435b86 100755
}
private ServletContextHandler createHttpContext(@SuppressWarnings("rawtypes") Dictionary dictionary) {
-@@ -316,15 +271,11 @@
- HashSessionManager sessionManager = new HashSessionManager();
- Integer sessionInactiveInterval = null;
- Object sessionInactiveIntervalObj = dictionary.get(JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL);
-- if (sessionInactiveIntervalObj instanceof Integer)
-- {
-+ if (sessionInactiveIntervalObj instanceof Integer) {
- sessionInactiveInterval = (Integer) sessionInactiveIntervalObj;
-+ } else if (sessionInactiveIntervalObj instanceof String) {
-+ sessionInactiveInterval = Integer.valueOf(sessionInactiveIntervalObj.toString());
- }
-- else
-- if (sessionInactiveIntervalObj instanceof String)
-- {
-- sessionInactiveInterval = Integer.valueOf(sessionInactiveIntervalObj.toString());
-- }
- if (sessionInactiveInterval != null)
- sessionManager.setMaxInactiveInterval(sessionInactiveInterval.intValue());
-
-From 12bc35c1dc35b7bf25874b4476bc672b940c8714 Mon Sep 17 00:00:00 2001
-From: Michael Simacek
-Date: Thu, 28 Nov 2013 13:51:05 +0100
-Subject: [PATCH] Update to Jetty 9.1.0
-
----
- .../org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java b/rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
-index 8ce6825..4cc4b94 100644
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
-@@ -169,6 +169,12 @@ public class EquinoxStdErrLog implements Logger {
- realLogger.debug(thrown);
- }
-
-+ public void debug(String msg, long value) {
-+ if (threshold > DEBUG)
-+ return;
-+ realLogger.debug(msg, value);
-+ }
-+
- public void ignore(Throwable ignored) {
- // Just post this to debug
- debug(ignored);
---
-1.8.3.1
-
diff --git a/eclipse-lucene-4.patch b/eclipse-lucene-4.patch
index 1e13e22..e008540 100644
--- a/eclipse-lucene-4.patch
+++ b/eclipse-lucene-4.patch
@@ -371,14 +371,14 @@ index e860c8d..0d5a8b6 100644
}
}
@@ -814,7 +813,7 @@ public class SearchIndex implements IHelpSearchIndex {
- //
- if (searcher != null) {
- try {
-- searcher.close();
-+ searcher.getIndexReader().close();
- } catch (IOException ioe) {
- }
- }
+ if (searches.isEmpty()) {
+ if (searcher != null) {
+ try {
+- searcher.close();
++ searcher.getIndexReader().close();
+ } catch (IOException ioe) {
+ }
+ }
@@ -888,9 +887,11 @@ public class SearchIndex implements IHelpSearchIndex {
*/
private void cleanOldIndex() {
diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
new file mode 100644
index 0000000..e0802ee
--- /dev/null
+++ b/eclipse-mockito.patch
@@ -0,0 +1,70 @@
+--- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:42:36.169928566 +0000
++++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:56:27.970146198 +0000
+@@ -43,9 +43,9 @@
+ org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
+ org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0",
+ org.eclipse.osgi.services;bundle-version="3.3.100",
+- org.hamcrest;bundle-version="1.1.0",
+- org.objenesis;bundle-version="1.0.0",
+- org.mockito;bundle-version="1.8.4"
++ org.hamcrest.core,
++ org.objenesis,
++ org.mockito.mockito-core
+ Eclipse-AutoStart: true
+ Export-Package: org.eclipse.ui.tests.api,
+ org.eclipse.ui.tests.menus
+--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:44:04.400306048 +0000
++++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:58:07.608331033 +0000
+@@ -31,9 +31,9 @@
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
+ org.eclipse.e4.ui.css.swt;bundle-version="0.11.0",
+- org.hamcrest;bundle-version="1.1.0",
+- org.objenesis;bundle-version="1.0.0",
+- org.mockito;bundle-version="1.8.4",
++ org.hamcrest.core,
++ org.objenesis,
++ org.mockito.mockito-core,
+ org.eclipse.e4.ui.css.core;bundle-version="0.10.100"
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF.orig 2014-03-26 11:46:06.262064998 +0000
++++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF 2014-03-26 12:59:21.199988996 +0000
+@@ -10,9 +10,9 @@
+ org.w3c.css.sac,
+ org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
+ org.eclipse.ui;bundle-version="3.106.0",
+- org.hamcrest;bundle-version="1.1.0",
+- org.objenesis;bundle-version="1.0.0",
+- org.mockito;bundle-version="1.8.4"
++ org.hamcrest.core,
++ org.objenesis,
++ org.mockito.mockito-core
+ Bundle-ActivationPolicy: lazy
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Import-Package: org.osgi.framework;version="1.7.0";resolution:=optional,
+--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2014-03-26 11:39:33.756282231 +0000
++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2014-03-26 13:03:00.971974954 +0000
+@@ -469,13 +469,6 @@
+ unpack="false"/>
+
+
+-
+-
+
+
@@ -44,7 +44,7 @@
--- 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
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
@@ -73,7 +73,7 @@
-plugin@org.apache.felix.gogo.command.source;version=0.10.0.qualifier;unpack="false",\
-plugin@org.apache.felix.gogo.runtime.source;version=0.10.0.qualifier;unpack="false",\
-plugin@org.apache.felix.gogo.shell.source;version=0.10.0.qualifier;unpack="false"
-+generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source,plugin@com.ibm.icu.source;version=50.1.0.qualifier;unpack="false"
++generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source
generate.feature@org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
feature@org.eclipse.equinox.p2.core.feature.source,\
@@ -115,13 +115,12 @@
---- 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
-@@ -76,6 +76,13 @@
-
-
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-03-24 12:58:43.355826288 +0000
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-03-24 13:04:46.463916138 +0000
+@@ -75,6 +75,12 @@
+
+
-+
+
+
+
diff --git a/eclipse-no-target-platform.patch b/eclipse-no-target-platform.patch
index d2223b5..cb8db90 100644
--- a/eclipse-no-target-platform.patch
+++ b/eclipse-no-target-platform.patch
@@ -1,6 +1,6 @@
---- eclipse-platform-parent/pom.xml.orig 2014-03-13 11:09:45.344247777 +0000
-+++ eclipse-platform-parent/pom.xml 2014-03-13 11:09:57.979242733 +0000
-@@ -146,13 +146,6 @@
+--- eclipse-platform-parent/pom.xml.orig 2014-03-24 15:52:04.794208197 +0000
++++ eclipse-platform-parent/pom.xml 2014-03-24 15:56:15.746202079 +0000
+@@ -170,13 +170,6 @@
org.eclipse.tycho
target-platform-configuration
@@ -8,7 +8,7 @@
-
- org.eclipse
- eclipse-sdk-prereqs
-- 4.3.0-SNAPSHOT
+- 4.4.0-SNAPSHOT
-
-
diff --git a/eclipse-osgi-unpack-sources.patch b/eclipse-osgi-unpack-sources.patch
deleted file mode 100644
index 70aa6e9..0000000
--- a/eclipse-osgi-unpack-sources.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak 2013-05-10 10:19:28.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties 2013-05-10 11:29:48.359120855 +0200
-@@ -16,8 +16,11 @@
- src.includes = src.zip,\
- about.html,\
- about_files/
--source.. = .
--output.. = .
-+source.. = src/
-+output.. = bin/
- customBuildCallbacks=customBuildCallbacks.xml
- javacSource = 1.5
- javacTarget = 1.5
-+jars.compile.order = library.jar,\
-+ src/
-+source.library.jar = src2/
-\ No newline at end of file
---- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak 2013-05-10 10:19:28.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml 2013-05-10 11:28:11.292306529 +0200
-@@ -27,18 +27,79 @@
-
- org.eclipse.tycho
- target-platform-configuration
--
-
-
-- ignore
-+ ignore
-+
-+
-+ eclipse-plugin
-+ javax.servlet
-+ 0.0.0
-+
-+
-
-
-
-+
-+ maven-antrun-plugin
-+ 1.7
-+
-+
-+ extract-sources
-+ process-resources
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ run
-+
-+
-+
-+ copy-classes-back
-+ process-classes
-+
-+
-+
-+
-+
-+
-+
-+
-+ run
-+
-+
-+
-+
-+
-+
-+
-
-
-
diff --git a/eclipse-policy-comparators.patch b/eclipse-policy-comparators.patch
new file mode 100644
index 0000000..b15cd3b
--- /dev/null
+++ b/eclipse-policy-comparators.patch
@@ -0,0 +1,30 @@
+--- eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java.orig 2014-03-27 10:48:13.547706443 +0000
++++ eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java 2014-03-27 10:52:42.615751600 +0000
+@@ -49,7 +49,7 @@
+
+ return oldStart0 - oldStart1;
+ }
+- return Policy.getComparator().compare(arg0, arg1);
++ return Policy.getComparator().compare((String)arg0, (String)arg1);
+ }
+ };
+ }
+--- eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java.orig 2014-03-27 11:27:35.233213660 +0000
++++ eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java 2014-03-27 12:19:30.696748271 +0000
+@@ -13,6 +13,7 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.net.URL;
+ import java.util.ArrayList;
++import java.util.Comparator;
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.TreeMap;
+@@ -235,7 +236,7 @@
+ // show Help button in JFace dialogs
+ TrayDialog.setDialogHelpAvailable(true);
+
+- Policy.setComparator(Collator.getInstance());
++ Policy.setComparator((Comparator)Collator.getInstance());
+ }
+
+ /*
diff --git a/eclipse-remove-w3c-smil-and-use-geronimo.patch b/eclipse-remove-w3c-smil-and-use-geronimo.patch
index d63f485..c9834ac 100644
--- a/eclipse-remove-w3c-smil-and-use-geronimo.patch
+++ b/eclipse-remove-w3c-smil-and-use-geronimo.patch
@@ -1,6 +1,6 @@
---- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2012-02-24 09:22:22.000000000 +0100
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2012-02-24 14:23:21.289474792 +0100
-@@ -124,13 +124,6 @@
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2014-03-26 11:00:57.935084582 +0000
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2014-03-26 11:02:43.076109293 +0000
+@@ -123,20 +123,6 @@
unpack="false"/>
-
-
+-
+-
@@ -13,29 +13,38 @@
id="org.eclipse.team.tests.cvs.core"
download-size="0"
install-size="0"
-@@ -392,12 +386,6 @@
+@@ -391,21 +385,6 @@
+ install-size="0"
version="0.0.0"/>
-
+-
-
-
+-
+
-
-
--
-- bundles/org.eclipse.core.filesystem.linux.s390
+ bundles/org.eclipse.core.filesystem.linux.s390x
bundles/org.eclipse.core.filesystem.hpux.ia64
- bundles/org.eclipse.core.filesystem.hpux.PA_RISC
bundles/org.eclipse.core.filesystem.linux.ppc
+ bundles/org.eclipse.core.filesystem.linux.ppc64
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index 7dd0536..66d79ee 100644
--- a/eclipse.platform.swt.binaries/pom.xml
@@ -412,7 +412,7 @@ diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.featur
index fac13bf..e487001 100644
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-@@ -207,6 +207,221 @@
+@@ -206,6 +206,221 @@
@@ -638,7 +638,7 @@ diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
index b46cdc6..0fb36a5 100644
--- a/rt.equinox.framework/pom.xml
+++ b/rt.equinox.framework/pom.xml
-@@ -53,6 +53,8 @@
+@@ -55,6 +55,8 @@
bundles/org.eclipse.equinox.launcher.gtk.aix.ppc
bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64
bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64
diff --git a/eclipse.spec b/eclipse.spec
index fa56cf7..a9485dc 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -5,18 +5,18 @@
# Set to 1 to build Eclipse without dependency to eclipse-pde
# Some parts (help) will not be built, and second run will be required,
# but this is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap 0
+%global bootstrap 1
Epoch: 1
%global eclipse_major 4
-%global eclipse_minor 3
+%global eclipse_minor 4
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%global eclipse_micro 2
+%global eclipse_micro 0
%global initialize 1
-%global eb_commit a9e58a88bc034454d79e896530be9b5b98f06dbe
-%global eclipse_tag R4_3_2
+%global eb_commit 10b193b0f225b307353a892050993d0ebb1da6f9
+%global eclipse_tag S4_4_0_M6
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
@@ -55,7 +55,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 5%{?dist}
+Release: 0.1.M6%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -81,12 +81,6 @@ Patch2: %{pkg_name}-no-source-for-dependencies.patch
# This has too many dependencies. We will not build it.
Patch3: %{pkg_name}-remove-weaving.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=385970
-Patch4: %{pkg_name}-osgi-unpack-sources.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=379102
-Patch5: %{pkg_name}-do-not-run-as-root.patch
-
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=377515
Patch6: %{pkg_name}-p2-pick-up-renamed-jars.patch
@@ -122,15 +116,19 @@ Patch17: %{pkg_name}-jetty-9.patch
Patch18: %{pkg_name}-fix-startup-class-refresh.patch
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138
Patch19: %{pkg_name}-fix-dropins.patch
-Patch20: %{pkg_name}-bug-408505.patch
-
Patch21: %{pkg_name}-bug-386377.patch
Patch22: %{pkg_name}-servlet-3.1.patch
Patch23: %{pkg_name}-lucene-4.patch
Patch24: %{pkg_name}-no-target-platform.patch
+# org.mockito -> org.mockito.mockito-core
+Patch25: %{pkg_name}-mockito.patch
+
+Patch26: %{pkg_name}-policy-comparators.patch
+
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
BuildRequires: make, gcc
@@ -152,7 +150,7 @@ BuildRequires: libXt-devel
BuildRequires: webkitgtk-devel
BuildRequires: webkitgtk3
BuildRequires: geronimo-annotation >= 1.0-7
-BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:50.1.1
+BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:52.1
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
BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
BuildRequires: jsch >= 0:0.1.46-2
@@ -179,10 +177,10 @@ BuildRequires: sac >= 1.3-12
BuildRequires: batik >= 1.8
BuildRequires: xml-commons-apis >= 1.4.01-12
BuildRequires: atinject >= 1-6
-BuildRequires: tycho >= 0.16
-BuildRequires: tycho-extras >= 0.16
+BuildRequires: tycho >= 0.19
+BuildRequires: tycho-extras >= 0.19
BuildRequires: eclipse-emf-core >= 1:2.9.2-1
-BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0-2
+BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.8.0-1
BuildRequires: tomcat-servlet-3.0-api
BuildRequires: tomcat-el-2.2-api
BuildRequires: glassfish-jsp-api >= 2.2.1-4
@@ -254,14 +252,14 @@ Requires: xml-commons-apis >= 1.4.01-12
Requires: batik >= 1.8
Requires: atinject >= 1-6
Requires: geronimo-annotation >= 1.0-7
-Requires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0-2
+Requires: %{?scl_prefix}eclipse-ecf-core >= 3.8.0-1
Requires: eclipse-emf-core >= 2.9.2-1
Requires: tomcat-servlet-3.0-api
Requires: tomcat-el-2.2-api
Requires: glassfish-jsp-api >= 2.2.1-4
Requires: glassfish-jsp >= 2.2.5
Requires: glassfish-servlet-api >= 3.1.0
-Requires: %{?scl_prefix}icu4j-eclipse >= 1:50.1.1
+Requires: %{?scl_prefix}icu4j-eclipse >= 1:52.1
Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
Requires: httpcomponents-core
@@ -305,6 +303,7 @@ Summary: Eclipse Tests
Group: Development/Tools
Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
Requires: %{?scl_prefix}easymock3
+Requires: mockito
%description tests
Eclipse Tests.
@@ -319,8 +318,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch1
%patch2
%patch3
-%patch4
-%patch5
%patch6
%patch7
%patch8
@@ -335,13 +332,14 @@ tar --strip-components=1 -xf %{SOURCE1}
%{!?scl:%patch17}
%patch18
%patch19
-%patch20
pushd rt.equinox.framework
%patch21 -p1
popd
%patch22
%patch23 -p1
%patch24
+%patch25
+%patch26
#Disable as many things as possible to make the build faster. We care only for Eclipse.
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -349,13 +347,11 @@ popd
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
-%pom_disable_module osgistarter.config.launcher eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module eclipse.platform.repository
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles
-%pom_disable_module features/master-equinox-weaving eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
@@ -369,6 +365,8 @@ popd
%pom_disable_module bundles/org.eclipse.equinox.weaving.hook rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.compendium.sdk rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.core.sdk rt.equinox.framework
+%pom_disable_module features/org.eclipse.osgi.compatibility.plugins.feature rt.equinox.framework
+%pom_disable_module bundles/org.eclipse.osgi.compatibility.plugins rt.equinox.framework
%pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2
%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
@@ -378,6 +376,7 @@ popd
%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng
%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.discovery rt.equinox.p2
+%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
%pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc eclipse.platform.swt.binaries
%pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc64 eclipse.platform.swt.binaries
@@ -392,9 +391,6 @@ popd
pushd eclipse.platform.swt.binaries/bundles
%_secondary gtk.linux.x86 x86 arm
%_secondary gtk.linux.x86_64 x86_64 aarch64
- find . -name build.xml -exec sed -i -e "s/make_xulrunner//g" {} \;
- find . -name build.xml -exec sed -i -e "s/make_mozilla//g" {} \;
- find . -name build.xml -exec sed -i -e "s/make_xpcominit//g" {} \;
popd
pushd eclipse.platform.resources/bundles
%_secondary linux.x86 x86 arm
@@ -441,8 +437,9 @@ done
#fake dependencies that don't exist in fedora
./dependencies/./fake_ant_dependency.sh .m2/p2/repo-sdk/plugins/org.apache.ant_* /usr/share/java /usr/bin -makejar
-cp -r /usr/share/java/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/
-cp -r /usr/share/java/emf/eclipse/features/* .m2/p2/repo-sdk/features/
+cp -r %{_javadir}/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/
+cp -r %{_javadir}/emf/eclipse/features/* .m2/p2/repo-sdk/features/
+cp -r %{_javadir}/ecf/eclipse/features/* .m2/p2/repo-sdk/features/
%{?scl: cp %{_javadir}/ecf/eclipse/plugins/* .m2/p2/repo-sdk/plugins}
%{?scl: cp %{_javadir}/*sat4j* .m2/p2/repo-sdk/plugins}
%if ! %{bootstrap}
@@ -453,10 +450,6 @@ cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.core_* .m2/p2/repo
sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom.xml
%endif
-# Bump batik from 1.6.0 to 1.7.0
-sed -i '/org\.apache\.batik/ s/1\.7\.0/1\.8\.0/' eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF
-sed -i 's/1\.6\.0/1\.7\.0/' eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-
# Allow usage of javax.servlet.jsp 2.3.
sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
@@ -468,9 +461,6 @@ sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.eq
sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
-%pom_remove_plugin org.eclipse.tycho:tycho-compiler-plugin rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent
-
-find eclipse.platform.ua -name pom.xml -exec sed -i -e 's@org.apache.lucene<@org.apache.lucene.core<@g' {} \;
#this is not really necessary but reduces the build time.
pushd eclipse.platform.swt.binaries/bundles/
@@ -489,22 +479,14 @@ sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.plat
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
export JAVA_HOME=%{java_home}
-
-%if ! %{bootstrap}
-pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}
- xmvn -o clean verify \
- -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
- -Dtycho.local.keepTarget -Dmaven.repo.local=../../../.m2
-popd
-%endif
-
export GTK_VERSION=3.0
-xmvn -o clean verify -P update-branding-plugins \
+xmvn -o clean verify \
%if %{bootstrap}
-P !api-generation,!build-docs \
%endif
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
- -Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."`
+ -Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."` \
+ -Dtargets=install
#symlink necessary plugins (that are provided by other packages)
dependencies/./replace_platform_plugins_with_symlinks.sh \
@@ -562,11 +544,11 @@ pushd p2/org.eclipse.equinox.p2.engine/.settings
popd
#ini file adjustements
-# Temporary fix until https://bugs.eclipse.org/294877 is resolved
sed -i "s|-Xms40m|-Xms128m|g" eclipse.ini
sed -i "s|-Xmx384m|-Xmx512m|g" eclipse.ini
-sed -i '1i-preventMasterEclipseLaunch' eclipse.ini
+sed -i '1i-protect\nmaster' eclipse.ini
+# Temporary fix until https://bugs.eclipse.org/294877 is resolved
cat >> eclipse.ini < - 1:4.4.0-0.1.M6
+- Update to M6 pre-release of Luna 4.4.0
+- Bootstrap build
+- Drop upstreamed patches: do-not-run-as-root, bug-408505,
+ bug-404448, osgi-unpack-sources
+- Add patch to use mockito-core 1.9
+
* Sat Mar 22 2014 Mat Booth - 1:4.3.2-5
- Rebuild for new version of ICU.
diff --git a/get-eclipse.sh b/get-eclipse.sh
index cd044dc..c84bba9 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=R4_3_2
+TAG=S4_4_0_M6
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index be10189..5cbb44d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fcab76495cc652ff07986cba7e4af867 R4_platform-aggregator-R4_3_2.tar.xz
-84335eb35bc43ff9f9a0b4d57f50ea07 org.eclipse.linuxtools.eclipse-build-a9e58a88bc034454d79e896530be9b5b98f06dbe.tar.bz2
+ffe1d5aacf43506dae81a422d4f88256 org.eclipse.linuxtools.eclipse-build-10b193b0f225b307353a892050993d0ebb1da6f9.tar.bz2
+abb0ead27b51c00e9b5cdc153177a427 R4_platform-aggregator-S4_4_0_M6.tar.xz