bundles/org.eclipse.core.filesystem.linux.ppc64le/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.filesystem.linux.x86/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.filesystem.macosx/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.filesystem.win32.x86/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.filesystem.win32.x86_64/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.filesystem/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.filesystem; singleton:=true
-Bundle-Version: 1.7.300.qualifier
+Bundle-Version: 1.7.400.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.equinox.registry;bundle-version="[3.2.0,4.0.0)",

bundles/org.eclipse.core.filesystem/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.filesystem</artifactId>
-  <version>1.7.300-SNAPSHOT</version>
+  <version>1.7.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

bundles/org.eclipse.core.resources.spysupport/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.resources.win32.x86/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.resources.win32.x86_64/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>

bundles/org.eclipse.core.resources/.settings/.api_filters

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.core.resources" version="2">
+    <resource path="src/org/eclipse/core/resources/IProject.java" type="org.eclipse.core.resources.IProject">
+        <filter id="405901410">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.resources.IProject"/>
+                <message_argument value="getPluginWorkingLocation(IPluginDescriptor)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>

bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.resources; singleton:=true
-Bundle-Version: 3.13.300.qualifier
+Bundle-Version: 3.13.400.qualifier
 Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

bundles/org.eclipse.core.resources/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
-    <version>4.11.0-SNAPSHOT</version>
+    <version>4.12.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.resources</artifactId>
-  <version>3.13.300-SNAPSHOT</version>
+  <version>3.13.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildCommand.java

@@ -16,8 +16,7 @@
  *******************************************************************************/
 package org.eclipse.core.internal.events;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import org.eclipse.core.internal.resources.ModelObject;
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildContext.java

@@ -84,21 +84,13 @@ public class BuildContext implements IBuildContext {
 		return builtAfter;
 	}
 
-	private static final int hashCode(IBuildConfiguration[] array) {
-		final int prime = 31;
-		int result = 1;
-		for (int i = 0; i < array.length; i++)
-			result = prime * result + array[i].hashCode();
-		return result;
-	}
-
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + buildConfiguration.hashCode();
-		result = prime * result + hashCode(requestedBuilt);
-		result = prime * result + hashCode(buildOrder);
+		result = prime * result + Arrays.hashCode(requestedBuilt);
+		result = prime * result + Arrays.hashCode(buildOrder);
 		return result;
 	}
 
@@ -111,13 +103,7 @@ public class BuildContext implements IBuildContext {
 		if (getClass() != obj.getClass())
 			return false;
 		BuildContext other = (BuildContext) obj;
-		if (!buildConfiguration.equals(other.buildConfiguration))
-			return false;
-		if (!Arrays.equals(requestedBuilt, other.requestedBuilt))
-			return false;
-		if (!Arrays.equals(buildOrder, other.buildOrder))
-			return false;
-		return true;
+		return buildConfiguration.equals(other.buildConfiguration) && Arrays.equals(requestedBuilt, other.requestedBuilt) && Arrays.equals(buildOrder, other.buildOrder);
 	}
 
 }

bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/BuildConfiguration.java

@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.core.internal.resources;
 
+import java.util.Objects;
 import org.eclipse.core.resources.IBuildConfiguration;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -73,25 +74,15 @@ public class BuildConfiguration extends PlatformObject implements IBuildConfigur
 		if (getClass() != obj.getClass())
 			return false;
 		BuildConfiguration other = (BuildConfiguration) obj;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		if (project == null) {
-			if (other.project != null)
-				return false;
-		} else if (!project.equals(other.project))
-			return false;
-		return true;
+		return Objects.equals(this.name, other.name) && Objects.equals(this.project, other.project);
 	}
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		result = prime * result + ((project == null) ? 0 : project.hashCode());
+		result = prime * result + Objects.hashCode(name);
+		result = prime * result + Objects.hashCode(project);
 		return result;
 	}