Update target configuration and merge with 9_1

Change-Id: Ia43d322e99c00f26ee448d2c85bd3a23b5ccf855
Signed-off-by: Greg Watson <g.watson@computer.org>

5 files changed, 8 insertions, 7 deletions

diff --git a/rdt/org.eclipse.ptp.rdt.sync.core/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.sync.core/META-INF/MANIFEST.MF
index c9b39c272..6771b8bd0 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.core/META-INF/MANIFEST.MF
+++ b/rdt/org.eclipse.ptp.rdt.sync.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.ptp.rdt.sync.core;singleton:=true
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core/pom.xml b/rdt/org.eclipse.ptp.rdt.sync.core/pom.xml
index 6c36a16bf..70d90e3e8 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.core/pom.xml
+++ b/rdt/org.eclipse.ptp.rdt.sync.core/pom.xml
@@ -11,6 +11,6 @@
   </parent>
 
   <artifactId>org.eclipse.ptp.rdt.sync.core</artifactId>
-  <version>5.0.0-SNAPSHOT</version>
+  <version>6.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/PreferenceSyncFileFilterStorage.java b/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/PreferenceSyncFileFilterStorage.java
index df03a677a..21bc67e4b 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/PreferenceSyncFileFilterStorage.java
+++ b/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/PreferenceSyncFileFilterStorage.java
@@ -104,10 +104,10 @@ public class PreferenceSyncFileFilterStorage extends AbstractSyncFileFilter {
 	 * Load filters from persistent storage
 	 * 
 	 * @return
+	 * @since 6.0
 	 */
-	public boolean loadFilter() {
+	public boolean loadFilter(IScopeContext context) {
 		rules.clear();
-		IScopeContext context = InstanceScope.INSTANCE;
 		Preferences node = context.getNode(RDTSyncCorePlugin.PLUGIN_ID);
 		if (node == null) {
 			RDTSyncCorePlugin.log(Messages.SyncManager_6);
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java b/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java
index 59d7f5777..da1fd3ed2 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java
+++ b/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java
@@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.ptp.internal.rdt.sync.core.RDTSyncCorePlugin;
@@ -193,7 +194,7 @@ public class SyncManager {
 	public static PreferenceSyncFileFilterStorage getDefaultFileFilter() {
 
 		PreferenceSyncFileFilterStorage filter = new PreferenceSyncFileFilterStorage();
-		if (!filter.loadFilter()) {
+		if (!filter.loadFilter(InstanceScope.INSTANCE) && !filter.loadFilter(DefaultScope.INSTANCE)) {
 			filter.loadBuiltInDefaultFilter();
 		}
 		return filter;
diff --git a/releng/org.eclipse.ptp.target/oxygen.target b/releng/org.eclipse.ptp.target/oxygen.target
index 3f99d61e1..d0fe7f24b 100644
--- a/releng/org.eclipse.ptp.target/oxygen.target
+++ b/releng/org.eclipse.ptp.target/oxygen.target
@@ -7,7 +7,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20161205183421/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170818183741/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -24,7 +24,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7milestones/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.7/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>