diff --git a/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties b/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties
index e4ac2ca2f..d142b4e48 100644
--- a/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties
+++ b/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
messages.properties,\
operators.properties,\
plugin.properties
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties
index 902025806..3e324343e 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties
@@ -8,4 +8,4 @@ src.includes = about.html
javacErrors.. = -assertIdentifier,\
-enumIdentifier
source.. = src/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/build.properties b/examples/bundles/org.eclipse.ecf.example.clients/build.properties
index 8f39d92fa..b42fd7c1f 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/build.properties
+++ b/examples/bundles/org.eclipse.ecf.example.clients/build.properties
@@ -10,5 +10,5 @@ src.includes = about.html,\
products/
source.. = src/
output.. = bin/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties b/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties
index 045869a55..f3e6a6e31 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties
+++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties
@@ -6,5 +6,5 @@ src.includes = about.html
source.. = src/
output.. = bin/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties b/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties
index ec8291153..8e7494f82 100644
--- a/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties
+++ b/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties
@@ -8,4 +8,4 @@ bin.includes = META-INF/,\
about.html
src.includes = schema/,\
about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties
index 24d0e317d..497b86621 100644
--- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties
@@ -9,4 +9,4 @@ bin.includes = META-INF/,\
src.includes = about.html,\
bundle.properties,\
products/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties
index 7283d2827..48e2f6953 100644
--- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties
@@ -5,5 +5,5 @@ bin.includes = META-INF/,\
plugin.xml,\
products/,\
bundle.properties
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
src.includes = products/
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties
index 2a7687a3b..90ec9fcf8 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties
@@ -7,4 +7,4 @@ bin.includes = META-INF/,\
src.includes = about.html,\
bundle.properties,\
products/Hello Service Consumer RS.product
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties
index 42b2a4222..86a47f191 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties
@@ -11,5 +11,5 @@ source.. = src/
src.includes = bundle.properties,\
about.html,\
products/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
\ No newline at end of file
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties
index 084356cbb..9dbaceff2 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties
@@ -7,4 +7,4 @@ bin.includes = META-INF/,\
src.includes = bundle.properties,\
about.html,\
products/Hello Service Host RS.product
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties
index b4ac1fcd4..42556703d 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties
@@ -9,5 +9,5 @@ bin.includes = META-INF/,\
src.includes = about.html,\
bundle.properties,\
products/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties
index d60b77b9a..92670ea3d 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties
index 26dfa7199..404a4a533 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties
@@ -8,4 +8,4 @@ jars.compile.order = .
source.. = src/
output.. = bin/
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties
index 7266c8e24..9ab327a9e 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties
@@ -9,4 +9,4 @@ source.. = src/
output.. = bin/
src.includes = model/,\
about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties
index f67f6c225..42e9ea44f 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties
@@ -7,4 +7,4 @@ bin.includes = META-INF/,\
plugin.properties
src.includes = fragment.xml,\
about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties
index 7e379cb9b..d45a0e6dd 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties
@@ -7,4 +7,4 @@ bin.includes = META-INF/,\
plugin.properties
src.includes = fragment.xml,\
about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties
index 056fd33ce..721f0ab87 100644
--- a/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties
+++ b/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties
@@ -9,4 +9,4 @@ source.. = src/
output.. = bin/
src.includes = icons/,\
about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF
index c3ad72cda..59bb7d811 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.discovery;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.discovery
-Bundle-Version: 5.1.2.qualifier
+Bundle-Version: 5.2.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.discovery.DiscoveryPlugin
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
@@ -12,7 +12,6 @@ Export-Package: org.eclipse.ecf.discovery;version="4.1.0",
org.eclipse.ecf.discovery.identity;version="3.0.0",
org.eclipse.ecf.discovery.service;version="2.0.0",
org.eclipse.ecf.internal.discovery;version="3.0.0";x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ecf;bundle-version="[3.4.0,4.0.0)"
Import-Package: org.eclipse.core.runtime.jobs,
diff --git a/framework/bundles/org.eclipse.ecf.discovery/pom.xml b/framework/bundles/org.eclipse.ecf.discovery/pom.xml
index 7e53e9e0a..a8f4a0930 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.discovery/pom.xml
@@ -10,6 +10,6 @@
org.eclipse.ecf
org.eclipse.ecf.discovery
- 5.1.2-SNAPSHOT
+ 5.2.0-SNAPSHOT
eclipse-plugin
diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties b/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties
index 10dfcd03b..367fe153f 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties
+++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties
@@ -17,5 +17,5 @@ bin.includes = plugin.xml,\
about.html,\
icons/
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties b/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties
index cab31b761..77c9716c5 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties
@@ -7,5 +7,5 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties
index a28ad63f7..5a8fd46fb 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties
@@ -14,4 +14,4 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties
jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.storage/build.properties b/framework/bundles/org.eclipse.ecf.storage/build.properties
index e564ca49c..82ff3b4e5 100644
--- a/framework/bundles/org.eclipse.ecf.storage/build.properties
+++ b/framework/bundles/org.eclipse.ecf.storage/build.properties
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.xml
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.sync/build.properties b/framework/bundles/org.eclipse.ecf.sync/build.properties
index b0b630729..185ed8266 100644
--- a/framework/bundles/org.eclipse.ecf.sync/build.properties
+++ b/framework/bundles/org.eclipse.ecf.sync/build.properties
@@ -5,4 +5,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties
index 11db29a4c..fd230d858 100644
--- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties
+++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties
@@ -5,5 +5,5 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacWarnings.. = -assertIdentifier,-enumIdentifier
diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties
index 91908a6b4..0a8446cbb 100644
--- a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties
+++ b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties
@@ -14,5 +14,5 @@ bin.includes = .,\
src.includes = about.html
source.. = src/
output.. = bin/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacWarnings.. = -assertIdentifier,-enumIdentifier
diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties b/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties
index 3f335181d..8f66bf723 100644
--- a/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties
+++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties
@@ -3,6 +3,6 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties,\
about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacWarnings.. = -assertIdentifier,-enumIdentifier
src.includes = about.html
diff --git a/framework/bundles/org.eclipse.ecf.ui/build.properties b/framework/bundles/org.eclipse.ecf.ui/build.properties
index a23fecfc2..7fb2a47a0 100644
--- a/framework/bundles/org.eclipse.ecf.ui/build.properties
+++ b/framework/bundles/org.eclipse.ecf.ui/build.properties
@@ -10,5 +10,5 @@ src.includes = about.html,\
jars.compile.order = .
source.. = src/
output.. = bin/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties
index a46b9668d..3efc595b1 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties
@@ -8,4 +8,4 @@ bin.includes = META-INF/,\
OSGI-INF/
src.includes = about.html,\
bundle.properties
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties b/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties
index 22aa5b461..d86e3035e 100644
--- a/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties
+++ b/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties
@@ -21,6 +21,6 @@ output.. = bin/
jars.extra.classpath = osgi/osgi.annotation.jar
jars.compile.order = .
source.. = src/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
\ No newline at end of file
diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties b/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties
index 483df6f64..980606451 100644
--- a/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties
+++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties
@@ -14,5 +14,5 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/protocols/bundles/org.jivesoftware.smack/build.properties b/protocols/bundles/org.jivesoftware.smack/build.properties
index 56c054ca4..cbe9a7cfc 100644
--- a/protocols/bundles/org.jivesoftware.smack/build.properties
+++ b/protocols/bundles/org.jivesoftware.smack/build.properties
@@ -11,5 +11,5 @@ src.includes = asl-v20.txt,\
META-INF/eclipse.inf
javacSource = 1.5
javacTarget = 1.5
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
\ No newline at end of file
diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties
index 3ee3b91be..9cd2e44ee 100644
--- a/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties
@@ -18,4 +18,4 @@ bin.includes = META-INF/,\
plugin.properties
src.includes = about.html,\
icons/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties b/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties
index d60b77b9a..92670ea3d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties
index d2e7eade1..126f2873e 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties
@@ -7,4 +7,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/build.properties b/providers/bundles/org.eclipse.ecf.provider.irc/build.properties
index 0cd434a37..f4d84dc5d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.irc/build.properties
@@ -11,4 +11,4 @@ src.includes = about.html,\
asl-v20.txt
source.. = src/
output.. = bin/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties b/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties
index 72acd714a..b014493ce 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties
@@ -11,7 +11,7 @@ src.includes = about.html,\
source.. = src/,\
jmdns/
output.. = bin/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
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 ce33d9daf..2ce96026b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties
@@ -8,7 +8,7 @@ bin.includes = META-INF/,\
.options
source.. = src/
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
additional.bundles = org.eclipse.equinox.concurrent
jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/providers/bundles/org.eclipse.ecf.provider.local/build.properties b/providers/bundles/org.eclipse.ecf.provider.local/build.properties
index fe59fcfde..926752973 100644
--- a/providers/bundles/org.eclipse.ecf.provider.local/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.local/build.properties
@@ -4,4 +4,4 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
bundle.properties
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/build.properties b/providers/bundles/org.eclipse.ecf.provider.msn/build.properties
index 058b00f22..401470b15 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.msn/build.properties
@@ -15,5 +15,5 @@ bin.includes = META-INF/,\
plugin.xml,\
about.html
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties b/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties
index 98d632874..43f91f680 100644
--- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties
@@ -6,5 +6,5 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/providers/bundles/org.eclipse.ecf.provider.rss/build.properties b/providers/bundles/org.eclipse.ecf.provider.rss/build.properties
index ddef88030..b17d1aca5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.rss/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.rss/build.properties
@@ -8,5 +8,5 @@ bin.includes = plugin.xml,\
lib/rss-sse.jar,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/providers/bundles/org.eclipse.ecf.provider.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.ui/build.properties
index 345c4af00..3017b2aa7 100644
--- a/providers/bundles/org.eclipse.ecf.provider.ui/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.ui/build.properties
@@ -7,4 +7,4 @@ bin.includes = META-INF/,\
plugin.properties,\
icons/
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties
index edc30b782..5f70f5dfe 100644
--- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties
+++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties
@@ -8,5 +8,5 @@ bin.includes = META-INF/,\
about.html
src.includes = bundle.properties,\
about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
jars.extra.classpath=r7stubs.jar
diff --git a/server-side/bundles/org.eclipse.ecf.server/build.properties b/server-side/bundles/org.eclipse.ecf.server/build.properties
index c74ffe48f..aa1fcb3af 100644
--- a/server-side/bundles/org.eclipse.ecf.server/build.properties
+++ b/server-side/bundles/org.eclipse.ecf.server/build.properties
@@ -6,5 +6,5 @@ src.includes = about.html
jars.compile.order = .
output.. = bin/
source.. = src/
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties
index 5fb7d7ed3..e39610a7b 100644
--- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties
+++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties
@@ -5,4 +5,4 @@ bin.includes = META-INF/,\
about.html
src.includes = fragment.xml,\
about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties
index b0b630729..185ed8266 100644
--- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties
+++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties
@@ -5,4 +5,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties
index e7dcccc87..3a0e2e1ca 100644
--- a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties
+++ b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties
@@ -6,5 +6,5 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties b/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties
index 7d594a4a5..17178430b 100644
--- a/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties
@@ -5,5 +5,5 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties b/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties
index 7d594a4a5..17178430b 100644
--- a/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties
@@ -5,5 +5,5 @@ bin.includes = META-INF/,\
plugin.properties,\
about.html
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties b/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties
index 55aa36bfa..9405dd50d 100644
--- a/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties
@@ -2,5 +2,5 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties
index e4e790050..32300568c 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties
@@ -2,4 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
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 67ad960b1..c31d449c3 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties
@@ -2,6 +2,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
additional.bundles = org.eclipse.equinox.concurrent
jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties
index 55aa36bfa..9405dd50d 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties
@@ -2,5 +2,5 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
javacErrors.. = -assertIdentifier,-enumIdentifier
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties
index e4e790050..32300568c 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties
@@ -2,4 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11
diff --git a/tests/bundles/org.eclipse.ecf.tests/build.properties b/tests/bundles/org.eclipse.ecf.tests/build.properties
index d60b77b9a..92670ea3d 100755
--- a/tests/bundles/org.eclipse.ecf.tests/build.properties
+++ b/tests/bundles/org.eclipse.ecf.tests/build.properties
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
about.html,\
plugin.properties
src.includes = about.html
-jre.compilation.profile = J2SE-11
+jre.compilation.profile = JavaSE-11