ASSIGNED - bug 342070: Update Website 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=342070
diff --git a/bundles/org.eclipse.uomo.business.tests/.classpath b/bundles/org.eclipse.uomo.business.tests/.classpath
index 0e2db29..9bc33d3 100644
--- a/bundles/org.eclipse.uomo.business.tests/.classpath
+++ b/bundles/org.eclipse.uomo.business.tests/.classpath
@@ -2,8 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>

-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/50.1.1/icu4j-50.1.1.jar"/>

+	<classpathentry kind="src" path="src/"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/bundles/org.eclipse.uomo.business.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.business.tests/META-INF/MANIFEST.MF
index 7e90667..58acdb5 100644
--- a/bundles/org.eclipse.uomo.business.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.business.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UOMo Business Tests
 Bundle-SymbolicName: org.eclipse.uomo.business.tests
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Vendor: Eclipse Org
 Fragment-Host: org.eclipse.uomo.business;bundle-version="0.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.uomo.business.tests/pom.xml b/bundles/org.eclipse.uomo.business.tests/pom.xml
index 7373e71..f393483 100644
--- a/bundles/org.eclipse.uomo.business.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.business.tests/pom.xml
@@ -3,7 +3,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.bundles</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>org.eclipse.uomo.business.tests</artifactId>

diff --git a/bundles/org.eclipse.uomo.business/.classpath b/bundles/org.eclipse.uomo.business/.classpath
index 76beacb..23d1b61 100644
--- a/bundles/org.eclipse.uomo.business/.classpath
+++ b/bundles/org.eclipse.uomo.business/.classpath
@@ -2,11 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/50.1.1/icu4j-50.1.1.jar" sourcepath="/M2_REPO/com/ibm/icu/icu4j/50.1.1">

-		<attributes>

-			<attribute name="source_encoding" value="UTF-8"/>

-		</attributes>

-	</classpathentry>

+	<classpathentry kind="src" path="src/main/java/"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
index 14857f2..54801a7 100644
--- a/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.business/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UOMo Business
 Bundle-SymbolicName: org.eclipse.uomo.business
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.uomo.core;bundle-version="0.6.0",
  org.eclipse.uomo.units;bundle-version="0.5.0"
diff --git a/bundles/org.eclipse.uomo.business/pom.xml b/bundles/org.eclipse.uomo.business/pom.xml
index 39e7b36..c144125 100644
--- a/bundles/org.eclipse.uomo.business/pom.xml
+++ b/bundles/org.eclipse.uomo.business/pom.xml
@@ -3,7 +3,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.bundles</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>org.eclipse.uomo.business</artifactId>

diff --git a/bundles/org.eclipse.uomo.core.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.core.tests/META-INF/MANIFEST.MF
index 328b26f..9f71767 100644
--- a/bundles/org.eclipse.uomo.core.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UOMO Core Tests
 Bundle-SymbolicName: org.eclipse.uomo.core.tests
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Vendor: Eclipse org
 Fragment-Host: org.eclipse.uomo.core;bundle-version="0.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.uomo.core.tests/pom.xml b/bundles/org.eclipse.uomo.core.tests/pom.xml
index cec6762..d2ba040 100644
--- a/bundles/org.eclipse.uomo.core.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.core.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.uomo.bundles</artifactId>
 		<groupId>org.eclipse.uomo</groupId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>0.6.0</version>
 	</parent>
 	<artifactId>org.eclipse.uomo.core.tests</artifactId>
 	<name>UOMo Core Tests</name>
diff --git a/bundles/org.eclipse.uomo.core/.classpath b/bundles/org.eclipse.uomo.core/.classpath
index 5071e21..7e0a6d5 100644
--- a/bundles/org.eclipse.uomo.core/.classpath
+++ b/bundles/org.eclipse.uomo.core/.classpath
@@ -2,7 +2,7 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry exported="true" kind="lib" path="libs/unit-api-0.6.1.jar" sourcepath="/unit-api"/>

+	<classpathentry exported="true" kind="lib" path="libs/unit-api-0.6.1.jar"/>

 	<classpathentry kind="src" path="src/main/java/"/>

 	<classpathentry kind="src" path="src/main/resources/"/>

 	<classpathentry kind="output" path="target/classes"/>

diff --git a/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
index 964f190..b1c537e 100644
--- a/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@
  org.unitsofmeasurement.quantity,

  org.unitsofmeasurement.service,

  org.unitsofmeasurement.unit

-Private-Package: org.eclipse.uomo.core;version=0.2.0.SNAPSHOT,org.ecli

- pse.uomo.core.impl;version=0.2.0.SNAPSHOT

+Private-Package: org.eclipse.uomo.core;version=0.6.0,org.ecli

+ pse.uomo.core.impl;version=0.6.0

 Bundle-ActivationPolicy: lazy

 Tool: Bnd-0.0.160

 Bundle-Name: UOMo Core

@@ -14,7 +14,7 @@
 Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0";visibility:=reexport,

  org.eclipse.osgi.services;bundle-version="3.2.100";visibility:=reexport

 Bundle-Vendor: Eclipse.org

-Bundle-Version: 0.6.0.qualifier

+Bundle-Version: 0.6.0

 Bnd-LastModified: 1288905964975

 Bundle-Activator: org.eclipse.uomo.core.internal.Activator

 Bundle-ManifestVersion: 2

diff --git a/bundles/org.eclipse.uomo.core/pom.xml b/bundles/org.eclipse.uomo.core/pom.xml
index 4f49bae..a6d187e 100644
--- a/bundles/org.eclipse.uomo.core/pom.xml
+++ b/bundles/org.eclipse.uomo.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.bundles</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<artifactId>org.eclipse.uomo.core</artifactId>

 	<name>UOMo Core</name>

diff --git a/bundles/org.eclipse.uomo.ucum.tests/.classpath b/bundles/org.eclipse.uomo.ucum.tests/.classpath
index f94bbe4..9bc33d3 100644
--- a/bundles/org.eclipse.uomo.ucum.tests/.classpath
+++ b/bundles/org.eclipse.uomo.ucum.tests/.classpath
@@ -2,7 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/50.1.1/icu4j-50.1.1.jar"/>

+	<classpathentry kind="src" path="src/"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF
index 460f76c..4b01373 100644
--- a/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UCUM Tests
 Bundle-SymbolicName: org.eclipse.uomo.ucum.tests
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Vendor: Eclipse.org
 Fragment-Host: org.eclipse.uomo.ucum;bundle-version="0.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.uomo.ucum.tests/pom.xml b/bundles/org.eclipse.uomo.ucum.tests/pom.xml
index d759ee1..9fc036a 100644
--- a/bundles/org.eclipse.uomo.ucum.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.ucum.tests/pom.xml
@@ -3,7 +3,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.bundles</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>org.eclipse.uomo.ucum.tests</artifactId>

diff --git a/bundles/org.eclipse.uomo.ucum/.classpath b/bundles/org.eclipse.uomo.ucum/.classpath
index 290394b..23d1b61 100644
--- a/bundles/org.eclipse.uomo.ucum/.classpath
+++ b/bundles/org.eclipse.uomo.ucum/.classpath
@@ -2,7 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/50.1.1/icu4j-50.1.1.jar"/>

+	<classpathentry kind="src" path="src/main/java/"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
index cd86ab8..515fd60 100644
--- a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: UOMo UCUM

 Bundle-SymbolicName: org.eclipse.uomo.ucum

-Bundle-Version: 0.6.0.qualifier

+Bundle-Version: 0.6.0

 Export-Package: org.eclipse.uomo.ucum,

  org.eclipse.uomo.ucum.canonical,

  org.eclipse.uomo.ucum.expression,

diff --git a/bundles/org.eclipse.uomo.ucum/pom.xml b/bundles/org.eclipse.uomo.ucum/pom.xml
index 592df87..8dc88c6 100644
--- a/bundles/org.eclipse.uomo.ucum/pom.xml
+++ b/bundles/org.eclipse.uomo.ucum/pom.xml
@@ -3,7 +3,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.bundles</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>org.eclipse.uomo.ucum</artifactId>

diff --git a/bundles/org.eclipse.uomo.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ui/META-INF/MANIFEST.MF
index f71f660..efd2ff3 100644
--- a/bundles/org.eclipse.uomo.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse UOMo
 Bundle-SymbolicName: org.eclipse.uomo.ui
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Vendor: Eclipse UOMo
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
  JavaSE-1.7
diff --git a/bundles/org.eclipse.uomo.ui/pom.xml b/bundles/org.eclipse.uomo.ui/pom.xml
index 7084a06..4675f34 100644
--- a/bundles/org.eclipse.uomo.ui/pom.xml
+++ b/bundles/org.eclipse.uomo.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>

     <artifactId>org.eclipse.uomo.bundles</artifactId>

     <groupId>org.eclipse.uomo</groupId>

-    <version>0.6.0-SNAPSHOT</version>

+    <version>0.6.0</version>

   </parent>

   <artifactId>org.eclipse.uomo.ui</artifactId>

   <packaging>eclipse-plugin</packaging>

diff --git a/bundles/org.eclipse.uomo.units.tests/.classpath b/bundles/org.eclipse.uomo.units.tests/.classpath
index f94bbe4..9bc33d3 100644
--- a/bundles/org.eclipse.uomo.units.tests/.classpath
+++ b/bundles/org.eclipse.uomo.units.tests/.classpath
@@ -2,7 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/50.1.1/icu4j-50.1.1.jar"/>

+	<classpathentry kind="src" path="src/"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/bundles/org.eclipse.uomo.units.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.units.tests/META-INF/MANIFEST.MF
index 855b905..bc07678 100644
--- a/bundles/org.eclipse.uomo.units.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.units.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UoMO Units Tests
 Bundle-SymbolicName: org.eclipse.uomo.units.tests
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Vendor: Eclipse org
 Fragment-Host: org.eclipse.uomo.units;bundle-version="0.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.uomo.units.tests/pom.xml b/bundles/org.eclipse.uomo.units.tests/pom.xml
index 052c8a0..5d9f351 100644
--- a/bundles/org.eclipse.uomo.units.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.units.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>

     <artifactId>org.eclipse.uomo.bundles</artifactId>

     <groupId>org.eclipse.uomo</groupId>

-    <version>0.6.0-SNAPSHOT</version>

+    <version>0.6.0</version>

   </parent>

   <artifactId>org.eclipse.uomo.units.tests</artifactId>

   <name>UOMo Units of Measurement Tests</name>

diff --git a/bundles/org.eclipse.uomo.units/.classpath b/bundles/org.eclipse.uomo.units/.classpath
index 53779be..7e0a6d5 100644
--- a/bundles/org.eclipse.uomo.units/.classpath
+++ b/bundles/org.eclipse.uomo.units/.classpath
@@ -3,8 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry exported="true" kind="lib" path="libs/unit-api-0.6.1.jar"/>

-	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry kind="src" path="src/main/resources"/>

-	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/50.1.1/icu4j-50.1.1.jar"/>

+	<classpathentry kind="src" path="src/main/java/"/>

+	<classpathentry kind="src" path="src/main/resources/"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF
index 26938d3..c85c9ba 100644
--- a/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UOMo Units of Measurement
 Bundle-SymbolicName: org.eclipse.uomo.units;singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Activator: org.eclipse.uomo.units.Activator
 Bundle-Vendor: Eclipse.org
 Require-Bundle: com.ibm.icu;bundle-version="50.1.0";visibility:=reexport,
diff --git a/bundles/org.eclipse.uomo.units/pom.xml b/bundles/org.eclipse.uomo.units/pom.xml
index 670c534..07f122f 100644
--- a/bundles/org.eclipse.uomo.units/pom.xml
+++ b/bundles/org.eclipse.uomo.units/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.bundles</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<artifactId>org.eclipse.uomo.units</artifactId>

 	<name>UOMo Units of Measurement</name>

diff --git a/bundles/org.eclipse.uomo.util.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.util.tests/META-INF/MANIFEST.MF
index 06f3758..b7731b0 100644
--- a/bundles/org.eclipse.uomo.util.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.util.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UoMO Units Tests
 Bundle-SymbolicName: org.eclipse.uomo.util.tests
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Vendor: Eclipse org
 Fragment-Host: org.eclipse.uomo.util;bundle-version="0.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.uomo.util.tests/pom.xml b/bundles/org.eclipse.uomo.util.tests/pom.xml
index a5acba6..3161985 100644
--- a/bundles/org.eclipse.uomo.util.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.util.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>

     <artifactId>org.eclipse.uomo.bundles</artifactId>

     <groupId>org.eclipse.uomo</groupId>

-    <version>0.6.0-SNAPSHOT</version>

+    <version>0.6.0</version>

   </parent>

   <artifactId>org.eclipse.uomo.util.tests</artifactId>

   <name>UOMo Util Tests</name>

diff --git a/bundles/org.eclipse.uomo.util.tests/src/org/eclipse/uomo/util/test/numbers/SpellDemos.java b/bundles/org.eclipse.uomo.util.tests/src/org/eclipse/uomo/util/test/numbers/SpellDemos.java
index 422ae15..c58cf60 100644
--- a/bundles/org.eclipse.uomo.util.tests/src/org/eclipse/uomo/util/test/numbers/SpellDemos.java
+++ b/bundles/org.eclipse.uomo.util.tests/src/org/eclipse/uomo/util/test/numbers/SpellDemos.java
@@ -57,7 +57,7 @@
 		System.out.println("Spelling Number Test Console  0.6");

 		System.out

 				.println("A Java demo to spell numbers and to parse spelled number text.");

-		System.out.println("Version 0.6-SNAPSHOT");

+		System.out.println("Version 0.6");

 		System.out.println("Eclipse Foundation.");

 

 		// Run demos one after the other. Pause between them.

diff --git a/bundles/org.eclipse.uomo.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.util/META-INF/MANIFEST.MF
index f374e2d..3eaffb0 100644
--- a/bundles/org.eclipse.uomo.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UOMo Utilities
 Bundle-SymbolicName: org.eclipse.uomo.util;singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Activator: org.eclipse.uomo.util.internal.UtilitiesPlugin
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.uomo.util,
diff --git a/bundles/org.eclipse.uomo.util/pom.xml b/bundles/org.eclipse.uomo.util/pom.xml
index f0b2b5d..cd548cb 100644
--- a/bundles/org.eclipse.uomo.util/pom.xml
+++ b/bundles/org.eclipse.uomo.util/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.bundles</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<artifactId>org.eclipse.uomo.util</artifactId>

 	<name>UOMo Utilities</name>

diff --git a/bundles/org.eclipse.uomo.xml.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.xml.tests/META-INF/MANIFEST.MF
index d3aa891..7797f37 100644
--- a/bundles/org.eclipse.uomo.xml.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.xml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UOMo XML Tests
 Bundle-SymbolicName: org.eclipse.uomo.xml.tests
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Bundle-Vendor: Eclipse.org
 Fragment-Host: org.eclipse.uomo.util;bundle-version="0.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.uomo.xml.tests/pom.xml b/bundles/org.eclipse.uomo.xml.tests/pom.xml
index 9734bf0..88cd7e9 100644
--- a/bundles/org.eclipse.uomo.xml.tests/pom.xml
+++ b/bundles/org.eclipse.uomo.xml.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>

     <artifactId>org.eclipse.uomo.bundles</artifactId>

     <groupId>org.eclipse.uomo</groupId>

-    <version>0.6.0-SNAPSHOT</version>

+    <version>0.6.0</version>

   </parent>

   <artifactId>org.eclipse.uomo.xml.tests</artifactId>

   <name>UOMo XML Tests</name>

diff --git a/bundles/org.eclipse.uomo.xml/.classpath b/bundles/org.eclipse.uomo.xml/.classpath
index ed60d70..17054ca 100644
--- a/bundles/org.eclipse.uomo.xml/.classpath
+++ b/bundles/org.eclipse.uomo.xml/.classpath
@@ -3,8 +3,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry exported="true" kind="lib" path="libs/xmlpull_1_1_3_4b.jar"/>

-	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry kind="src" path="src/main/resources"/>

 	<classpathentry exported="true" kind="lib" path="libs/xpp3_min-1.1.3.4.O.jar"/>

+	<classpathentry kind="src" path="src/main/java/"/>

+	<classpathentry kind="src" path="src/main/resources/"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/bundles/org.eclipse.uomo.xml/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.xml/META-INF/MANIFEST.MF
index 7a84bea..906c905 100644
--- a/bundles/org.eclipse.uomo.xml/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UOMo XML
 Bundle-SymbolicName: org.eclipse.uomo.xml
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.6.0
 Require-Bundle: org.eclipse.uomo.core;bundle-version="0.6.0",
  org.apache.commons.lang;bundle-version="2.6.0",
  org.apache.xerces,
diff --git a/bundles/org.eclipse.uomo.xml/pom.xml b/bundles/org.eclipse.uomo.xml/pom.xml
index ff57d96..182024d 100644
--- a/bundles/org.eclipse.uomo.xml/pom.xml
+++ b/bundles/org.eclipse.uomo.xml/pom.xml
@@ -3,7 +3,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.bundles</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 73a122d..f8211d0 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -5,7 +5,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

   <artifactId>org.eclipse.uomo.bundles</artifactId>

   <name>Eclipse UOMo Bundles</name>

diff --git a/examples/business/org.eclipse.uomo.examples.business.console/pom.xml b/examples/business/org.eclipse.uomo.examples.business.console/pom.xml
index e32871d..99a5424 100644
--- a/examples/business/org.eclipse.uomo.examples.business.console/pom.xml
+++ b/examples/business/org.eclipse.uomo.examples.business.console/pom.xml
@@ -3,7 +3,7 @@
   <parent>

     <groupId>org.eclipse.uomo.examples.business</groupId>

     <artifactId>org.eclipse.uomo.examples.business</artifactId>

-    <version>0.6.0-SNAPSHOT</version>

+    <version>0.6.0</version>

   </parent>

   <artifactId>org.eclipse.uomo.examples.business.console</artifactId>

   

@@ -16,12 +16,12 @@
         <dependency>

         	<groupId>org.eclipse.uomo</groupId>

         	<artifactId>org.eclipse.uomo.units</artifactId>

-        	<version>0.6.0-SNAPSHOT</version>

+        	<version>0.6.0</version>

         </dependency>	

          <dependency>

         	<groupId>org.eclipse.uomo</groupId>

         	<artifactId>org.eclipse.uomo.business</artifactId>

-        	<version>0.6.0-SNAPSHOT</version>

+        	<version>0.6.0</version>

         </dependency>

         

 		<dependency>

@@ -39,7 +39,7 @@
         <dependency>

         	<groupId>org.eclipse.uomo</groupId>

         	<artifactId>org.eclipse.uomo.core</artifactId>

-        	<version>0.6.0-SNAPSHOT</version>       	

+        	<version>0.6.0</version>       	

         </dependency>

         <dependency>

         	<groupId>com.ibm.icu</groupId>

diff --git a/examples/business/pom.xml b/examples/business/pom.xml
index 8117422..387e234 100644
--- a/examples/business/pom.xml
+++ b/examples/business/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>org.eclipse.uomo.examples</artifactId>
 		<groupId>org.eclipse.uomo</groupId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>0.6.0</version>
 	</parent>
 	<artifactId>org.eclipse.uomo.examples.business</artifactId>
 	<packaging>pom</packaging>
diff --git a/examples/pom.xml b/examples/pom.xml
index 2f58b6d..5422c8b 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>org.eclipse.uomo.examples</artifactId>

diff --git a/examples/units/org.eclipse.uomo.examples.units.android/player/pom.xml b/examples/units/org.eclipse.uomo.examples.units.android/player/pom.xml
index 4b723ca..ec12b87 100644
--- a/examples/units/org.eclipse.uomo.examples.units.android/player/pom.xml
+++ b/examples/units/org.eclipse.uomo.examples.units.android/player/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.examples.units.android</artifactId>

 		<groupId>org.eclipse.uomo.examples.units</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<!-- from parent <groupId>org.mic.maven.web.android.archetype</groupId> -->

 	<artifactId>player</artifactId>

diff --git a/examples/units/org.eclipse.uomo.examples.units.android/pom.xml b/examples/units/org.eclipse.uomo.examples.units.android/pom.xml
index 2021f8f..81ff6be 100644
--- a/examples/units/org.eclipse.uomo.examples.units.android/pom.xml
+++ b/examples/units/org.eclipse.uomo.examples.units.android/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
         <artifactId>org.eclipse.uomo.examples.units</artifactId>
         <groupId>org.eclipse.uomo.examples.units</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>
 	<artifactId>org.eclipse.uomo.examples.units.android</artifactId>
 	<packaging>pom</packaging>
diff --git a/examples/units/org.eclipse.uomo.examples.units.android/web/.settings/org.eclipse.wst.common.component b/examples/units/org.eclipse.uomo.examples.units.android/web/.settings/org.eclipse.wst.common.component
index 79ad62f..3940dcb 100644
--- a/examples/units/org.eclipse.uomo.examples.units.android/web/.settings/org.eclipse.wst.common.component
+++ b/examples/units/org.eclipse.uomo.examples.units.android/web/.settings/org.eclipse.wst.common.component
@@ -3,15 +3,9 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>

         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>

         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>

-        <dependent-module archiveName="org.eclipse.uomo.units-0.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.eclipse.uomo.units/org.eclipse.uomo.units">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

         <dependent-module archiveName="unit-api-0.6.1-.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/unit-api/unit-api">

             <dependency-type>uses</dependency-type>

         </dependent-module>

-        <dependent-module archiveName="org.eclipse.uomo.core-0.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.eclipse.uomo.core/org.eclipse.uomo.core">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

         <property name="java-output-path" value="/web/target/classes"/>

         <property name="context-root" value="android-web"/>

     </wb-module>

diff --git a/examples/units/org.eclipse.uomo.examples.units.android/web/pom.xml b/examples/units/org.eclipse.uomo.examples.units.android/web/pom.xml
index 44bb993..1896f10 100644
--- a/examples/units/org.eclipse.uomo.examples.units.android/web/pom.xml
+++ b/examples/units/org.eclipse.uomo.examples.units.android/web/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.examples.units.android</artifactId>

 		<groupId>org.eclipse.uomo.examples.units</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<!-- form parent <groupId>org.mic.maven.web.android.archetype</groupId> -->

 	<artifactId>web</artifactId>

@@ -24,7 +24,7 @@
 		<dependency>

 			<groupId>org.eclipse.uomo</groupId>

 			<artifactId>org.eclipse.uomo.units</artifactId>

-			<version>0.6.0-SNAPSHOT</version>

+			<version>0.6.0</version>

 		</dependency>

 		<dependency>

 			<groupId>org.unitsofmeasurement</groupId>

@@ -39,7 +39,7 @@
 		<dependency>

 			<groupId>org.eclipse.uomo</groupId>

 			<artifactId>org.eclipse.uomo.core</artifactId>

-			<version>0.6.0-SNAPSHOT</version>

+			<version>0.6.0</version>

 		</dependency>

 		<dependency>

 			<groupId>org.eclipse</groupId>

diff --git a/examples/units/org.eclipse.uomo.examples.units.console/pom.xml b/examples/units/org.eclipse.uomo.examples.units.console/pom.xml
index 4b4befc..424e91b 100644
--- a/examples/units/org.eclipse.uomo.examples.units.console/pom.xml
+++ b/examples/units/org.eclipse.uomo.examples.units.console/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.examples.units</artifactId>

 		<groupId>org.eclipse.uomo.examples.units</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<artifactId>org.eclipse.uomo.examples.units.console</artifactId>

 	<name>UOMo Units Console Examples</name>

@@ -17,7 +17,7 @@
         <dependency>

         	<groupId>org.eclipse.uomo</groupId>

         	<artifactId>org.eclipse.uomo.units</artifactId>

-        	<version>0.6.0-SNAPSHOT</version>

+        	<version>0.6.0</version>

         </dependency>	

 		<dependency>

             <groupId>junit</groupId>

@@ -34,7 +34,7 @@
         <dependency>

         	<groupId>org.eclipse.uomo</groupId>

         	<artifactId>org.eclipse.uomo.core</artifactId>

-        	<version>0.6.0-SNAPSHOT</version>       	

+        	<version>0.6.0</version>       	

         </dependency>

         <dependency>

         	<groupId>com.ibm.icu</groupId>

@@ -49,7 +49,7 @@
 		<dependency>

 			<groupId>org.eclipse.uomo</groupId>

 			<artifactId>org.eclipse.uomo.util</artifactId>

-			<version>0.6.0-SNAPSHOT</version>

+			<version>0.6.0</version>

 		</dependency>

 	</dependencies>

 

diff --git a/examples/units/pom.xml b/examples/units/pom.xml
index f4110b0..6fdaa1c 100644
--- a/examples/units/pom.xml
+++ b/examples/units/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>org.eclipse.uomo.examples</artifactId>
 		<groupId>org.eclipse.uomo</groupId>
-		<version>0.6.0-SNAPSHOT</version>
+		<version>0.6.0</version>
 	</parent>
 	<artifactId>org.eclipse.uomo.examples.units</artifactId>
 	<packaging>pom</packaging>
diff --git a/features/org.eclipse.uomo.feature/feature.xml b/features/org.eclipse.uomo.feature/feature.xml
index 2cf61bb..1326eed 100644
--- a/features/org.eclipse.uomo.feature/feature.xml
+++ b/features/org.eclipse.uomo.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.uomo.feature"
       label="Eclipse UOMo"
-      version="0.6.0.qualifier"
+      version="0.6.0"
       provider-name="Eclipse.org"
       plugin="org.eclipse.uomo.ui">
 
diff --git a/features/org.eclipse.uomo.feature/pom.xml b/features/org.eclipse.uomo.feature/pom.xml
index b0afe52..874936f 100644
--- a/features/org.eclipse.uomo.feature/pom.xml
+++ b/features/org.eclipse.uomo.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.uomo.features</artifactId>
     <groupId>org.eclipse.uomo</groupId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
   <packaging>eclipse-feature</packaging>
   <artifactId>org.eclipse.uomo.feature</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index ec499bb..6df56c7 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -3,7 +3,7 @@
   <parent>

     <artifactId>org.eclipse.uomo</artifactId>

     <groupId>org.eclipse.uomo</groupId>

-    <version>0.6.0-SNAPSHOT</version>

+    <version>0.6.0</version>

   </parent>

   <artifactId>org.eclipse.uomo.features</artifactId>

   <name>Eclipse UOMo Features</name>

diff --git a/pom.xml b/pom.xml
index bc01f03..e81adc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 

 	<groupId>org.eclipse.uomo</groupId>

 	<artifactId>org.eclipse.uomo</artifactId>

-	<version>0.6.0-SNAPSHOT</version>

+	<version>0.6.0</version>

 	<packaging>pom</packaging>

 	<name>Eclipse UOMo</name>

 

@@ -135,7 +135,7 @@
 						<artifact>

 							<groupId>org.eclipse.uomo</groupId>

 							<artifactId>org.eclipse.uomo.target</artifactId>

-							<version>0.6.0-SNAPSHOT</version>

+							<version>0.6.0</version>

 							<classifier>indigo</classifier>

 						</artifact>

 					</target>

diff --git a/releng/eclipse-repository/category.xml b/releng/eclipse-repository/category.xml
index f1371c7..9bf863b 100644
--- a/releng/eclipse-repository/category.xml
+++ b/releng/eclipse-repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.uomo.feature_0.6.0.qualifier.jar" id="org.eclipse.uomo.feature" version="0.6.0.qualifier">
+   <feature url="features/org.eclipse.uomo.feature_0.6.0.jar" id="org.eclipse.uomo.feature" version="0.6.0">
    	  <category name="uomo-category"/>
    </feature>
    <category-def name="uomo-category" label="Units of Measurement (UOMo)">
diff --git a/releng/eclipse-repository/pom.xml b/releng/eclipse-repository/pom.xml
index 3653907..92c3c13 100644
--- a/releng/eclipse-repository/pom.xml
+++ b/releng/eclipse-repository/pom.xml
@@ -3,7 +3,7 @@
   <parent>

     <artifactId>org.eclipse.uomo.releng</artifactId>

     <groupId>org.eclipse.uomo</groupId>

-    <version>0.6.0-SNAPSHOT</version>

+    <version>0.6.0</version>

   </parent>

   <artifactId>eclipse-repository</artifactId>

   <name>Eclipse UOMo Repository</name>

diff --git a/releng/org.eclipse.uomo.target/pom.xml b/releng/org.eclipse.uomo.target/pom.xml
index 83ee3f5..e7f67ad 100644
--- a/releng/org.eclipse.uomo.target/pom.xml
+++ b/releng/org.eclipse.uomo.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<artifactId>org.eclipse.uomo.releng</artifactId>

 		<groupId>org.eclipse.uomo</groupId>

-		<version>0.6.0-SNAPSHOT</version>

+		<version>0.6.0</version>

 	</parent>

 	<artifactId>org.eclipse.uomo.target</artifactId>

 	<name>Eclipse UOMo Target Definition</name>

diff --git a/releng/pom.xml b/releng/pom.xml
index ad4384a..858b765 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -7,7 +7,7 @@
     <parent>

   	<groupId>org.eclipse.uomo</groupId>

   	<artifactId>org.eclipse.uomo</artifactId>

-  	<version>0.6.0-SNAPSHOT</version>

+  	<version>0.6.0</version>

   </parent>

   <artifactId>org.eclipse.uomo.releng</artifactId>

   <name>Eclipse UOMo</name>