From 40c6d3d3a5ba90d2a63d60d6453bb3f0ed37d4be Mon Sep 17 00:00:00 2001
From: Thomas Watson
Date: Wed, 27 Mar 2013 09:40:04 -0500
Subject: Bug 403970 - Update rt.bundles and rt.framework parent versions

---
 bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt | 2 ++
 bundles/org.eclipse.osgi/supplement/pom.xml                  | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.eclipse.osgi/supplement/forceQualifierUpdate.txt

(limited to 'bundles/org.eclipse.osgi/supplement')

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>
 
-- 
cgit v1.2.1


From 7a0f9d3e9ef6a51205db95a3b8af192c86dc12be Mon Sep 17 00:00:00 2001
From: Christian Georgi
Date: Sat, 16 Mar 2013 12:53:18 +0100
Subject: Bug 404233 - NPE when clearing trace file

---
 .../org/eclipse/osgi/framework/debug/FrameworkDebugOptions.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'bundles/org.eclipse.osgi/supplement')

diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/debug/FrameworkDebugOptions.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/debug/FrameworkDebugOptions.java
index 7c245f649..2086285aa 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/debug/FrameworkDebugOptions.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/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
@@ -434,7 +434,10 @@ public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustom
 	public synchronized void setFile(final File traceFile) {
 
 		this.outFile = traceFile;
-		FrameworkProperties.setProperty(PROP_TRACEFILE, this.outFile.getAbsolutePath());
+		if (this.outFile != null)
+			FrameworkProperties.setProperty(PROP_TRACEFILE, this.outFile.getAbsolutePath());
+		else
+			FrameworkProperties.clearProperty(PROP_TRACEFILE);
 		// the file changed so start a new session
 		EclipseDebugTrace.newSession = true;
 	}
@@ -505,4 +508,4 @@ public class FrameworkDebugOptions implements DebugOptions, ServiceTrackerCustom
 	public void removedService(ServiceReference<DebugOptionsListener> reference, DebugOptionsListener service) {
 		context.ungetService(reference);
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1