diff --git a/distributions/openhab/src/main/resources/conf/services/runtime.cfg b/distributions/openhab/src/main/resources/conf/services/runtime.cfg
index 7c09845b16..ea56bc8b65 100644
--- a/distributions/openhab/src/main/resources/conf/services/runtime.cfg
+++ b/distributions/openhab/src/main/resources/conf/services/runtime.cfg
@@ -4,47 +4,47 @@
# The ISO 639 alpha-2 or alpha-3 language code (if there is no alpha-2 one).
# Example: "en" (English), "de" (German), "ja" (Japanese), "kok" (Konkani)
#
-#org.eclipse.smarthome.i18n:language=
+#org.openhab.core.i18n:language=
# The region that should be used.
# ISO 3166 alpha-2 country code or UN M.49 numeric-3 area code.
# Example: "US" (United States), "DE" (Germany), "FR" (France), "029" (Caribbean)
#
-#org.eclipse.smarthome.i18n:region=
+#org.openhab.core.i18n:region=
################ PERSISTENCE ####################
# The persistence service to use if no other is specified.
#
-#org.eclipse.smarthome.persistence:default=
+#org.openhab.core.persistence:default=
################### AUDIO #######################
# This parameter defines the default audio source to use (if not set, the first available one will be used.
#
-#org.eclipse.smarthome.audio:defaultSource=
+#org.openhab.core.audio:defaultSource=
# This parameter defines the default audio sink to use (if not set, the first available one will be used.
#
-#org.eclipse.smarthome.audio:defaultSink=
+#org.openhab.core.audio:defaultSink=
##################### VOICE #####################
# This parameter defines the default text-to-speech service to use (if not set, the first available one will be used.
#
-#org.eclipse.smarthome.voice:defaultTTS=
+#org.openhab.core.voice:defaultTTS=
# This parameter defines the default speech-to-text service to use (if not set, the first available one will be used.
#
-#org.eclipse.smarthome.voice:defaultSTT=
+#org.openhab.core.voice:defaultSTT=
# The default voice to use if no specific TTS service or voice is specified.
#
-#org.eclipse.smarthome.voice:defaultVoice=
+#org.openhab.core.voice:defaultVoice=
# The default human language interpreter to use if no other is specified.
#
-#org.eclipse.smarthome.voice:defaultHLI=
+#org.openhab.core.voice:defaultHLI=
################### EPHEMERIS ###################
@@ -76,11 +76,11 @@ org.openhab.ephemeris:dayset-school=[MONDAY,TUESDAY,WEDNESDAY,THURSDAY,FRIDAY]
# Setting this to true will automatically approve all inbox entries and create Things for them,
# so that they are immediately available in the system (default is false)
#
-#org.eclipse.smarthome.inbox:autoApprove=true
+#org.openhab.core.inbox:autoApprove=true
# This setting allows to switch between a "simple" and an "advanced" mode for item management.
# In simple mode (autoLinks=true), links and their according items are automatically created for new Things.
# In advanced mode (autoLinks=false), the user has the full control about which items channels are linked to.
# Existing links will remain untouched. (default is true)
#
-#org.eclipse.smarthome.links:autoLinks=false
+#org.openhab.core.links:autoLinks=false
diff --git a/distributions/openhab/src/main/resources/runtime/services.cfg b/distributions/openhab/src/main/resources/runtime/services.cfg
index 1497130c12..94eec54dc1 100644
--- a/distributions/openhab/src/main/resources/runtime/services.cfg
+++ b/distributions/openhab/src/main/resources/runtime/services.cfg
@@ -1,16 +1,16 @@
# This file defines required service configurations.
# It can be overridden by user specific configurations in conf/services folder.
-org.eclipse.smarthome.folder:items=items
-org.eclipse.smarthome.folder:sitemaps=sitemap
-org.eclipse.smarthome.folder:rules=rules
-org.eclipse.smarthome.folder:scripts=script
-org.eclipse.smarthome.folder:persistence=persist
-org.eclipse.smarthome.folder:things=things
+org.openhab.core.folder:items=items
+org.openhab.core.folder:sitemaps=sitemap
+org.openhab.core.folder:rules=rules
+org.openhab.core.folder:scripts=script
+org.openhab.core.folder:persistence=persist
+org.openhab.core.folder:things=things
# Configuration of thread pool sizes
-org.eclipse.smarthome.threadpool:thingHandler=5
-org.eclipse.smarthome.threadpool:discovery=5
-org.eclipse.smarthome.threadpool:safeCall=10
+org.openhab.core.threadpool:thingHandler=5
+org.openhab.core.threadpool:discovery=5
+org.openhab.core.threadpool:safeCall=10
-org.eclipse.smarthome.autoupdate:sendOptimisticUpdates=true
+org.openhab.core.autoupdate:sendOptimisticUpdates=true
diff --git a/distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg b/distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg
index 74d962684e..da82503970 100644
--- a/distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg
+++ b/distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg
@@ -25,9 +25,6 @@ log4j2.logger.audit.appenderRef.audit.ref = AUDIT
log4j2.logger.openhab.name = org.openhab
log4j2.logger.openhab.level = INFO
-log4j2.logger.smarthome.name = org.eclipse.smarthome
-log4j2.logger.smarthome.level = INFO
-
log4j2.logger.smarthomeItemStateEvent.name = smarthome.event.ItemStateEvent
log4j2.logger.smarthomeItemStateEvent.level = ERROR
log4j2.logger.smarthomeItemAddedEvent.name = smarthome.event.ItemAddedEvent
diff --git a/features/distro/src/main/feature/feature.xml b/features/distro/src/main/feature/feature.xml
index 67327e95bb..45b15e2a24 100644
--- a/features/distro/src/main/feature/feature.xml
+++ b/features/distro/src/main/feature/feature.xml
@@ -14,7 +14,7 @@
mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-basicui
mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-classicui
mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-logging
-
+
default = rrd4j
@@ -40,7 +40,7 @@
ui = paper,habpanel
misc = ruleengine
-
+
autoLinks = true
@@ -51,7 +51,7 @@
package = standard
ui = basic,paper,habpanel,homebuilder
-
+
autoLinks = false
@@ -63,7 +63,7 @@
ui = classic,basic,paper,habpanel,habmin,restdocs
transformation = map,regex,xslt,exec,javascript,scale,xpath,jsonpath
-
+
autoLinks = false
diff --git a/launch/app/app.bndrun b/launch/app/app.bndrun
index 0820542592..56e28f671f 100644
--- a/launch/app/app.bndrun
+++ b/launch/app/app.bndrun
@@ -55,13 +55,7 @@ feature.openhab-model-runtime-all: \
bnd.identity;id='org.openhab.core.automation.module.media',\
bnd.identity;id='org.openhab.core.automation.module.script',\
bnd.identity;id='org.openhab.core.automation.module.script.rulesupport',\
- bnd.identity;id='org.openhab.core.automation.rest',\
- bnd.identity;id='org.openhab.ui.basic',\
- bnd.identity;id='org.openhab.ui.paper',\
- bnd.identity;id='org.openhab.core.ui.icon',\
- bnd.identity;id='org.openhab.transform.map',\
- bnd.identity;id='org.openhab.ui.iconset.classic',\
- bnd.identity;id='org.openhab.ui.restdocs'
+ bnd.identity;id='org.openhab.core.automation.rest'
-runfw: org.eclipse.osgi
@@ -151,7 +145,6 @@ feature.openhab-model-runtime-all: \
org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
- org.eclipse.jetty.proxy;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
@@ -173,7 +166,6 @@ feature.openhab-model-runtime-all: \
org.openhab.core.automation.module.script.rulesupport;version='[3.0.0,3.0.1)',\
org.openhab.core.automation.rest;version='[3.0.0,3.0.1)',\
org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
- org.openhab.core.boot;version='[3.0.0,3.0.1)',\
org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
org.openhab.core.config.dispatch;version='[3.0.0,3.0.1)',\
@@ -188,7 +180,6 @@ feature.openhab-model-runtime-all: \
org.openhab.core.io.rest;version='[3.0.0,3.0.1)',\
org.openhab.core.io.rest.core;version='[3.0.0,3.0.1)',\
org.openhab.core.io.rest.optimize;version='[3.0.0,3.0.1)',\
- org.openhab.core.io.rest.sitemap;version='[3.0.0,3.0.1)',\
org.openhab.core.io.rest.sse;version='[3.0.0,3.0.1)',\
org.openhab.core.model.core;version='[3.0.0,3.0.1)',\
org.openhab.core.model.item;version='[3.0.0,3.0.1)',\
@@ -210,15 +201,7 @@ feature.openhab-model-runtime-all: \
org.openhab.core.thing;version='[3.0.0,3.0.1)',\
org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
org.openhab.core.transform;version='[3.0.0,3.0.1)',\
- org.openhab.core.ui;version='[3.0.0,3.0.1)',\
- org.openhab.core.ui.icon;version='[3.0.0,3.0.1)',\
org.openhab.core.voice;version='[3.0.0,3.0.1)',\
- org.openhab.transform.map;version='[3.0.0,3.0.1)',\
- org.openhab.ui.basic;version='[3.0.0,3.0.1)',\
- org.openhab.ui.dashboard;version='[3.0.0,3.0.1)',\
- org.openhab.ui.iconset.classic;version='[3.0.0,3.0.1)',\
- org.openhab.ui.paper;version='[3.0.0,3.0.1)',\
- org.openhab.ui.restdocs;version='[3.0.0,3.0.1)',\
slf4j.simple;version='[1.7.21,1.7.22)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
diff --git a/launch/app/pom.xml b/launch/app/pom.xml
index e0d45a750d..cd0311e80f 100644
--- a/launch/app/pom.xml
+++ b/launch/app/pom.xml
@@ -41,12 +41,6 @@
pom
runtime
-
- org.openhab.addons.bundles
- org.openhab.transform.map
- ${project.version}
- runtime
-