Merge branch 'master' into twatson/container

Conflicts:
	bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java

5 files changed, 14 insertions, 13 deletions

diff --git a/bundles/org.eclipse.osgi/forceQualifierUpdate.txt b/bundles/org.eclipse.osgi/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.osgi/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 823800f6f..29b275dd2 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -9,15 +9,12 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>rt.equinox.framework</artifactId>
     <groupId>org.eclipse.equinox.framework</groupId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>4.3.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.osgi</groupId>
diff --git a/bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt b/bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml
index 42cf0e4b7..f07cee37a 100644
--- a/bundles/org.eclipse.osgi/supplement/pom.xml
+++ b/bundles/org.eclipse.osgi/supplement/pom.xml
@@ -9,16 +9,13 @@
   Contributors:
      Igor Fedorenko - initial implementation
 -->
-
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <artifactId>rt.equinox.framework</artifactId>
     <groupId>org.eclipse.equinox.framework</groupId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>4.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
index 71fe5a28a..7c6c13ed7 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -420,7 +420,10 @@ public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustom
 	public synchronized void setFile(final File traceFile) {
 
 		this.outFile = traceFile;
-		environmentInfo.setConfiguration(PROP_TRACEFILE, this.outFile.getAbsolutePath());
+		if (this.outFile != null)
+			environmentInfo.setConfiguration(PROP_TRACEFILE, this.outFile.getAbsolutePath());
+		else
+			environmentInfo.clearConfiguration(PROP_TRACEFILE);
 		// the file changed so start a new session
 		EclipseDebugTrace.newSession = true;
 	}
@@ -495,4 +498,4 @@ public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustom
 	public void removedService(ServiceReference<DebugOptionsListener> reference, DebugOptionsListener service) {
 		context.ungetService(reference);
 	}
-}
\ No newline at end of file
+}