Merge remote-tracking branch 'origin/master'
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/build.properties
index 2083e23..11801c3 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/build.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/build.properties
@@ -10,3 +10,4 @@
src.includes = about.html,\
icons/
additional.bundles = org.eclipse.equinox.concurrent
+jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties
index 672c967..dd3df99 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties
@@ -12,3 +12,4 @@
plugin.xml,\
plugin.properties
additional.bundles = org.eclipse.equinox.concurrent
+jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/build.properties b/framework/bundles/org.eclipse.ecf.remoteservice.soap/build.properties
index b4715cb..2f85369 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/build.properties
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/build.properties
@@ -8,3 +8,5 @@
src.includes = about.html
additional.bundles = org.eclipse.osgi,\
org.eclipse.equinox.concurrent
+jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent,\
+ platform:/plugin/org.eclipse.osgi
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties b/providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties
index 5f1cc8e..8e48dfb 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/build.properties
@@ -6,4 +6,5 @@
plugin.properties,\
about.html
additional.bundles = org.eclipse.equinox.concurrent
+jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
src.includes = about.html
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties b/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties
index 9b7f2a4..b4f9837 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties
@@ -14,3 +14,4 @@
jre.compilation.profile = J2SE-1.4
javacErrors.. = -assertIdentifier,-enumIdentifier
additional.bundles = org.eclipse.equinox.concurrent
+jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
diff --git a/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties b/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties
index 990268d..664df3d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties
@@ -10,4 +10,5 @@
src.includes = about.html
jre.compilation.profile = J2SE-1.4
additional.bundles = org.eclipse.equinox.concurrent
+jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/releng/features/org.eclipse.ecf.examples/feature.xml b/releng/features/org.eclipse.ecf.examples/feature.xml
index e66b73a..1437d9d 100644
--- a/releng/features/org.eclipse.ecf.examples/feature.xml
+++ b/releng/features/org.eclipse.ecf.examples/feature.xml
@@ -53,7 +53,6 @@
<import plugin="org.eclipse.ecf.remoteservice"/>
<import plugin="org.eclipse.ecf.examples.remoteservices.common"/>
<import plugin="org.eclipse.ecf.ui"/>
- <import plugin="org.eclipse.update.ui"/>
<import plugin="org.eclipse.equinox.common"/>
<import plugin="javax.servlet"/>
<import plugin="org.eclipse.osgi.services"/>
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.jreprovider/build.properties b/tests/bundles/org.eclipse.ecf.tests.filetransfer.jreprovider/build.properties
index 75925d0..fb4fa71 100644
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer.jreprovider/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.jreprovider/build.properties
@@ -3,3 +3,4 @@
bin.includes = META-INF/,\
.
additional.bundles = org.eclipse.ecf.filetransfer
+jars.extra.classpath = platform:/plugin/org.eclipse.ecf.filetransfer
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties
index 346912c..a346452 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties
@@ -4,4 +4,4 @@
.
jre.compilation.profile = J2SE-1.4
additional.bundles = org.eclipse.equinox.concurrent
-
\ No newline at end of file
+jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
