From 371d743bff1573dd198b5ac70f3c225823fc7dec Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Thu, 14 Dec 2017 23:48:55 +0100 Subject: [PATCH] Preparations towards a reproducible release build (#259) - using an ESH release build (0.10.0.b1) - added ESH release p2 repos for release builds - removed targetplatform, which afaics isn't used at all anymore Signed-off-by: Kai Kreuzer --- .../dashboard/internal/DashboardService.java | 1 - pom.xml | 1 - poms/pom.xml | 2 +- poms/tycho/pom.xml | 24 +- targetplatform/.project | 11 - targetplatform/openHAB2.setup | 2515 ----------------- targetplatform/openhab.target | 27 - targetplatform/pom.xml | 45 - 8 files changed, 23 insertions(+), 2603 deletions(-) delete mode 100644 targetplatform/.project delete mode 100644 targetplatform/openHAB2.setup delete mode 100644 targetplatform/openhab.target delete mode 100644 targetplatform/pom.xml diff --git a/bundles/org.openhab.ui.dashboard/src/main/java/org/openhab/ui/dashboard/internal/DashboardService.java b/bundles/org.openhab.ui.dashboard/src/main/java/org/openhab/ui/dashboard/internal/DashboardService.java index f4a3e24e3..5331bb0dd 100644 --- a/bundles/org.openhab.ui.dashboard/src/main/java/org/openhab/ui/dashboard/internal/DashboardService.java +++ b/bundles/org.openhab.ui.dashboard/src/main/java/org/openhab/ui/dashboard/internal/DashboardService.java @@ -236,7 +236,6 @@ public class DashboardService { * @param key key to get locale from * @return localized text for the key */ - private String getLocalizedText(String key) { Locale useLocale = localeProvider.getLocale() == null ? Locale.ENGLISH : localeProvider.getLocale(); diff --git a/pom.xml b/pom.xml index a4cecd216..971a9ace1 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,6 @@ poms/tycho bundles features - targetplatform diff --git a/poms/pom.xml b/poms/pom.xml index 6536326fc..5d13595fa 100644 --- a/poms/pom.xml +++ b/poms/pom.xml @@ -57,7 +57,7 @@ 2.4.3-01 1.0.19 - 0.10.0-SNAPSHOT + 0.10.0.b1 2.2.x 4.1.3 9.3.22.v20171030 diff --git a/poms/tycho/pom.xml b/poms/tycho/pom.xml index 731047fd7..2b5ac1dd6 100644 --- a/poms/tycho/pom.xml +++ b/poms/tycho/pom.xml @@ -214,11 +214,31 @@ - + - p2-smarthome + p2-smarthome-snapshot https://openhab.jfrog.io/openhab/eclipse-smarthome-stable p2 + + false + + + true + + + + + + p2-smarthome-release + http://download.eclipse.org/smarthome/updates-release/${esh.version} + p2 + + true + never + + + true + diff --git a/targetplatform/.project b/targetplatform/.project deleted file mode 100644 index 13251b55a..000000000 --- a/targetplatform/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - targetplatform - - - - - - - - diff --git a/targetplatform/openHAB2.setup b/targetplatform/openHAB2.setup deleted file mode 100644 index 676765995..000000000 --- a/targetplatform/openHAB2.setup +++ /dev/null @@ -1,2515 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OpenHAB2 Git Repository - - - openHAB 2 - - - - - - - - - - - - - - - - - - - - - - - - Manually maintained target platform - - - - - - - - openHAB 1 Git Repository - - - openHAB 1 - - - - - - - - - - - - - - - - - org.openhab.binding.fritzaha - org.openhab.binding.hue - org.openhab.binding.sonos - org.openhab.binding.wemo - - - org.openhab.action.astro - - - - org.openhab.io.multimedia - org.openhab.io.console - org.openhab.io.monitor - org.openhab.io.cv - org.openhab.io.net - org.openhab.io.net.test - org.openhab.io.myopenhab - org.openhab.io.rest - org.openhab.io.rest.lib - org.openhab.io.rest.test - - - - - - - - - - Manually maintained target platform - - - - - - - - Eclipse SmartHome Git Repository - - - Eclipse SmartHome - - - - - - - - - - - - - - - - - - - - - - - - org.eclipse.smarthome.io.console.karaf - - - - - - - - - - - - Manually maintained target platform - - - - - diff --git a/targetplatform/openhab.target b/targetplatform/openhab.target deleted file mode 100644 index ec1fb2d89..000000000 --- a/targetplatform/openhab.target +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml deleted file mode 100644 index a2854c80f..000000000 --- a/targetplatform/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - - org.openhab.core - pom - 2.2.0-SNAPSHOT - ../pom.xml - - - org.openhab.core - targetplatform - - openHAB Target Platform - - pom - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - openhab.target - target - openhab - - - - - - - - -