From 924e7b2d6d7162705cec09ac0b24ce30ecbf2947 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Thu, 21 Dec 2023 17:23:43 +0000 Subject: [PATCH 1/5] Fixes #3946 (#3947) * Fixes #3946 Signed-off-by: Andrew Fiddian-Green --- .../addon/AddonSuggestionService.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/AddonSuggestionService.java b/bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/AddonSuggestionService.java index 0e6854d4b8a..61265ba67df 100644 --- a/bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/AddonSuggestionService.java +++ b/bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/AddonSuggestionService.java @@ -173,31 +173,39 @@ public void removeAddonInfoProvider(AddonInfoProvider addonInfoProvider) { @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC) public void addAddonFinder(AddonFinder addonFinder) { - addonFinders.add(addonFinder); + synchronized (addonFinders) { + addonFinders.add(addonFinder); + } changed(); } public void removeAddonFinder(AddonFinder addonFinder) { - if (addonFinders.remove(addonFinder)) { - changed(); + synchronized (addonFinders) { + addonFinders.remove(addonFinder); } } private void changed() { List candidates = addonInfoProviders.stream().map(p -> p.getAddonInfos(localeProvider.getLocale())) .flatMap(Collection::stream).toList(); - addonFinders.stream().filter(this::isFinderEnabled).forEach(f -> f.setAddonCandidates(candidates)); + synchronized (addonFinders) { + addonFinders.stream().filter(this::isFinderEnabled).forEach(f -> f.setAddonCandidates(candidates)); + } } @Deactivate @Override public void close() throws Exception { - addonFinders.clear(); + synchronized (addonFinders) { + addonFinders.clear(); + } addonInfoProviders.clear(); } public Set getSuggestedAddons(@Nullable Locale locale) { - return addonFinders.stream().filter(this::isFinderEnabled).map(f -> f.getSuggestedAddons()) - .flatMap(Collection::stream).collect(Collectors.toSet()); + synchronized (addonFinders) { + return addonFinders.stream().filter(this::isFinderEnabled).map(f -> f.getSuggestedAddons()) + .flatMap(Collection::stream).collect(Collectors.toSet()); + } } } From 4b310aff3000cf0e186be09f74e667feb91d3c34 Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Thu, 21 Dec 2023 21:36:11 +0100 Subject: [PATCH 2/5] Catch ISE if config admin is no longer available (#3949) --- .../discovery/addon/AddonSuggestionService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/AddonSuggestionService.java b/bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/AddonSuggestionService.java index 61265ba67df..4a927da5536 100644 --- a/bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/AddonSuggestionService.java +++ b/bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/AddonSuggestionService.java @@ -12,9 +12,7 @@ */ package org.openhab.core.config.discovery.addon; -import static org.openhab.core.config.discovery.addon.AddonFinderConstants.SUGGESTION_FINDERS; -import static org.openhab.core.config.discovery.addon.AddonFinderConstants.SUGGESTION_FINDER_CONFIGS; -import static org.openhab.core.config.discovery.addon.AddonFinderConstants.SUGGESTION_FINDER_FEATURES; +import static org.openhab.core.config.discovery.addon.AddonFinderConstants.*; import java.io.IOException; import java.util.ArrayList; @@ -50,6 +48,8 @@ import org.osgi.service.component.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferencePolicy; import org.osgi.service.component.annotations.ReferencePolicyOption; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This is a {@link AddonSuggestionService} which discovers suggested add-ons for the user to install. @@ -64,6 +64,8 @@ public class AddonSuggestionService implements AutoCloseable { public static final String SERVICE_NAME = "addon-suggestion-service"; public static final String CONFIG_PID = "org.openhab.addons"; + private final Logger logger = LoggerFactory.getLogger(AddonSuggestionService.class); + private final Set addonInfoProviders = ConcurrentHashMap.newKeySet(); private final List addonFinders = Collections.synchronizedList(new ArrayList<>()); private final ConfigurationAdmin configurationAdmin; @@ -148,7 +150,8 @@ private void syncConfiguration() { if (!cfgMap.equals(config)) { modified(cfgMap); } - } catch (IOException e) { + } catch (IOException | IllegalStateException e) { + logger.debug("Exception occurred while trying to sync the configuration: {}", e.getMessage()); } } From be456792d3a80ae9fd7a8101d501a192c3bbc562 Mon Sep 17 00:00:00 2001 From: openhab-bot Date: Thu, 21 Dec 2023 21:51:49 +0100 Subject: [PATCH 3/5] New Crowdin updates (#3950) * New translations i18n.properties (Romanian) * New translations network.properties (Romanian) * New translations i18n.properties (French) * New translations network.properties (French) * New translations i18n.properties (Spanish) * New translations network.properties (Spanish) * New translations i18n.properties (Czech) * New translations network.properties (Czech) * New translations addons.properties (Danish) * New translations i18n.properties (Danish) * New translations network.properties (Danish) * New translations marketplace.properties (Danish) * New translations units.properties (Danish) * New translations i18n.properties (German) * New translations network.properties (German) * New translations i18n.properties (Greek) * New translations network.properties (Greek) * New translations i18n.properties (Finnish) * New translations network.properties (Finnish) * New translations i18n.properties (Hebrew) * New translations network.properties (Hebrew) * New translations i18n.properties (Hungarian) * New translations network.properties (Hungarian) * New translations units.properties (Hungarian) * New translations i18n.properties (Italian) * New translations network.properties (Italian) * New translations units.properties (Italian) * New translations i18n.properties (Dutch) * New translations network.properties (Dutch) * New translations i18n.properties (Norwegian) * New translations network.properties (Norwegian) * New translations i18n.properties (Polish) * New translations network.properties (Polish) * New translations i18n.properties (Russian) * New translations network.properties (Russian) * New translations i18n.properties (Slovenian) * New translations network.properties (Slovenian) * New translations i18n.properties (Swedish) * New translations network.properties (Swedish) * New translations i18n.properties (Ukrainian) * New translations network.properties (Ukrainian) * New translations i18n.properties (Chinese Simplified) * New translations network.properties (Chinese Simplified) * New translations i18n.properties (Portuguese, Brazilian) * New translations network.properties (Portuguese, Brazilian) --- .../OH-INF/i18n/marketplace_da.properties | 13 +++++++++++++ .../resources/OH-INF/i18n/addons_da.properties | 6 ++++-- .../resources/OH-INF/i18n/i18n_cs.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_da.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_de.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_el.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_es.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_fi.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_fr.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_he.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_hu.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_it.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_nl.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_no.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_pl.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_pt.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_ro.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_ru.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_sl.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_sv.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_uk.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/i18n_zh.properties | 16 ++++++++-------- .../resources/OH-INF/i18n/network_cs.properties | 8 ++++---- .../resources/OH-INF/i18n/network_da.properties | 8 ++++---- .../resources/OH-INF/i18n/network_de.properties | 8 ++++---- .../resources/OH-INF/i18n/network_el.properties | 8 ++++---- .../resources/OH-INF/i18n/network_es.properties | 8 ++++---- .../resources/OH-INF/i18n/network_fi.properties | 8 ++++---- .../resources/OH-INF/i18n/network_fr.properties | 8 ++++---- .../resources/OH-INF/i18n/network_he.properties | 8 ++++---- .../resources/OH-INF/i18n/network_hu.properties | 8 ++++---- .../resources/OH-INF/i18n/network_it.properties | 8 ++++---- .../resources/OH-INF/i18n/network_nl.properties | 8 ++++---- .../resources/OH-INF/i18n/network_no.properties | 8 ++++---- .../resources/OH-INF/i18n/network_pl.properties | 8 ++++---- .../resources/OH-INF/i18n/network_pt.properties | 8 ++++---- .../resources/OH-INF/i18n/network_ro.properties | 8 ++++---- .../resources/OH-INF/i18n/network_ru.properties | 8 ++++---- .../resources/OH-INF/i18n/network_sl.properties | 8 ++++---- .../resources/OH-INF/i18n/network_sv.properties | 8 ++++---- .../resources/OH-INF/i18n/network_uk.properties | 8 ++++---- .../resources/OH-INF/i18n/network_zh.properties | 8 ++++---- .../resources/OH-INF/i18n/units_da.properties | 6 ++++++ .../resources/OH-INF/i18n/units_hu.properties | 6 ++++++ .../resources/OH-INF/i18n/units_it.properties | 6 ++++++ 45 files changed, 275 insertions(+), 242 deletions(-) create mode 100644 bundles/org.openhab.core.addon.marketplace/src/main/resources/OH-INF/i18n/marketplace_da.properties create mode 100644 bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_da.properties create mode 100644 bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_hu.properties create mode 100644 bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_it.properties diff --git a/bundles/org.openhab.core.addon.marketplace/src/main/resources/OH-INF/i18n/marketplace_da.properties b/bundles/org.openhab.core.addon.marketplace/src/main/resources/OH-INF/i18n/marketplace_da.properties new file mode 100644 index 00000000000..88cf83ceb55 --- /dev/null +++ b/bundles/org.openhab.core.addon.marketplace/src/main/resources/OH-INF/i18n/marketplace_da.properties @@ -0,0 +1,13 @@ +system.config.jsonaddonservice.showUnstable.label = Vis ustabile tilføjelser +system.config.jsonaddonservice.showUnstable.description = Inkludér poster, der ikke er blevet mærket som "stabile". Disse tilføjelser bør kun anvendes til testformål og anses ikke for at være klar til produktionssystemer. +system.config.jsonaddonservice.urls.label = Tjeneste-URL'er for tilføjelser +system.config.jsonaddonservice.urls.description = Pipe (|)-separeret liste af URL'er der leverer tredjeparts tilføjelsestjenester via JSON-filer. Advarsel\: Bundles distribueret over tredjeparts tilføjelsestjenester kan mangle ordentlig gennemgang og kan potentielt indeholde ondsindet kode og dermed forvolde skade på dit system. +system.config.marketplace.apiKey.label = API-nøgle for community.openhab.org +system.config.marketplace.apiKey.description = Angiv API-nøglen, der skal bruges på community-forummet (for stab og kuratorer - dette giver mulighed for fx at se indhold, der endnu ikke er gennemgået eller som på anden måde er skjult for den brede offentlighed). Efterlad tomt, hvis du ikke har en. +system.config.marketplace.enable.label = Aktiver Community Marketplace +system.config.marketplace.enable.description = Hvis deaktiveret vil tilføjelser fra Community Marketplace ikke blive vist. Allerede installerede tilføjelser vil stadig være tilgængelige. +system.config.marketplace.showUnpublished.label = Vis upublicerede poster +system.config.marketplace.showUnpublished.description = Inkludér poster, der ikke er blevet mærket som publicerede. Advarsel\: Dette kan omfatte poster, der ikke er klar og måske ikke virker eller forårsager skade på din installation. Aktiver på egen risiko, kun til testformål. + +service.system.marketplace.label = Community Marketplace +service.system.jsonaddonservice.label = JSON tredjeparts-tilføjelsestjeneste diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/addons_da.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/addons_da.properties index 6708e43c102..d040116b000 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/addons_da.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/addons_da.properties @@ -2,9 +2,11 @@ system.config.addons.includeIncompatible.label = Inkluder (potentielt) inkompati system.config.addons.includeIncompatible.description = Nogle tilføjelsestjenester kan tilbyde tilføjelser, hvor kompatibilitet med det aktuelt kørende system ikke forventes. Aktivering af denne indstilling vil inkludere disse poster i listen over tilgængelige tilføjelser. system.config.addons.remote.label = Tilgå remote repository system.config.addons.remote.description = Definerer om openHAB skal tilgå remote repository til installation af tilføjelser. +system.config.addons.suggestionFinderIp.label = IP-baseret forslagsfinder +system.config.addons.suggestionFinderIp.description = Brug IP-netværksopdagelsesudsendelser til at foreslå tilføjelser. Det kan tage op til et minut at slå til eller fra. system.config.addons.suggestionFinderMdns.label = mDNS forslagsfinder -system.config.addons.suggestionFinderMdns.description = Brug mDNS netværksscanning til at foreslå add-ons. Det kan tage op til et minut at slå til eller fra. +system.config.addons.suggestionFinderMdns.description = Brug mDNS netværksscanning til at foreslå tilføjelser. Det kan tage op til et minut at slå til eller fra. system.config.addons.suggestionFinderUpnp.label = UPnP forslagsfinder -system.config.addons.suggestionFinderUpnp.description = Brug UPnP netværksscanning til at foreslå add-ons. Det kan tage op til et minut at slå til eller fra. +system.config.addons.suggestionFinderUpnp.description = Brug UPnP netværksscanning til at foreslå tilføjelser. Det kan tage op til et minut at slå til eller fra. service.system.addons.label = Administration af tilføjelser diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_cs.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_cs.properties index 81661d52d30..74ecdb473bb 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_cs.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_cs.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Jazyk system.config.i18n.language.description = Výchozí jazyk, který by měl být použit. Není-li zadán, použije se výchozí dle systému. -system.config.i18n.script.label = Skript -system.config.i18n.script.description = Skript, který by měl být použit. -system.config.i18n.region.label = Země / Region -system.config.i18n.region.description = Region, který by měl být použit. -system.config.i18n.variant.label = Varianta -system.config.i18n.variant.description = Varianta Locale. Jakákoli libovolná hodnota použitá k označení varianty Locale. -system.config.i18n.timezone.label = Časové pásmo -system.config.i18n.timezone.description = Časové pásmo lze nastavit z uživatelského rozhraní. Časové pásmo základního systému je výchozí. system.config.i18n.location.label = Poloha system.config.i18n.location.description = Umístění této instalace.
Souřadnice jako <latitude>,<longitude>[<altitude>]
Příklad\: "52.5200066,13.4049540" (Berlin) system.config.i18n.measurementSystem.label = Jednotky měření system.config.i18n.measurementSystem.description = Nastavení pro převod jednotek. system.config.i18n.measurementSystem.option.SI = Metrický system.config.i18n.measurementSystem.option.US = Imperiální (USA) +system.config.i18n.region.label = Země / Region +system.config.i18n.region.description = Region, který by měl být použit. +system.config.i18n.script.label = Skript +system.config.i18n.script.description = Skript, který by měl být použit. +system.config.i18n.timezone.label = Časové pásmo +system.config.i18n.timezone.description = Časové pásmo lze nastavit z uživatelského rozhraní. Časové pásmo základního systému je výchozí. +system.config.i18n.variant.label = Varianta +system.config.i18n.variant.description = Varianta Locale. Jakákoli libovolná hodnota použitá k označení varianty Locale. service.system.i18n.label = Regionální nastavení diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_da.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_da.properties index 536e01bf15e..c82c3bc1506 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_da.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_da.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Sprog system.config.i18n.language.description = Standardsprog der skal bruges. Hvis det ikke er angivet, bruges systemets landestandard. -system.config.i18n.script.label = Script -system.config.i18n.script.description = Scriptet der skal bruges. -system.config.i18n.region.label = Land / Region -system.config.i18n.region.description = Den region, der skal anvendes. -system.config.i18n.variant.label = Variant -system.config.i18n.variant.description = En variation af Locale. Enhver vilkårlig værdi, der anvendes til at angive en variation af en Locale. -system.config.i18n.timezone.label = Tidszone -system.config.i18n.timezone.description = En tidszone kan indstilles fra brugergrænsefladen. Det underliggende systems tidszone er standard. system.config.i18n.location.label = Placering system.config.i18n.location.description = Placeringen af denne installation.
Koordinater som <latitude>,<longitude>[<altitude>]
Eksempel\: "55.6760049,12.5691240" (København) system.config.i18n.measurementSystem.label = Målesystem system.config.i18n.measurementSystem.description = Målesystemet anvendes til enhedskonvertering. system.config.i18n.measurementSystem.option.SI = Metrisk system.config.i18n.measurementSystem.option.US = Imperial (USA) +system.config.i18n.region.label = Land / Region +system.config.i18n.region.description = Den region, der skal anvendes. +system.config.i18n.script.label = Script +system.config.i18n.script.description = Scriptet der skal bruges. +system.config.i18n.timezone.label = Tidszone +system.config.i18n.timezone.description = En tidszone kan indstilles fra brugergrænsefladen. Det underliggende systems tidszone er standard. +system.config.i18n.variant.label = Variant +system.config.i18n.variant.description = En variation af Locale. Enhver vilkårlig værdi, der anvendes til at angive en variation af en Locale. service.system.i18n.label = Regionale indstillinger diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_de.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_de.properties index 731da6e813a..dc322c76540 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_de.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_de.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Sprache system.config.i18n.language.description = Die Sprache, die verwendet werden soll. Falls nicht angegeben, wird die Systemsprache verwendet. -system.config.i18n.script.label = Skript -system.config.i18n.script.description = Das Skript, das verwendet werden soll. -system.config.i18n.region.label = Land / Region -system.config.i18n.region.description = Die Region, die genutzt werden sollte. -system.config.i18n.variant.label = Variante -system.config.i18n.variant.description = Variant Attribut der Locale. Ein Wert, um näheren Bezug auf die Region zu nehmen (siehe auch ISO 3166-2\:AT, ISO 3166-2\:CH oder ISO 3166-2\:DE). -system.config.i18n.timezone.label = Zeitzone -system.config.i18n.timezone.description = Eine Zeitzone kann von der Benutzeroberfläche aus eingestellt werden. Falls nicht angegeben, wird die Systemzeitzone verwendet. system.config.i18n.location.label = Standort system.config.i18n.location.description = Der Standort dieser Installation.
Koordinaten als <Latitude>,<Longitude>[<Altitude>]
Beispiel\: "52.5200066,13.4049540" (Berlin) system.config.i18n.measurementSystem.label = Einheitensystem system.config.i18n.measurementSystem.description = Das Einheitensystem, das für die Umrechnung und Anzeige von Daten eingesetzt wird. system.config.i18n.measurementSystem.option.SI = Metrisch system.config.i18n.measurementSystem.option.US = Imperial (US) +system.config.i18n.region.label = Land / Region +system.config.i18n.region.description = Die Region, die genutzt werden sollte. +system.config.i18n.script.label = Skript +system.config.i18n.script.description = Das Skript, das verwendet werden soll. +system.config.i18n.timezone.label = Zeitzone +system.config.i18n.timezone.description = Eine Zeitzone kann von der Benutzeroberfläche aus eingestellt werden. Falls nicht angegeben, wird die Systemzeitzone verwendet. +system.config.i18n.variant.label = Variante +system.config.i18n.variant.description = Variant Attribut der Locale. Ein Wert, um näheren Bezug auf die Region zu nehmen (siehe auch ISO 3166-2\:AT, ISO 3166-2\:CH oder ISO 3166-2\:DE). service.system.i18n.label = Regionale Einstellungen diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_el.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_el.properties index 37d95af1a68..7752f5b252f 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_el.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_el.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Γλώσσα system.config.i18n.language.description = Η προεπιλεγμένη γλώσσα που θα χρησιμοποιηθεί. Αν δεν καθοριστεί, χρησιμοποιείται η προεπιλεγμένη γλώσσα συστήματος. -system.config.i18n.script.label = Σενάριο -system.config.i18n.script.description = Το σενάριο ενεργειών που θα πρέπει να χρησιμοποιηθεί. -system.config.i18n.region.label = Χώρα / Περιοχή -system.config.i18n.region.description = Η περιοχή που θα πρέπει να χρησιμοποιηθεί. -system.config.i18n.variant.label = Παραλλαγή -system.config.i18n.variant.description = Μια παραλλαγή των Ρυθμίσεων Τοποθεσίας. Οποιαδήποτε αυθαίρετη τιμή χρησιμοποιείται για να υποδείξει μια παραλλαγή των Ρυθμίσεων Τοποθεσίας. -system.config.i18n.timezone.label = Ζώνη Ώρας -system.config.i18n.timezone.description = Η ζώνη ώρας μπορεί να οριστεί από τη διεπαφή χρήστη. Η ζώνη ώρας αυτού του συστήματος είναι η προεπιλεγμένη. system.config.i18n.location.label = Τοποθεσία system.config.i18n.location.description = Η τοποθεσία αυτής της εγκατάστασης.
Συντεταγμένες ως <latitude>,<longitude>[<altitude>]
Παράδειγμα\: "52.5200066,13.4049540" (Βερολίνο) system.config.i18n.measurementSystem.label = Σύστημα Μέτρησης system.config.i18n.measurementSystem.description = Το σύστημα μέτρησης χρησιμοποιείται για ορθές μετατροπές μονάδων. system.config.i18n.measurementSystem.option.SI = Μετρικό system.config.i18n.measurementSystem.option.US = Αγγλοσαξονικό (ΗΠΑ) +system.config.i18n.region.label = Χώρα / Περιοχή +system.config.i18n.region.description = Η περιοχή που θα πρέπει να χρησιμοποιηθεί. +system.config.i18n.script.label = Σενάριο +system.config.i18n.script.description = Το σενάριο ενεργειών που θα πρέπει να χρησιμοποιηθεί. +system.config.i18n.timezone.label = Ζώνη Ώρας +system.config.i18n.timezone.description = Η ζώνη ώρας μπορεί να οριστεί από τη διεπαφή χρήστη. Η ζώνη ώρας αυτού του συστήματος είναι η προεπιλεγμένη. +system.config.i18n.variant.label = Παραλλαγή +system.config.i18n.variant.description = Μια παραλλαγή των Ρυθμίσεων Τοποθεσίας. Οποιαδήποτε αυθαίρετη τιμή χρησιμοποιείται για να υποδείξει μια παραλλαγή των Ρυθμίσεων Τοποθεσίας. service.system.i18n.label = Ρυθμίσεις Περιοχής diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_es.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_es.properties index ad3b010f0a6..d30c491d78c 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_es.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_es.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Idioma system.config.i18n.language.description = Idioma por defecto que se debe utilizar. Si no se especifica, se utiliza la configuración por defecto del sistema. -system.config.i18n.script.label = Script -system.config.i18n.script.description = El script que debe ser usado. -system.config.i18n.region.label = País / Región -system.config.i18n.region.description = La región que debe utilizarse. -system.config.i18n.variant.label = Variante -system.config.i18n.variant.description = Una variación de configuración regional. Cualquier valor utilizado para indicar una variación de una configuración regional. -system.config.i18n.timezone.label = Zona horaria -system.config.i18n.timezone.description = Se puede establecer una zona horaria desde la interfaz de usuario. La zona horaria de sistema es el valor predeterminado. system.config.i18n.location.label = Ubicación system.config.i18n.location.description = La ubicación de esta instalación.
Coordenadas como <latitud>,<longitud>[<altitud>]
Ejemplo\: "52.5200066,13.4049540" (Berlín) system.config.i18n.measurementSystem.label = Sistema de medición system.config.i18n.measurementSystem.description = El sistema de medición se utiliza para la conversión unitaria. system.config.i18n.measurementSystem.option.SI = Métrica system.config.i18n.measurementSystem.option.US = Imperial (US) +system.config.i18n.region.label = País / Región +system.config.i18n.region.description = La región que debe utilizarse. +system.config.i18n.script.label = Script +system.config.i18n.script.description = El script que debe ser usado. +system.config.i18n.timezone.label = Zona horaria +system.config.i18n.timezone.description = Se puede establecer una zona horaria desde la interfaz de usuario. La zona horaria de sistema es el valor predeterminado. +system.config.i18n.variant.label = Variante +system.config.i18n.variant.description = Una variación de configuración regional. Cualquier valor utilizado para indicar una variación de una configuración regional. service.system.i18n.label = Configuración regional diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_fi.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_fi.properties index 3af3efa7abc..8523ac4059f 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_fi.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_fi.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Kieli system.config.i18n.language.description = Käytettävä oletuskieli. Jos kieltä ei ole määritelty, käytetään järjestelmän oletuskieltä. -system.config.i18n.script.label = Skripti -system.config.i18n.script.description = Käytettävä skripti. -system.config.i18n.region.label = Maa / Alue -system.config.i18n.region.description = Käytettävä alue. -system.config.i18n.variant.label = Muunnos -system.config.i18n.variant.description = Alueasetuksen muunnelma. Mikä tahansa mielivaltainen arvo, jota käytetään osoittamaan alueasetuksen muunnelma. -system.config.i18n.timezone.label = Aikavyöhyke -system.config.i18n.timezone.description = Aikavyöhyke voidaan asettaa käyttöliittymästä. Taustalla olevan järjestelmän aikavyöhyke on oletusarvo. system.config.i18n.location.label = Sijainti system.config.i18n.location.description = Asennuksen sijainti.
Koordinaatit muodossa <latitude>,<longitude>[<altitude>]
Esimerkiksi\: "52.5200066,13.4049540" (Berliini) system.config.i18n.measurementSystem.label = Mittajärjestelmä system.config.i18n.measurementSystem.description = Mittajärjestelmää käytetään yksiköiden muuntamiseen. system.config.i18n.measurementSystem.option.SI = Metrijärjestelmä system.config.i18n.measurementSystem.option.US = Imperiaalinen (US) +system.config.i18n.region.label = Maa / Alue +system.config.i18n.region.description = Käytettävä alue. +system.config.i18n.script.label = Skripti +system.config.i18n.script.description = Käytettävä skripti. +system.config.i18n.timezone.label = Aikavyöhyke +system.config.i18n.timezone.description = Aikavyöhyke voidaan asettaa käyttöliittymästä. Taustalla olevan järjestelmän aikavyöhyke on oletusarvo. +system.config.i18n.variant.label = Muunnos +system.config.i18n.variant.description = Alueasetuksen muunnelma. Mikä tahansa mielivaltainen arvo, jota käytetään osoittamaan alueasetuksen muunnelma. service.system.i18n.label = Alueelliset asetukset diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_fr.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_fr.properties index 7d2abde119c..200a173b5f9 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_fr.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_fr.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Langue system.config.i18n.language.description = La langue par défaut à utiliser. Si elle n'est pas spécifiée, la langue par défaut du système est utilisée. -system.config.i18n.script.label = Script -system.config.i18n.script.description = Le script à utiliser. -system.config.i18n.region.label = Pays / Région -system.config.i18n.region.description = La région à utiliser. -system.config.i18n.variant.label = Variante -system.config.i18n.variant.description = Une variante de paramètre régional. Toutes valeurs arbitraires permettant d'indiquer une variante régionale. -system.config.i18n.timezone.label = Fuseau horaire -system.config.i18n.timezone.description = Un fuseau horaire peut être défini à partir de l'interface utilisateur. Le fuseau horaire par défaut est celui du système sous-jacent. system.config.i18n.location.label = Emplacement system.config.i18n.location.description = L'emplacement de cette installation.
Coordonnées sous la forme <latitude>,<longitude>[<altitude>]
Exemple \: "52.5200066,13.4049540" (Berlin) system.config.i18n.measurementSystem.label = Système de mesure system.config.i18n.measurementSystem.description = Le système de mesure est utilisé pour la conversion d'unités. system.config.i18n.measurementSystem.option.SI = Métrique system.config.i18n.measurementSystem.option.US = Impérial (États-Unis) +system.config.i18n.region.label = Pays / Région +system.config.i18n.region.description = La région à utiliser. +system.config.i18n.script.label = Script +system.config.i18n.script.description = Le script à utiliser. +system.config.i18n.timezone.label = Fuseau horaire +system.config.i18n.timezone.description = Un fuseau horaire peut être défini à partir de l'interface utilisateur. Le fuseau horaire par défaut est celui du système sous-jacent. +system.config.i18n.variant.label = Variante +system.config.i18n.variant.description = Une variante de paramètre régional. Toutes valeurs arbitraires permettant d'indiquer une variante régionale. service.system.i18n.label = Paramètres régionaux diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_he.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_he.properties index 7e50f2dfe19..ba2f5efcdd4 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_he.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_he.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = שפה system.config.i18n.language.description = שפת ברירת המחדל בה יש להשתמש. אם לא מצוין, נעשה שימוש באזור ברירת המחדל של המערכת. -system.config.i18n.script.label = סקריפט -system.config.i18n.script.description = הסקריפט שיש להשתמש בו. -system.config.i18n.region.label = מדינה / אזור -system.config.i18n.region.description = האזור שיש להשתמש בו. -system.config.i18n.variant.label = משתנה -system.config.i18n.variant.description = וריאציה של המקום. כל ערך שרירותי המשמש לציון וריאציה של אזור. -system.config.i18n.timezone.label = אזור זמן -system.config.i18n.timezone.description = ניתן להגדיר אזור זמן מממשק המשתמש. אזור הזמן של המערכת הבסיסית הוא ברירת המחדל. system.config.i18n.location.label = מיקום system.config.i18n.location.description = המיקום של התקנה זו.
קואורדינטות כ- < קו רוחב >, < קו אורך > [< גובה >]
דוגמה\: "52.5200066,13.4049540" (ברלין) system.config.i18n.measurementSystem.label = שיטת מדידה system.config.i18n.measurementSystem.description = שיטת המדידה משמשת להמרת יחידות. system.config.i18n.measurementSystem.option.SI = מטרי system.config.i18n.measurementSystem.option.US = אימפריאלי (ארה"ב) +system.config.i18n.region.label = מדינה / אזור +system.config.i18n.region.description = האזור שיש להשתמש בו. +system.config.i18n.script.label = סקריפט +system.config.i18n.script.description = הסקריפט שיש להשתמש בו. +system.config.i18n.timezone.label = אזור זמן +system.config.i18n.timezone.description = ניתן להגדיר אזור זמן מממשק המשתמש. אזור הזמן של המערכת הבסיסית הוא ברירת המחדל. +system.config.i18n.variant.label = משתנה +system.config.i18n.variant.description = וריאציה של המקום. כל ערך שרירותי המשמש לציון וריאציה של אזור. service.system.i18n.label = service. system. i18n. label diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_hu.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_hu.properties index 0fbcb079e94..579588027dd 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_hu.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_hu.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Nyelv system.config.i18n.language.description = Az alapértelmezett nyelvet ajánlott használni. Ha nincs megadva a rendszer alapértelmezett nyelvi beállításai lesznek használva. -system.config.i18n.script.label = Script -system.config.i18n.script.description = A script használata javasolt. -system.config.i18n.region.label = Ország / Régió -system.config.i18n.region.description = Régió megadása lehetséges. -system.config.i18n.variant.label = Variáns -system.config.i18n.variant.description = A nyelvi beállítások változata. Tetszőleges érték használható a nyelvi változat megjelöléséhez. -system.config.i18n.timezone.label = Időzóna -system.config.i18n.timezone.description = Az időzóna a felhasználói felületen beállítható. A rendszer saját időzónája az alapértelmezett. system.config.i18n.location.label = Helyszín system.config.i18n.location.description = A jelen telepítés helyzete.
A koordináták <szélesség>,<hosszúság>[<magasság>]
Példa\: "47.497913,19.040236" (Budapest) system.config.i18n.measurementSystem.label = Mérési rendszer system.config.i18n.measurementSystem.description = Egységek meghatározása a Mérési rendszer alapján. system.config.i18n.measurementSystem.option.SI = Metrikus system.config.i18n.measurementSystem.option.US = Angolszász (USA) +system.config.i18n.region.label = Ország / Régió +system.config.i18n.region.description = Régió megadása lehetséges. +system.config.i18n.script.label = Script +system.config.i18n.script.description = A script használata javasolt. +system.config.i18n.timezone.label = Időzóna +system.config.i18n.timezone.description = Az időzóna a felhasználói felületen beállítható. A rendszer saját időzónája az alapértelmezett. +system.config.i18n.variant.label = Variáns +system.config.i18n.variant.description = A nyelvi beállítások változata. Tetszőleges érték használható a nyelvi változat megjelöléséhez. service.system.i18n.label = Regionális beállítások diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_it.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_it.properties index 5199b9c1e71..feaa1309aa1 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_it.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_it.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Lingua system.config.i18n.language.description = La lingua predefinita da usare. Se non specificata, viene usata la lingua predefinita di sistema. -system.config.i18n.script.label = Script -system.config.i18n.script.description = Lo script che dovrebbe essere usato. -system.config.i18n.region.label = Paese / Regione-Provincia -system.config.i18n.region.description = La regione o provincia da utilizzare. -system.config.i18n.variant.label = Variante -system.config.i18n.variant.description = Una variazione della lingua. Un qualsiasi valore usato per indicare un dialetto. -system.config.i18n.timezone.label = Fuso Orario -system.config.i18n.timezone.description = Un fuso orario può essere impostato dall'interfaccia utente. Il fuso orario di sistema è quello predefinito. system.config.i18n.location.label = Posizione system.config.i18n.location.description = Le coordinate di questa installazione.
Coordinate come <latitude>,<longitude>[<altitude>]
Esempio\: "52.5200066,13.4049540" (Berlino) system.config.i18n.measurementSystem.label = Sistema Di Misurazione system.config.i18n.measurementSystem.description = Il sistema di misura viene utilizzato per la conversione delle grandezze. system.config.i18n.measurementSystem.option.SI = Metrico system.config.i18n.measurementSystem.option.US = Imperiale (USA) +system.config.i18n.region.label = Paese / Regione-Provincia +system.config.i18n.region.description = La regione o provincia da utilizzare. +system.config.i18n.script.label = Script +system.config.i18n.script.description = Lo script che dovrebbe essere usato. +system.config.i18n.timezone.label = Fuso Orario +system.config.i18n.timezone.description = Un fuso orario può essere impostato dall'interfaccia utente. Il fuso orario di sistema è quello predefinito. +system.config.i18n.variant.label = Variante +system.config.i18n.variant.description = Una variazione della lingua. Un qualsiasi valore usato per indicare un dialetto. service.system.i18n.label = Impostazioni Locali diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_nl.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_nl.properties index bec17a128b0..0979e81dd16 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_nl.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_nl.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Taal system.config.i18n.language.description = De standaardtaal die moet worden gebruikt. Indien niet opgegeven, dan wordt de standaard systeemtaal gebruikt. -system.config.i18n.script.label = Script -system.config.i18n.script.description = Het script dat gebruikt moet worden. -system.config.i18n.region.label = Land / Regio -system.config.i18n.region.description = De regio die gebruikt moet worden. -system.config.i18n.variant.label = Variant -system.config.i18n.variant.description = Een variatie van de taal. Elke willekeurige waarde die wordt gebruikt om een variatie van een taal aan te geven. -system.config.i18n.timezone.label = Tijdzone -system.config.i18n.timezone.description = Een tijdzone kan worden ingesteld vanuit de gebruikersinterface. De tijdzone van het onderliggende systeem wordt gebruikt indien deze niet is ingesteld. system.config.i18n.location.label = Locatie system.config.i18n.location.description = De locatie van deze installatie.
Coördinaten als <breedtegraad>,<lengtegraad>[<hoogte>]
Voorbeeld\: "52.5200066,13.4049540" (Berlijn) system.config.i18n.measurementSystem.label = Meetsysteem system.config.i18n.measurementSystem.description = Het meetsysteem dat wordt gebruikt voor het converteren van eenheden. system.config.i18n.measurementSystem.option.SI = Metrisch system.config.i18n.measurementSystem.option.US = Imperiaal (VS) +system.config.i18n.region.label = Land / Regio +system.config.i18n.region.description = De regio die gebruikt moet worden. +system.config.i18n.script.label = Script +system.config.i18n.script.description = Het script dat gebruikt moet worden. +system.config.i18n.timezone.label = Tijdzone +system.config.i18n.timezone.description = Een tijdzone kan worden ingesteld vanuit de gebruikersinterface. De tijdzone van het onderliggende systeem wordt gebruikt indien deze niet is ingesteld. +system.config.i18n.variant.label = Variant +system.config.i18n.variant.description = Een variatie van de taal. Elke willekeurige waarde die wordt gebruikt om een variatie van een taal aan te geven. service.system.i18n.label = Regionale Instellingen diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_no.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_no.properties index aeba8e70711..05044ff05a7 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_no.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_no.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Språk system.config.i18n.language.description = Standardspråket som skal brukes. Hvis ikke angitt brukes standard systemspråk. -system.config.i18n.script.label = Skript -system.config.i18n.script.description = Skriptet som skal brukes. -system.config.i18n.region.label = Land / Region -system.config.i18n.region.description = Regionen som skal brukes. -system.config.i18n.variant.label = Variant -system.config.i18n.variant.description = En variant av Locale'et. Enhver vilkårlig verdi som brukes for å angi en variant av et Locale. -system.config.i18n.timezone.label = Tidssone -system.config.i18n.timezone.description = Tidssonen kan angis fra brukergrensesnittet. Det underliggende systemets tidssone er standard. system.config.i18n.location.label = Sted system.config.i18n.location.description = Installasjonsstedet.
Koordinater som <breddegrad>,<lengdegrad>[<høyde>]
Eksempel\: "52.5200066,13.4049540" (Berlin) system.config.i18n.measurementSystem.label = Målesystem system.config.i18n.measurementSystem.description = Målesystemet brukes til enhetskonvertering. system.config.i18n.measurementSystem.option.SI = Metrisk system.config.i18n.measurementSystem.option.US = Imperisk (USA) +system.config.i18n.region.label = Land / Region +system.config.i18n.region.description = Regionen som skal brukes. +system.config.i18n.script.label = Skript +system.config.i18n.script.description = Skriptet som skal brukes. +system.config.i18n.timezone.label = Tidssone +system.config.i18n.timezone.description = Tidssonen kan angis fra brukergrensesnittet. Det underliggende systemets tidssone er standard. +system.config.i18n.variant.label = Variant +system.config.i18n.variant.description = En variant av Locale'et. Enhver vilkårlig verdi som brukes for å angi en variant av et Locale. service.system.i18n.label = Regionale Innstillinger diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_pl.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_pl.properties index 0afaed61ed4..1fa10b632eb 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_pl.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_pl.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Język system.config.i18n.language.description = Domyślny język, który powinien być użyty. Jeśli nie jest określony, używany jest domyślny język systemu. -system.config.i18n.script.label = Skrypt -system.config.i18n.script.description = Skrypt, który powinien być użyty. -system.config.i18n.region.label = Kraj / Region -system.config.i18n.region.description = Region, który powinien być użyty. -system.config.i18n.variant.label = Wariant -system.config.i18n.variant.description = Odmiana wersji językowej. Dowolna wartość używana do wskazania zmiany wersji językowej. -system.config.i18n.timezone.label = Strefa czasowa -system.config.i18n.timezone.description = Strefa czasowa może być ustawiona z interfejsu użytkownika. Strefa czasowa systemu jest domyślna. system.config.i18n.location.label = Lokalizacja system.config.i18n.location.description = Lokalizacja tej instalacji.
Współrzędne jako <latitude>,<longitude>[<altitude>
Przykład\: "52.5200066,13.4049540" (Berlin) system.config.i18n.measurementSystem.label = System miar system.config.i18n.measurementSystem.description = Układ pomiarowy jest używany do przeliczania jednostek. system.config.i18n.measurementSystem.option.SI = Metryczny system.config.i18n.measurementSystem.option.US = Imperialny (USA) +system.config.i18n.region.label = Kraj / Region +system.config.i18n.region.description = Region, który powinien być użyty. +system.config.i18n.script.label = Skrypt +system.config.i18n.script.description = Skrypt, który powinien być użyty. +system.config.i18n.timezone.label = Strefa czasowa +system.config.i18n.timezone.description = Strefa czasowa może być ustawiona z interfejsu użytkownika. Strefa czasowa systemu jest domyślna. +system.config.i18n.variant.label = Wariant +system.config.i18n.variant.description = Odmiana wersji językowej. Dowolna wartość używana do wskazania zmiany wersji językowej. service.system.i18n.label = Ustawienia regionalne diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_pt.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_pt.properties index 7a56bbff641..d6e44ea3baa 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_pt.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_pt.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Idioma system.config.i18n.language.description = O idioma padrão que deve ser usado. Se não for especificado, o idioma padrão do sistema será usado. -system.config.i18n.script.label = Script -system.config.i18n.script.description = O script que deve ser usado. -system.config.i18n.region.label = País / Região -system.config.i18n.region.description = A região que deve ser usada. -system.config.i18n.variant.label = Variante -system.config.i18n.variant.description = Uma variação do Local. Qualquer valor arbitrário usado para indicar uma variação de um Local. -system.config.i18n.timezone.label = Fuso Horário -system.config.i18n.timezone.description = Um fuso horário pode ser definido a partir da interface de usuário. O fuso horário do sistema é o padrão. system.config.i18n.location.label = Localização system.config.i18n.location.description = A localização desta instalação.
Coordenadas como <latitude>,<longitude>[<altitude>]
Exemplo\: "52.5200066,13.4049540" (Berlim) system.config.i18n.measurementSystem.label = Sistema de Medida system.config.i18n.measurementSystem.description = O sistema de medida é usado para conversão de unidades. system.config.i18n.measurementSystem.option.SI = Métrico system.config.i18n.measurementSystem.option.US = Imperial (US) +system.config.i18n.region.label = País / Região +system.config.i18n.region.description = A região que deve ser usada. +system.config.i18n.script.label = Script +system.config.i18n.script.description = O script que deve ser usado. +system.config.i18n.timezone.label = Fuso Horário +system.config.i18n.timezone.description = Um fuso horário pode ser definido a partir da interface de usuário. O fuso horário do sistema é o padrão. +system.config.i18n.variant.label = Variante +system.config.i18n.variant.description = Uma variação do Local. Qualquer valor arbitrário usado para indicar uma variação de um Local. service.system.i18n.label = Configurações Regionais diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_ro.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_ro.properties index 54fcef20f3d..c64755e48fa 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_ro.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_ro.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Limbă system.config.i18n.language.description = Limba implicită care trebuie utilizată. Dacă nu este specificată, se utilizează setarea implicită a sistemului. -system.config.i18n.script.label = Script -system.config.i18n.script.description = Scriptul care ar trebui utilizat. -system.config.i18n.region.label = Țara / Regiunea -system.config.i18n.region.description = Regiunea care ar trebui utilizată. -system.config.i18n.variant.label = Variantă -system.config.i18n.variant.description = O variație a Localului. Orice valoare arbitrară folosită pentru a indica o variație a unui local. -system.config.i18n.timezone.label = Fus Orar -system.config.i18n.timezone.description = Fusul orar poate fi setat din interfața utilizatorului. Fusul orar de bază este cel implicit. system.config.i18n.location.label = Locatie system.config.i18n.location.description = Locația acestei instalări.
Coordonează ca <latitude>,<longitude>[<altitude>]
Exemplu\: "52.5200066,13.4049540" (Berlin) system.config.i18n.measurementSystem.label = Sistem de măsurare system.config.i18n.measurementSystem.description = Sistemul de măsurare este utilizat pentru conversia unităților. system.config.i18n.measurementSystem.option.SI = Metric system.config.i18n.measurementSystem.option.US = Imperial (SUA) +system.config.i18n.region.label = Țara / Regiunea +system.config.i18n.region.description = Regiunea care ar trebui utilizată. +system.config.i18n.script.label = Script +system.config.i18n.script.description = Scriptul care ar trebui utilizat. +system.config.i18n.timezone.label = Fus Orar +system.config.i18n.timezone.description = Fusul orar poate fi setat din interfața utilizatorului. Fusul orar de bază este cel implicit. +system.config.i18n.variant.label = Variantă +system.config.i18n.variant.description = O variație a Localului. Orice valoare arbitrară folosită pentru a indica o variație a unui local. service.system.i18n.label = Setări regionale diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_ru.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_ru.properties index f7410af7424..6d8caa59eee 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_ru.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_ru.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Язык system.config.i18n.language.description = Язык по умолчанию. Если не указано, используется системная локаль по умолчанию. -system.config.i18n.script.label = Сценарий -system.config.i18n.script.description = Скрипт, который следует использовать. -system.config.i18n.region.label = Страна / Регион -system.config.i18n.region.description = Регион, который следует использовать. -system.config.i18n.variant.label = Вариант -system.config.i18n.variant.description = Вариация локали. Любое произвольное значение, используемое для обозначения вариации локали. -system.config.i18n.timezone.label = Часовой пояс -system.config.i18n.timezone.description = Часовой пояс может быть установлен из пользовательского интерфейса. По умолчанию используется системный часовой пояс. system.config.i18n.location.label = Местоположение system.config.i18n.location.description = Расположение этой установки.
Координаты как <latitude>,<longitude>[<altitude>]
Пример\: "52.5200066,13.4049540" (Берлин) system.config.i18n.measurementSystem.label = Система измерения system.config.i18n.measurementSystem.description = Система измерения используется для конвертации единиц измерения. system.config.i18n.measurementSystem.option.SI = Метрическая system.config.i18n.measurementSystem.option.US = Имперская (США) +system.config.i18n.region.label = Страна / Регион +system.config.i18n.region.description = Регион, который следует использовать. +system.config.i18n.script.label = Сценарий +system.config.i18n.script.description = Скрипт, который следует использовать. +system.config.i18n.timezone.label = Часовой пояс +system.config.i18n.timezone.description = Часовой пояс может быть установлен из пользовательского интерфейса. По умолчанию используется системный часовой пояс. +system.config.i18n.variant.label = Вариант +system.config.i18n.variant.description = Вариация локали. Любое произвольное значение, используемое для обозначения вариации локали. service.system.i18n.label = Региональные настройки diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_sl.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_sl.properties index bc9807eecd9..475dc2862cd 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_sl.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_sl.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Jezik system.config.i18n.language.description = Privzeti jezik, ki naj se uproablja. Če ni določen, bo uporabljen sistemski krajevni izbor. -system.config.i18n.script.label = Pisava -system.config.i18n.script.description = Pisava, ki naj se uporablja. -system.config.i18n.region.label = Država / regija -system.config.i18n.region.description = Regija, ki naj se uporablja. -system.config.i18n.variant.label = Različica -system.config.i18n.variant.description = Različica krajevnih nastavitev. Poljubna vrednost, ki označuje variacijo krajevnih nastavitev. -system.config.i18n.timezone.label = Časovni pas -system.config.i18n.timezone.description = Časovni pas je mogoče določiti v uporabniškem vmesniku. Privzet je sistemski časovni pas. system.config.i18n.location.label = Lokacija system.config.i18n.location.description = Lokacija te namestiteve.
Koordinate v obliki <latitude><longitude><altitude>
Primer\: "52.5200066,13.4049540" (Berlin) system.config.i18n.measurementSystem.label = Merilni sistem system.config.i18n.measurementSystem.description = Merski sistem, ki je uporabljen za pretvarjenje enot. system.config.i18n.measurementSystem.option.SI = metrični system.config.i18n.measurementSystem.option.US = imperialni (ZDA) +system.config.i18n.region.label = Država / regija +system.config.i18n.region.description = Regija, ki naj se uporablja. +system.config.i18n.script.label = Pisava +system.config.i18n.script.description = Pisava, ki naj se uporablja. +system.config.i18n.timezone.label = Časovni pas +system.config.i18n.timezone.description = Časovni pas je mogoče določiti v uporabniškem vmesniku. Privzet je sistemski časovni pas. +system.config.i18n.variant.label = Različica +system.config.i18n.variant.description = Različica krajevnih nastavitev. Poljubna vrednost, ki označuje variacijo krajevnih nastavitev. service.system.i18n.label = Regionalne nastavitve diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_sv.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_sv.properties index 236e69aac68..c72ec6d68cb 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_sv.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_sv.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Språk system.config.i18n.language.description = Standardspråk som ska användas. Ifall det inte specificeras används systemets standardspråk. -system.config.i18n.script.label = Skript -system.config.i18n.script.description = Skriptet som ska användas. -system.config.i18n.region.label = Land / Region -system.config.i18n.region.description = Den region som ska användas. -system.config.i18n.variant.label = Variant -system.config.i18n.variant.description = En variant av standardspråket. Alla godtyckliga värden indikera en variant av standardspråket. -system.config.i18n.timezone.label = Tidszon -system.config.i18n.timezone.description = En tidszon kan ställas in från användargränssnittet. Den underliggande systemets tidszon är förvalt. system.config.i18n.location.label = Plats system.config.i18n.location.description = Platsen för denna installation.
Koordinater som <latitude>,<longitude>[<altitude>]
Exempel\: "52.5200066,13.4049540" (Berlin) system.config.i18n.measurementSystem.label = Måttsystem system.config.i18n.measurementSystem.description = Måttsystemen som används för omvandling mellan enheter. system.config.i18n.measurementSystem.option.SI = Metrisk system.config.i18n.measurementSystem.option.US = Imperial (US) +system.config.i18n.region.label = Land / Region +system.config.i18n.region.description = Den region som ska användas. +system.config.i18n.script.label = Skript +system.config.i18n.script.description = Skriptet som ska användas. +system.config.i18n.timezone.label = Tidszon +system.config.i18n.timezone.description = En tidszon kan ställas in från användargränssnittet. Den underliggande systemets tidszon är förvalt. +system.config.i18n.variant.label = Variant +system.config.i18n.variant.description = En variant av standardspråket. Alla godtyckliga värden indikera en variant av standardspråket. service.system.i18n.label = Regionala inställningar diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_uk.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_uk.properties index 3ba2b066597..c17b36aa32e 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_uk.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_uk.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = Мова system.config.i18n.language.description = Мова за замовчуванням. Якщо ніякої не вказано, буде використана мова системи за замовчуванням. -system.config.i18n.script.label = Письмо -system.config.i18n.script.description = Письмо, яке слід використовувати. -system.config.i18n.region.label = Країна / Регіон -system.config.i18n.region.description = Регіон, який слід використовувати. -system.config.i18n.variant.label = Варіант -system.config.i18n.variant.description = Варіація мови. Будь-яке значення, що використовується для позначення діалекту. -system.config.i18n.timezone.label = Часовий пояс -system.config.i18n.timezone.description = Часовий пояс може бути встановлений з інтерфейсу користувача. За замовчуванням використовується основний часовий пояс системи. system.config.i18n.location.label = Місцезнаходження system.config.i18n.location.description = Розташування цієї установки.
Координати як <широта>,<довгота>[<висота>]
Наприклад\: "52.5200066,13.4049540" (Берлін) system.config.i18n.measurementSystem.label = Система вимірювання system.config.i18n.measurementSystem.description = Система вимірювання використовується для перетворення одиниць вимірювання. system.config.i18n.measurementSystem.option.SI = Метрична system.config.i18n.measurementSystem.option.US = Імперська (США) +system.config.i18n.region.label = Країна / Регіон +system.config.i18n.region.description = Регіон, який слід використовувати. +system.config.i18n.script.label = Письмо +system.config.i18n.script.description = Письмо, яке слід використовувати. +system.config.i18n.timezone.label = Часовий пояс +system.config.i18n.timezone.description = Часовий пояс може бути встановлений з інтерфейсу користувача. За замовчуванням використовується основний часовий пояс системи. +system.config.i18n.variant.label = Варіант +system.config.i18n.variant.description = Варіація мови. Будь-яке значення, що використовується для позначення діалекту. service.system.i18n.label = Регіональні Стандарти diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_zh.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_zh.properties index ff7b0d65356..ed1121530f0 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_zh.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/i18n_zh.properties @@ -1,18 +1,18 @@ system.config.i18n.language.label = 语言 system.config.i18n.language.description = 默认语言已被使用。如果未指定，则使用系统默认区域设置。 -system.config.i18n.script.label = 脚本 -system.config.i18n.script.description = 应被使用的脚本。 -system.config.i18n.region.label = 国家/地区 -system.config.i18n.region.description = 应被使用的区域。 -system.config.i18n.variant.label = 变量 -system.config.i18n.variant.description = 本地化的变量。用来表示本地化变量的任意值。 -system.config.i18n.timezone.label = 时区 -system.config.i18n.timezone.description = 可以从用户界面设置时区。默认时区为系统时区。 system.config.i18n.location.label = 地址 system.config.i18n.location.description = 系统安装所在地的位置。
坐标为 <latitude>,<longitude>[<altitude>]
示例： "52.5200066, 13.4049540" (德国柏林) system.config.i18n.measurementSystem.label = 度量衡系统 system.config.i18n.measurementSystem.description = 度量衡系统用于单位转换。 system.config.i18n.measurementSystem.option.SI = 公制 system.config.i18n.measurementSystem.option.US = 美制 (US) +system.config.i18n.region.label = 国家/地区 +system.config.i18n.region.description = 应被使用的区域。 +system.config.i18n.script.label = 脚本 +system.config.i18n.script.description = 应被使用的脚本。 +system.config.i18n.timezone.label = 时区 +system.config.i18n.timezone.description = 可以从用户界面设置时区。默认时区为系统时区。 +system.config.i18n.variant.label = 变量 +system.config.i18n.variant.description = 本地化的变量。用来表示本地化变量的任意值。 service.system.i18n.label = 区域设置 diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_cs.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_cs.properties index d180c1cc376..51a1dc166da 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_cs.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_cs.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Primární adresa -system.config.network.primaryAddress.description = Subnet (e.g. 192.168.1.0/24). system.config.network.broadcastAddress.label = Broadcast adresa system.config.network.broadcastAddress.description = Broadcast adresa (např. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Jedna IP adresa na jedno rozhraní -system.config.network.useOnlyOneAddress.description = Použít pouze jednu IP adresu na jedno rozhraní a rodinu. +system.config.network.primaryAddress.label = Primární adresa +system.config.network.primaryAddress.description = Subnet (e.g. 192.168.1.0/24). system.config.network.useIPv6.label = Použít IPv6 system.config.network.useIPv6.description = Použít IPv6 adresy, jsou-li k dispozici. +system.config.network.useOnlyOneAddress.label = Jedna IP adresa na jedno rozhraní +system.config.network.useOnlyOneAddress.description = Použít pouze jednu IP adresu na jedno rozhraní a rodinu. service.system.network.label = Nastavení sítě diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_da.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_da.properties index fb92fab0f2f..e5fb82aeec6 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_da.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_da.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Primær adresse -system.config.network.primaryAddress.description = Et subnet (fx 192.168.1.0/24). system.config.network.broadcastAddress.label = Broadcast- adresse system.config.network.broadcastAddress.description = En broadcast-adresse (fx 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Enkelt IP-adresse pr. interface -system.config.network.useOnlyOneAddress.description = Brug kun én IP-adresse pr. interface og familie. +system.config.network.primaryAddress.label = Primær adresse +system.config.network.primaryAddress.description = Et subnet (fx 192.168.1.0/24). system.config.network.useIPv6.label = Brug IPv6 system.config.network.useIPv6.description = Brug IPv6-adresser hvis tilgængelige. +system.config.network.useOnlyOneAddress.label = Enkelt IP-adresse pr. interface +system.config.network.useOnlyOneAddress.description = Brug kun én IP-adresse pr. interface og familie. service.system.network.label = Netværksindstillinger diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_de.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_de.properties index 480a1ea9c61..4b8c08692a4 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_de.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_de.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Primäre IP-Adresse -system.config.network.primaryAddress.description = Eine Primäre IP-Adresse (z.B. 192.168.1.255). system.config.network.broadcastAddress.label = Broadcast-IP-Adresse system.config.network.broadcastAddress.description = Eine Broadcast-IP-Adresse (z.B. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Einzelne IP-Adresse pro Interface -system.config.network.useOnlyOneAddress.description = Nur eine einzelne IP-Adresse pro Interface verwenden. +system.config.network.primaryAddress.label = Primäre IP-Adresse +system.config.network.primaryAddress.description = Eine Primäre IP-Adresse (z.B. 192.168.1.255). system.config.network.useIPv6.label = IPv6 verwenden system.config.network.useIPv6.description = Verwenden Sie IPv6 IP-Adressen, falls verfügbar. +system.config.network.useOnlyOneAddress.label = Einzelne IP-Adresse pro Interface +system.config.network.useOnlyOneAddress.description = Nur eine einzelne IP-Adresse pro Interface verwenden. service.system.network.label = Netzwerk diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_el.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_el.properties index 557b24a442a..37904241021 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_el.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_el.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Κύρια Διεύθυνση -system.config.network.primaryAddress.description = Ένα υποδίκτυο (πχ. 192.168.1.0/24). system.config.network.broadcastAddress.label = Διεύθυνση Εκπομπής system.config.network.broadcastAddress.description = Διεύθυνση εκπομπής (π.χ. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Ξεχωριστή διεύθυνση IP ανά Διεπαφή -system.config.network.useOnlyOneAddress.description = Χρήση μόνο μίας διεύθυνσης IP ανά διεπαφή και οικογένεια. +system.config.network.primaryAddress.label = Κύρια Διεύθυνση +system.config.network.primaryAddress.description = Ένα υποδίκτυο (πχ. 192.168.1.0/24). system.config.network.useIPv6.label = Χρήση IPv6 system.config.network.useIPv6.description = Χρήση διευθύνσεων IPv6 εάν είναι διαθέσιμες. +system.config.network.useOnlyOneAddress.label = Ξεχωριστή διεύθυνση IP ανά Διεπαφή +system.config.network.useOnlyOneAddress.description = Χρήση μόνο μίας διεύθυνσης IP ανά διεπαφή και οικογένεια. service.system.network.label = Ρυθμίσεις Δικτύου diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_es.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_es.properties index d1661727785..6052b8756c3 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_es.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_es.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Dirección principal -system.config.network.primaryAddress.description = Una subnet (por ej. 192.168.1.0/24). system.config.network.broadcastAddress.label = Dirección de difusión system.config.network.broadcastAddress.description = Una dirección de difusión (por ejemplo, 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Dirección IP única por interfaz -system.config.network.useOnlyOneAddress.description = Utilice sólo una dirección IP por interfaz y familia. +system.config.network.primaryAddress.label = Dirección principal +system.config.network.primaryAddress.description = Una subnet (por ej. 192.168.1.0/24). system.config.network.useIPv6.label = Usar IPv6 system.config.network.useIPv6.description = Usar direcciones IPv6 si está disponible. +system.config.network.useOnlyOneAddress.label = Dirección IP única por interfaz +system.config.network.useOnlyOneAddress.description = Utilice sólo una dirección IP por interfaz y familia. service.system.network.label = Configuración de red diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_fi.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_fi.properties index 9da75238231..236352b0c70 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_fi.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_fi.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Ensisijainen osoite -system.config.network.primaryAddress.description = Aliverkko (esim. 192.168.1.0/24). system.config.network.broadcastAddress.label = Lähetysosoite system.config.network.broadcastAddress.description = Lähetysosoite (esim. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Yksi IP-osoite rajapintaa kohti -system.config.network.useOnlyOneAddress.description = Käytä ainoastaan yhtä IP-osoitetta liittymää ja perhettä kohden. +system.config.network.primaryAddress.label = Ensisijainen osoite +system.config.network.primaryAddress.description = Aliverkko (esim. 192.168.1.0/24). system.config.network.useIPv6.label = Käytä IPv6\:ta system.config.network.useIPv6.description = Käytä IPv6-osoitteita, jos saatavilla. +system.config.network.useOnlyOneAddress.label = Yksi IP-osoite rajapintaa kohti +system.config.network.useOnlyOneAddress.description = Käytä ainoastaan yhtä IP-osoitetta liittymää ja perhettä kohden. service.system.network.label = Verkkoasetukset diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_fr.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_fr.properties index ae1e617eab9..636327b3f10 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_fr.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_fr.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Adresse principale -system.config.network.primaryAddress.description = Un sous-réseau (ex. 192.168.1.0/24). system.config.network.broadcastAddress.label = Adresse de Broadcast system.config.network.broadcastAddress.description = Une adresse de broadcast (ex. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Adresse IP unique par interface -system.config.network.useOnlyOneAddress.description = Utilisez une seule adresse IP par interface et famille. +system.config.network.primaryAddress.label = Adresse principale +system.config.network.primaryAddress.description = Un sous-réseau (ex. 192.168.1.0/24). system.config.network.useIPv6.label = Utiliser IPv6 system.config.network.useIPv6.description = Utiliser les adresses IPv6 si disponible. +system.config.network.useOnlyOneAddress.label = Adresse IP unique par interface +system.config.network.useOnlyOneAddress.description = Utilisez une seule adresse IP par interface et famille. service.system.network.label = Paramètres réseau diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_he.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_he.properties index f342b920373..89becf13364 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_he.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_he.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = כתובת עיקרית -system.config.network.primaryAddress.description = רשת משנה (למשל 192.168.1.0/24). system.config.network.broadcastAddress.label = כתובת שידור system.config.network.broadcastAddress.description = כתובת שידור (למשל 192.168.1.255). -system.config.network.useOnlyOneAddress.label = כתובת IP אחת לכל ממשק -system.config.network.useOnlyOneAddress.description = השתמש בכתובת IP אחת בלבד בכל ממשק ומשפחה. +system.config.network.primaryAddress.label = כתובת עיקרית +system.config.network.primaryAddress.description = רשת משנה (למשל 192.168.1.0/24). system.config.network.useIPv6.label = השתמש ב- IPv6 system.config.network.useIPv6.description = השתמש בכתובות IPv6 אם הן זמינות. +system.config.network.useOnlyOneAddress.label = כתובת IP אחת לכל ממשק +system.config.network.useOnlyOneAddress.description = השתמש בכתובת IP אחת בלבד בכל ממשק ומשפחה. service.system.network.label = הגדרות רשת diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_hu.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_hu.properties index 4619e0fb3a1..a2274ee72a7 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_hu.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_hu.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Elsődleges cím -system.config.network.primaryAddress.description = A alhálózat(e.g. 192.168.1.0/24). system.config.network.broadcastAddress.label = Broadcast cím system.config.network.broadcastAddress.description = Broadcast cím (e.g. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Egy IP cím eszközönként -system.config.network.useOnlyOneAddress.description = Csak egy IP cím használata eszközönként. +system.config.network.primaryAddress.label = Elsődleges cím +system.config.network.primaryAddress.description = A alhálózat(e.g. 192.168.1.0/24). system.config.network.useIPv6.label = IPv6 használata system.config.network.useIPv6.description = IPv6 használata, ha elérhető. +system.config.network.useOnlyOneAddress.label = Egy IP cím eszközönként +system.config.network.useOnlyOneAddress.description = Csak egy IP cím használata eszközönként. service.system.network.label = Hálózati beállítások diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_it.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_it.properties index 502631dd3f2..2f4a2d952ca 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_it.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_it.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Indirizzo Principale -system.config.network.primaryAddress.description = Una subnet (es. 192.168.1.0/24). system.config.network.broadcastAddress.label = Indirizzo Broadcast system.config.network.broadcastAddress.description = Un indirizzo di broadcast (ad es. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Indirizzo IP singolo per interfaccia -system.config.network.useOnlyOneAddress.description = Usa solo un indirizzo IP per interfaccia e famiglia. +system.config.network.primaryAddress.label = Indirizzo Principale +system.config.network.primaryAddress.description = Una subnet (es. 192.168.1.0/24). system.config.network.useIPv6.label = Usa IPv6 system.config.network.useIPv6.description = Usa gli indirizzi IPv6 se disponibili. +system.config.network.useOnlyOneAddress.label = Indirizzo IP singolo per interfaccia +system.config.network.useOnlyOneAddress.description = Usa solo un indirizzo IP per interfaccia e famiglia. service.system.network.label = Impostazioni di Rete diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_nl.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_nl.properties index f542a3e344c..2bddcc2688c 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_nl.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_nl.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Primair Adres -system.config.network.primaryAddress.description = Een subnet (bijv. 192.168.1.0/24). system.config.network.broadcastAddress.label = Broadcast Adres system.config.network.broadcastAddress.description = Een broadcast adres (bijv. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Één IP-adres per Interface -system.config.network.useOnlyOneAddress.description = Gebruik slechts één IP-adres per interface en familie. +system.config.network.primaryAddress.label = Primair Adres +system.config.network.primaryAddress.description = Een subnet (bijv. 192.168.1.0/24). system.config.network.useIPv6.label = Gebruik IPv6 system.config.network.useIPv6.description = Gebruik IPv6 adressen indien beschikbaar. +system.config.network.useOnlyOneAddress.label = Één IP-adres per Interface +system.config.network.useOnlyOneAddress.description = Gebruik slechts één IP-adres per interface en familie. service.system.network.label = Netwerkinstellingen diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_no.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_no.properties index 8b867fbaa1b..770afe30f75 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_no.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_no.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Primæradresse -system.config.network.primaryAddress.description = Et subnet (f.eks. 192.168.1.0/24). system.config.network.broadcastAddress.label = Kringkastingsadresse system.config.network.broadcastAddress.description = En kringkastingsadresse (f.eks 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Kun en IP adresse per grensesnitt -system.config.network.useOnlyOneAddress.description = Bruk kun én IP adresse per grensesnitt og familie. +system.config.network.primaryAddress.label = Primæradresse +system.config.network.primaryAddress.description = Et subnet (f.eks. 192.168.1.0/24). system.config.network.useIPv6.label = Bruk IPv6 system.config.network.useIPv6.description = Bruk IPv6 adresser hvis tilgjengelig. +system.config.network.useOnlyOneAddress.label = Kun en IP adresse per grensesnitt +system.config.network.useOnlyOneAddress.description = Bruk kun én IP adresse per grensesnitt og familie. service.system.network.label = Nettverksinnstillinger diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_pl.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_pl.properties index 1d0dcbcca26..183c59933a0 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_pl.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_pl.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Adres główny -system.config.network.primaryAddress.description = Podsieć (np. 192.168.1.0/24). system.config.network.broadcastAddress.label = Adres broadcast system.config.network.broadcastAddress.description = Adres broadcast (np. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Pojedynczy adres IP na interfejs -system.config.network.useOnlyOneAddress.description = Użyj tylko jednego adresu IP na interfejs i rodzinę. +system.config.network.primaryAddress.label = Adres główny +system.config.network.primaryAddress.description = Podsieć (np. 192.168.1.0/24). system.config.network.useIPv6.label = Użyj IPv6 system.config.network.useIPv6.description = Użyj adresów IPv6, jeśli są dostępne. +system.config.network.useOnlyOneAddress.label = Pojedynczy adres IP na interfejs +system.config.network.useOnlyOneAddress.description = Użyj tylko jednego adresu IP na interfejs i rodzinę. service.system.network.label = Ustawienia sieci diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_pt.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_pt.properties index f9ca9574fe7..3e78452d0ee 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_pt.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_pt.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Endereço principal -system.config.network.primaryAddress.description = Sub rede (ex\: 192.168.1.0/24). system.config.network.broadcastAddress.label = Endereço de Broadcast system.config.network.broadcastAddress.description = Um endereço de broadcast (ex\: 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Endereço IP único por Interface -system.config.network.useOnlyOneAddress.description = Use apenas um endereço IP por interface. +system.config.network.primaryAddress.label = Endereço principal +system.config.network.primaryAddress.description = Sub rede (ex\: 192.168.1.0/24). system.config.network.useIPv6.label = Usar IPv6 system.config.network.useIPv6.description = Use endereços IPv6, se disponível. +system.config.network.useOnlyOneAddress.label = Endereço IP único por Interface +system.config.network.useOnlyOneAddress.description = Use apenas um endereço IP por interface. service.system.network.label = Configurações de rede diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_ro.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_ro.properties index 4eff329d268..44a2e466db8 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_ro.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_ro.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Adresa Principala -system.config.network.primaryAddress.description = Un subnet (e.g. 192.168.1.0/24). system.config.network.broadcastAddress.label = Adresă difuzare system.config.network.broadcastAddress.description = O adresă de difuzare (ex. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Adresă IP unică per interfață -system.config.network.useOnlyOneAddress.description = Utilizați o singură adresă IP pentru fiecare interfață și familie. +system.config.network.primaryAddress.label = Adresa Principala +system.config.network.primaryAddress.description = Un subnet (e.g. 192.168.1.0/24). system.config.network.useIPv6.label = Utilizare IPv6 system.config.network.useIPv6.description = Utilizaţi adrese IPv6 dacă sunt disponibile. +system.config.network.useOnlyOneAddress.label = Adresă IP unică per interfață +system.config.network.useOnlyOneAddress.description = Utilizați o singură adresă IP pentru fiecare interfață și familie. service.system.network.label = Setări rețea diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_ru.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_ru.properties index 2a5a46bbcb3..aa4d6525f53 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_ru.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_ru.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Основной адрес -system.config.network.primaryAddress.description = Подсеть (например, 192.168.1.0/24). system.config.network.broadcastAddress.label = Широковещательный адрес system.config.network.broadcastAddress.description = Широковещательный адрес (например, 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Один IP-адрес для каждого интерфейса -system.config.network.useOnlyOneAddress.description = Использовать только один IP-адрес для каждого интерфейса и семьи. +system.config.network.primaryAddress.label = Основной адрес +system.config.network.primaryAddress.description = Подсеть (например, 192.168.1.0/24). system.config.network.useIPv6.label = Использовать IPv6 system.config.network.useIPv6.description = Использовать IPv6 адреса, если доступны. +system.config.network.useOnlyOneAddress.label = Один IP-адрес для каждого интерфейса +system.config.network.useOnlyOneAddress.description = Использовать только один IP-адрес для каждого интерфейса и семьи. service.system.network.label = Настройки сети diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_sl.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_sl.properties index 956f6349f89..9e9022c9c7f 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_sl.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_sl.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Glavni naslov -system.config.network.primaryAddress.description = Pod-omrežje (npr. 192.168.1.0/24). system.config.network.broadcastAddress.label = Naslov oddajanja system.config.network.broadcastAddress.description = Naslov za oddjanje (npr. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = En IP naslov na vmesnik -system.config.network.useOnlyOneAddress.description = Uporabi le en IP naslov na vmesnik in družino. +system.config.network.primaryAddress.label = Glavni naslov +system.config.network.primaryAddress.description = Pod-omrežje (npr. 192.168.1.0/24). system.config.network.useIPv6.label = Uporabi IPv6 system.config.network.useIPv6.description = Uporabi IPv6, če je na voljo. +system.config.network.useOnlyOneAddress.label = En IP naslov na vmesnik +system.config.network.useOnlyOneAddress.description = Uporabi le en IP naslov na vmesnik in družino. service.system.network.label = Omrežne nastavitve diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_sv.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_sv.properties index 99d3d3a6d33..cb3d5e72ae2 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_sv.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_sv.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Primär adress -system.config.network.primaryAddress.description = Ett subnät (tex. 192.168.1.0/24). system.config.network.broadcastAddress.label = Broadcast adress system.config.network.broadcastAddress.description = En broadcast adress (tex. 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Enskild IP adress per gränssnitt -system.config.network.useOnlyOneAddress.description = Använd enbart en IP-adress per gränsnitt och sort. +system.config.network.primaryAddress.label = Primär adress +system.config.network.primaryAddress.description = Ett subnät (tex. 192.168.1.0/24). system.config.network.useIPv6.label = Använd IPv6 system.config.network.useIPv6.description = Använd IPv6-adresser ifall det är tillgängligt. +system.config.network.useOnlyOneAddress.label = Enskild IP adress per gränssnitt +system.config.network.useOnlyOneAddress.description = Använd enbart en IP-adress per gränsnitt och sort. service.system.network.label = Nätverksinställningar diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_uk.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_uk.properties index 9c7cc82af66..756d2ef2020 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_uk.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_uk.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = Основна адреса -system.config.network.primaryAddress.description = Підмережа (наприклад, 192.168.1.0/24). system.config.network.broadcastAddress.label = Адреса трансляції system.config.network.broadcastAddress.description = Адреса трансляції (наприклад, 192.168.1.255). -system.config.network.useOnlyOneAddress.label = Одна IP-адреса на інтерфейс -system.config.network.useOnlyOneAddress.description = Використовувати лише одну IP-адресу на інтерфейс. +system.config.network.primaryAddress.label = Основна адреса +system.config.network.primaryAddress.description = Підмережа (наприклад, 192.168.1.0/24). system.config.network.useIPv6.label = Використовувати IPv6 system.config.network.useIPv6.description = Використовувати IPv6 адреси, якщо це можливо. +system.config.network.useOnlyOneAddress.label = Одна IP-адреса на інтерфейс +system.config.network.useOnlyOneAddress.description = Використовувати лише одну IP-адресу на інтерфейс. service.system.network.label = Налаштування мережі diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_zh.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_zh.properties index 4e4ef99f9c4..06d5ad8ace1 100644 --- a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_zh.properties +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/network_zh.properties @@ -1,10 +1,10 @@ -system.config.network.primaryAddress.label = 主要地址 -system.config.network.primaryAddress.description = 网段 (e.g. 192.168.1.0/24). system.config.network.broadcastAddress.label = 广播地址 system.config.network.broadcastAddress.description = 广播地址(如192.168.1.255)。 -system.config.network.useOnlyOneAddress.label = 每个接口的IP地址 -system.config.network.useOnlyOneAddress.description = 每个接口和家庭只使用一个IP地址。 +system.config.network.primaryAddress.label = 主要地址 +system.config.network.primaryAddress.description = 网段 (e.g. 192.168.1.0/24). system.config.network.useIPv6.label = 使用 IPv6 system.config.network.useIPv6.description = 请使用有效的IPv6地址。 +system.config.network.useOnlyOneAddress.label = 每个接口的IP地址 +system.config.network.useOnlyOneAddress.description = 每个接口和家庭只使用一个IP地址。 service.system.network.label = 网络设置 diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_da.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_da.properties new file mode 100644 index 00000000000..84de924e8b2 --- /dev/null +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_da.properties @@ -0,0 +1,6 @@ +system.config.units.currencyProvider.label = Valutaudbyder +system.config.units.currencyProvider.description = Den service, der bruges til at levere en række valutaer og deres valutakurser. +system.config.units.fixedBaseCurrency.label = Fast basisvaluta +system.config.units.fixedBaseCurrency.description = Basisvalutaen for dette system, når udbyderen af fast valuta anvendes. + +service.system.units.label = Enhedsindstillinger diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_hu.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_hu.properties new file mode 100644 index 00000000000..5641d7810ba --- /dev/null +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_hu.properties @@ -0,0 +1,6 @@ +system.config.units.currencyProvider.label = Valuta szolgáltató +system.config.units.currencyProvider.description = A valuták típusait és váltási értékeit visszaadó szolgáltatás. +system.config.units.fixedBaseCurrency.label = Fix alapú valuta +system.config.units.fixedBaseCurrency.description = A rendszer alapértelmezett valutája, amikor a fix alapú szolgáltatást használja. + +service.system.units.label = Egység beállítása diff --git a/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_it.properties b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_it.properties new file mode 100644 index 00000000000..4e4f4dc0da1 --- /dev/null +++ b/bundles/org.openhab.core/src/main/resources/OH-INF/i18n/units_it.properties @@ -0,0 +1,6 @@ +system.config.units.currencyProvider.label = Provider Di Valute +system.config.units.currencyProvider.description = Il servizio utilizzato per fornire una serie di valute e i loro tassi di cambio. +system.config.units.fixedBaseCurrency.label = Valuta Base Fissa +system.config.units.fixedBaseCurrency.description = La valuta di base di questo sistema quando viene utilizzato il fornitore di valuta fissa. + +service.system.units.label = Impostazioni Unità From 074fcdd7eacc0b5f068881c8b1624c93f6ad4b3b Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Fri, 22 Dec 2023 08:49:36 +0100 Subject: [PATCH 4/5] Delay the IP scan to make sure that no further candidates are added (#3951) * Delay the IP scan to make sure that no further candidates are added and do not use a dedicated thread pool Signed-off-by: Kai Kreuzer --- .../discovery/addon/ip/IpAddonFinder.java | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/bundles/org.openhab.core.config.discovery.addon.ip/src/main/java/org/openhab/core/config/discovery/addon/ip/IpAddonFinder.java b/bundles/org.openhab.core.config.discovery.addon.ip/src/main/java/org/openhab/core/config/discovery/addon/ip/IpAddonFinder.java index 5864b19fc83..6cab05b427c 100644 --- a/bundles/org.openhab.core.config.discovery.addon.ip/src/main/java/org/openhab/core/config/discovery/addon/ip/IpAddonFinder.java +++ b/bundles/org.openhab.core.config.discovery.addon.ip/src/main/java/org/openhab/core/config/discovery/addon/ip/IpAddonFinder.java @@ -12,8 +12,7 @@ */ package org.openhab.core.config.discovery.addon.ip; -import static org.openhab.core.config.discovery.addon.AddonFinderConstants.SERVICE_NAME_IP; -import static org.openhab.core.config.discovery.addon.AddonFinderConstants.SERVICE_TYPE_IP; +import static org.openhab.core.config.discovery.addon.AddonFinderConstants.*; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -58,7 +57,7 @@ /** * This is a {@link IpAddonFinder} for finding suggested add-ons by sending IP packets to the * network and collecting responses. - * + * * @implNote On activation, a thread is spawned which handles the detection. Scan runs once, * no continuous background scanning. * @@ -81,7 +80,8 @@ public class IpAddonFinder extends BaseAddonFinder { private static final String PARAMETER_TIMEOUT_MS = "timeoutMs"; private final Logger logger = LoggerFactory.getLogger(IpAddonFinder.class); - private final ScheduledExecutorService scheduler = ThreadPoolManager.getScheduledPool(SERVICE_NAME); + private final ScheduledExecutorService scheduler = ThreadPoolManager + .getScheduledPool(ThreadPoolManager.THREAD_POOL_NAME_COMMON); private @Nullable Future scanJob = null; Set suggestions = new HashSet<>(); @@ -96,34 +96,34 @@ public void deactivate() { stopScan(); } + @Override public void setAddonCandidates(List candidates) { logger.debug("IpAddonFinder::setAddonCandidates({})", candidates.size()); super.setAddonCandidates(candidates); startScan(); } - synchronized void startScan() { - if (scanJob == null) { - scanJob = scheduler.schedule(this::scan, 1, TimeUnit.SECONDS); - } + private void startScan() { + // The setAddonCandidates() method is called for each info provider. + // In order to do the scan only once, but on the full set of candidates, we have to delay the execution. + // At the same time we must make sure that a scheduled scan is rescheduled - or (after more than our delay) is + // executed once more. + stopScan(); + scanJob = scheduler.schedule(this::scan, 20, TimeUnit.SECONDS); } - void stopScan() { + private void stopScan() { Future tmpScanJob = scanJob; if (tmpScanJob != null) { if (!tmpScanJob.isDone()) { logger.trace("Trying to cancel IP scan"); tmpScanJob.cancel(true); - try { - Thread.sleep(1000); - } catch (InterruptedException ignore) { - } } scanJob = null; } } - void scan() { + private void scan() { logger.trace("IpAddonFinder::scan started"); for (AddonInfo candidate : addonCandidates) { for (AddonDiscoveryMethod method : candidate.getDiscoveryMethods().stream() @@ -136,7 +136,7 @@ void scan() { Map matchProperties = method.getMatchProperties().stream() .collect(Collectors.toMap(property -> property.getName(), property -> property.getRegex())); - // parse standard set op parameters: + // parse standard set of parameters String type = Objects.toString(parameters.get("type"), ""); String request = Objects.toString(parameters.get(PARAMETER_REQUEST), ""); String response = Objects.toString(matchProperties.get(MATCH_PROPERTY_RESPONSE), ""); @@ -165,9 +165,7 @@ void scan() { continue; } - // // handle known types - // try { switch (Objects.toString(type)) { case TYPE_IP_MULTICAST: @@ -234,7 +232,8 @@ void scan() { logger.trace("IpAddonFinder::scan completed"); } - byte[] buildRequestArray(DatagramChannel channel, String request) throws java.io.IOException, ParseException { + private byte[] buildRequestArray(DatagramChannel channel, String request) + throws java.io.IOException, ParseException { InetSocketAddress sock = (InetSocketAddress) channel.getLocalAddress(); ByteArrayOutputStream requestFrame = new ByteArrayOutputStream(); From 3b279587b11d714437d01a5bf5b84bee5bd4ee23 Mon Sep 17 00:00:00 2001 From: openhab-bot Date: Fri, 22 Dec 2023 11:48:43 +0000 Subject: [PATCH 5/5] [unleash-maven-plugin] Preparation for next development cycle. --- bom/compile-model/pom.xml | 6 ++---- bom/compile/pom.xml | 6 ++---- bom/openhab-core-index/pom.xml | 6 ++---- bom/openhab-core/pom.xml | 6 ++---- bom/pom.xml | 6 ++---- bom/runtime-index/pom.xml | 6 ++---- bom/runtime/pom.xml | 6 ++---- bom/test-index/pom.xml | 6 ++---- bom/test/pom.xml | 6 ++---- bundles/org.openhab.core.addon.eclipse/pom.xml | 6 ++---- bundles/org.openhab.core.addon.marketplace.karaf/pom.xml | 6 ++---- bundles/org.openhab.core.addon.marketplace/pom.xml | 6 ++---- bundles/org.openhab.core.addon/pom.xml | 6 ++---- bundles/org.openhab.core.audio/pom.xml | 6 ++---- bundles/org.openhab.core.auth.jaas/pom.xml | 6 ++---- bundles/org.openhab.core.auth.oauth2client/pom.xml | 6 ++---- bundles/org.openhab.core.automation.module.media/pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../org.openhab.core.automation.module.script/pom.xml | 6 ++---- bundles/org.openhab.core.automation.rest/pom.xml | 6 ++---- bundles/org.openhab.core.automation/pom.xml | 6 ++---- bundles/org.openhab.core.config.core/pom.xml | 6 ++---- .../org.openhab.core.config.discovery.addon.ip/pom.xml | 6 ++---- .../org.openhab.core.config.discovery.addon.mdns/pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../org.openhab.core.config.discovery.addon.upnp/pom.xml | 6 ++---- bundles/org.openhab.core.config.discovery.addon/pom.xml | 6 ++---- bundles/org.openhab.core.config.discovery.mdns/pom.xml | 6 ++---- bundles/org.openhab.core.config.discovery.upnp/pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../org.openhab.core.config.discovery.usbserial/pom.xml | 6 ++---- bundles/org.openhab.core.config.discovery/pom.xml | 6 ++---- bundles/org.openhab.core.config.dispatch/pom.xml | 6 ++---- bundles/org.openhab.core.config.serial/pom.xml | 6 ++---- bundles/org.openhab.core.ephemeris/pom.xml | 6 ++---- bundles/org.openhab.core.id/pom.xml | 6 ++---- bundles/org.openhab.core.io.bin2json/pom.xml | 6 ++---- bundles/org.openhab.core.io.console.eclipse/pom.xml | 6 ++---- bundles/org.openhab.core.io.console.karaf/pom.xml | 6 ++---- bundles/org.openhab.core.io.console.rfc147/pom.xml | 6 ++---- bundles/org.openhab.core.io.console/pom.xml | 6 ++---- bundles/org.openhab.core.io.http.auth/pom.xml | 6 ++---- bundles/org.openhab.core.io.http/pom.xml | 6 ++---- bundles/org.openhab.core.io.jetty.certificate/pom.xml | 9 +++------ bundles/org.openhab.core.io.monitor/pom.xml | 6 ++---- bundles/org.openhab.core.io.net/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.audio/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.auth/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.core/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.log/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.mdns/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.sitemap/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.sse/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.swagger/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.transform/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.ui/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest.voice/pom.xml | 6 ++---- bundles/org.openhab.core.io.rest/pom.xml | 6 ++---- bundles/org.openhab.core.io.transport.mdns/pom.xml | 6 ++---- bundles/org.openhab.core.io.transport.modbus/pom.xml | 6 ++---- bundles/org.openhab.core.io.transport.mqtt/pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../org.openhab.core.io.transport.serial.rxtx/pom.xml | 6 ++---- bundles/org.openhab.core.io.transport.serial/pom.xml | 6 ++---- bundles/org.openhab.core.io.transport.upnp/pom.xml | 6 ++---- bundles/org.openhab.core.io.websocket/pom.xml | 6 ++---- bundles/org.openhab.core.karaf/pom.xml | 6 ++---- bundles/org.openhab.core.model.core/pom.xml | 6 ++---- bundles/org.openhab.core.model.item.ide/pom.xml | 6 ++---- bundles/org.openhab.core.model.item.runtime/pom.xml | 6 ++---- bundles/org.openhab.core.model.item/pom.xml | 6 ++---- bundles/org.openhab.core.model.lazygen/pom.xml | 6 ++---- bundles/org.openhab.core.model.lsp/pom.xml | 6 ++---- bundles/org.openhab.core.model.persistence.ide/pom.xml | 6 ++---- .../org.openhab.core.model.persistence.runtime/pom.xml | 6 ++---- bundles/org.openhab.core.model.persistence/pom.xml | 6 ++---- bundles/org.openhab.core.model.rule.ide/pom.xml | 6 ++---- bundles/org.openhab.core.model.rule.runtime/pom.xml | 6 ++---- bundles/org.openhab.core.model.rule/pom.xml | 6 ++---- bundles/org.openhab.core.model.script.ide/pom.xml | 6 ++---- bundles/org.openhab.core.model.script.runtime/pom.xml | 6 ++---- bundles/org.openhab.core.model.script/pom.xml | 6 ++---- bundles/org.openhab.core.model.sitemap.ide/pom.xml | 6 ++---- bundles/org.openhab.core.model.sitemap.runtime/pom.xml | 6 ++---- bundles/org.openhab.core.model.sitemap/pom.xml | 6 ++---- bundles/org.openhab.core.model.thing.ide/pom.xml | 6 ++---- bundles/org.openhab.core.model.thing.runtime/pom.xml | 6 ++---- bundles/org.openhab.core.model.thing/pom.xml | 6 ++---- bundles/org.openhab.core.model.yaml/pom.xml | 6 ++---- bundles/org.openhab.core.persistence/pom.xml | 6 ++---- bundles/org.openhab.core.semantics/pom.xml | 6 ++---- bundles/org.openhab.core.storage.json/pom.xml | 6 ++---- bundles/org.openhab.core.test.magic/pom.xml | 6 ++---- bundles/org.openhab.core.test/pom.xml | 6 ++---- bundles/org.openhab.core.thing/pom.xml | 6 ++---- bundles/org.openhab.core.transform/pom.xml | 6 ++---- bundles/org.openhab.core.ui.icon/pom.xml | 6 ++---- bundles/org.openhab.core.ui/pom.xml | 6 ++---- bundles/org.openhab.core.voice/pom.xml | 6 ++---- bundles/org.openhab.core/pom.xml | 6 ++---- bundles/pom.xml | 6 ++---- features/karaf/openhab-core/pom.xml | 6 ++---- features/karaf/openhab-tp/pom.xml | 6 ++---- features/karaf/pom.xml | 6 ++---- features/pom.xml | 6 ++---- itests/org.openhab.core.addon.tests/pom.xml | 6 ++---- itests/org.openhab.core.auth.oauth2client.tests/pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../pom.xml | 6 ++---- itests/org.openhab.core.automation.tests/pom.xml | 6 ++---- itests/org.openhab.core.config.core.tests/pom.xml | 6 ++---- .../org.openhab.core.config.discovery.mdns.tests/pom.xml | 6 ++---- itests/org.openhab.core.config.discovery.tests/pom.xml | 6 ++---- .../pom.xml | 6 ++---- .../pom.xml | 6 ++---- itests/org.openhab.core.config.dispatch.tests/pom.xml | 6 ++---- itests/org.openhab.core.ephemeris.tests/pom.xml | 6 ++---- itests/org.openhab.core.io.net.tests/pom.xml | 6 ++---- itests/org.openhab.core.io.rest.core.tests/pom.xml | 6 ++---- itests/org.openhab.core.model.item.tests/pom.xml | 6 ++---- itests/org.openhab.core.model.rule.tests/pom.xml | 6 ++---- itests/org.openhab.core.model.script.tests/pom.xml | 6 ++---- itests/org.openhab.core.model.thing.tests/pom.xml | 6 ++---- itests/org.openhab.core.model.thing.testsupport/pom.xml | 6 ++---- itests/org.openhab.core.storage.json.tests/pom.xml | 6 ++---- itests/org.openhab.core.tests/pom.xml | 6 ++---- itests/org.openhab.core.thing.tests/pom.xml | 6 ++---- itests/org.openhab.core.voice.tests/pom.xml | 6 ++---- itests/pom.xml | 6 ++---- pom.xml | 6 ++---- tools/archetype/binding/pom.xml | 6 ++---- tools/archetype/pom.xml | 6 ++---- tools/i18n-plugin/pom.xml | 6 ++---- tools/pom.xml | 6 ++---- tools/upgradetool/pom.xml | 6 ++---- 139 files changed, 279 insertions(+), 558 deletions(-) diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml index 1e978a5f069..ea9cdd4f476 100644 --- a/bom/compile-model/pom.xml +++ b/bom/compile-model/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bom org.openhab.core.reactor.bom - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom.compile-model diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 856dd33e40d..2357e99d818 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bom org.openhab.core.reactor.bom - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom.compile diff --git a/bom/openhab-core-index/pom.xml b/bom/openhab-core-index/pom.xml index 965df57110d..5afe6e9327b 100644 --- a/bom/openhab-core-index/pom.xml +++ b/bom/openhab-core-index/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bom org.openhab.core.reactor.bom - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom.openhab-core-index diff --git a/bom/openhab-core/pom.xml b/bom/openhab-core/pom.xml index 0c9d4a359da..c0fff09e87e 100644 --- a/bom/openhab-core/pom.xml +++ b/bom/openhab-core/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bom org.openhab.core.reactor.bom - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom.openhab-core diff --git a/bom/pom.xml b/bom/pom.xml index 45c66587d4a..96e9cfb2271 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core org.openhab.core.reactor - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom diff --git a/bom/runtime-index/pom.xml b/bom/runtime-index/pom.xml index f1c2ec9a301..adbbb4bb05f 100644 --- a/bom/runtime-index/pom.xml +++ b/bom/runtime-index/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bom org.openhab.core.reactor.bom - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom.runtime-index diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 9d6d8a7041e..77d2fca9ee2 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bom org.openhab.core.reactor.bom - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom.runtime diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml index 03525fcad77..3eb79b8f0b0 100644 --- a/bom/test-index/pom.xml +++ b/bom/test-index/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bom org.openhab.core.reactor.bom - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom.test-index diff --git a/bom/test/pom.xml b/bom/test/pom.xml index 90ac8d337ad..0a77f0157da 100644 --- a/bom/test/pom.xml +++ b/bom/test/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bom org.openhab.core.reactor.bom - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bom.test diff --git a/bundles/org.openhab.core.addon.eclipse/pom.xml b/bundles/org.openhab.core.addon.eclipse/pom.xml index 1d5c0f10f8f..5a1a18b7bf4 100644 --- a/bundles/org.openhab.core.addon.eclipse/pom.xml +++ b/bundles/org.openhab.core.addon.eclipse/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.addon.eclipse diff --git a/bundles/org.openhab.core.addon.marketplace.karaf/pom.xml b/bundles/org.openhab.core.addon.marketplace.karaf/pom.xml index f8a43259cad..55c9335c7a3 100644 --- a/bundles/org.openhab.core.addon.marketplace.karaf/pom.xml +++ b/bundles/org.openhab.core.addon.marketplace.karaf/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.addon.marketplace.karaf diff --git a/bundles/org.openhab.core.addon.marketplace/pom.xml b/bundles/org.openhab.core.addon.marketplace/pom.xml index 8da6c041a37..059bf03a02f 100644 --- a/bundles/org.openhab.core.addon.marketplace/pom.xml +++ b/bundles/org.openhab.core.addon.marketplace/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.addon.marketplace diff --git a/bundles/org.openhab.core.addon/pom.xml b/bundles/org.openhab.core.addon/pom.xml index 383589723ac..cd6f34fea90 100644 --- a/bundles/org.openhab.core.addon/pom.xml +++ b/bundles/org.openhab.core.addon/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.addon diff --git a/bundles/org.openhab.core.audio/pom.xml b/bundles/org.openhab.core.audio/pom.xml index 844a3b7e2a7..c65fbbdc092 100644 --- a/bundles/org.openhab.core.audio/pom.xml +++ b/bundles/org.openhab.core.audio/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.audio diff --git a/bundles/org.openhab.core.auth.jaas/pom.xml b/bundles/org.openhab.core.auth.jaas/pom.xml index 89bfc6c6379..0d92ea29ab5 100644 --- a/bundles/org.openhab.core.auth.jaas/pom.xml +++ b/bundles/org.openhab.core.auth.jaas/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.auth.jaas diff --git a/bundles/org.openhab.core.auth.oauth2client/pom.xml b/bundles/org.openhab.core.auth.oauth2client/pom.xml index ebf3eb6e263..a085fb077ad 100644 --- a/bundles/org.openhab.core.auth.oauth2client/pom.xml +++ b/bundles/org.openhab.core.auth.oauth2client/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.auth.oauth2client diff --git a/bundles/org.openhab.core.automation.module.media/pom.xml b/bundles/org.openhab.core.automation.module.media/pom.xml index ff55187501f..53fcf48d6ef 100644 --- a/bundles/org.openhab.core.automation.module.media/pom.xml +++ b/bundles/org.openhab.core.automation.module.media/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.module.media diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/pom.xml b/bundles/org.openhab.core.automation.module.script.rulesupport/pom.xml index 6984e85d432..b46b44cf3ec 100644 --- a/bundles/org.openhab.core.automation.module.script.rulesupport/pom.xml +++ b/bundles/org.openhab.core.automation.module.script.rulesupport/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.module.script.rulesupport diff --git a/bundles/org.openhab.core.automation.module.script/pom.xml b/bundles/org.openhab.core.automation.module.script/pom.xml index 2a27ac644bc..958e49fb368 100644 --- a/bundles/org.openhab.core.automation.module.script/pom.xml +++ b/bundles/org.openhab.core.automation.module.script/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.module.script diff --git a/bundles/org.openhab.core.automation.rest/pom.xml b/bundles/org.openhab.core.automation.rest/pom.xml index d9ec662bef1..953aef5c7c0 100644 --- a/bundles/org.openhab.core.automation.rest/pom.xml +++ b/bundles/org.openhab.core.automation.rest/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.rest diff --git a/bundles/org.openhab.core.automation/pom.xml b/bundles/org.openhab.core.automation/pom.xml index 2b66f59eb68..ea4bbd90c91 100644 --- a/bundles/org.openhab.core.automation/pom.xml +++ b/bundles/org.openhab.core.automation/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation diff --git a/bundles/org.openhab.core.config.core/pom.xml b/bundles/org.openhab.core.config.core/pom.xml index a04f3a71a66..d13ad10670f 100644 --- a/bundles/org.openhab.core.config.core/pom.xml +++ b/bundles/org.openhab.core.config.core/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.core diff --git a/bundles/org.openhab.core.config.discovery.addon.ip/pom.xml b/bundles/org.openhab.core.config.discovery.addon.ip/pom.xml index d70ff9728c8..071419854a9 100644 --- a/bundles/org.openhab.core.config.discovery.addon.ip/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon.ip/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.addon.ip diff --git a/bundles/org.openhab.core.config.discovery.addon.mdns/pom.xml b/bundles/org.openhab.core.config.discovery.addon.mdns/pom.xml index 3afd5faef7d..1a63d3a8440 100644 --- a/bundles/org.openhab.core.config.discovery.addon.mdns/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon.mdns/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.addon.mdns diff --git a/bundles/org.openhab.core.config.discovery.addon.process/pom.xml b/bundles/org.openhab.core.config.discovery.addon.process/pom.xml index 9cab7b67f10..51078aa5bff 100644 --- a/bundles/org.openhab.core.config.discovery.addon.process/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon.process/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.addon.process diff --git a/bundles/org.openhab.core.config.discovery.addon.upnp/pom.xml b/bundles/org.openhab.core.config.discovery.addon.upnp/pom.xml index 47f50aa76f6..7b461b8146c 100644 --- a/bundles/org.openhab.core.config.discovery.addon.upnp/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon.upnp/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.addon.upnp diff --git a/bundles/org.openhab.core.config.discovery.addon/pom.xml b/bundles/org.openhab.core.config.discovery.addon/pom.xml index 9b33fcd4394..61cc63e4a04 100644 --- a/bundles/org.openhab.core.config.discovery.addon/pom.xml +++ b/bundles/org.openhab.core.config.discovery.addon/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.addon diff --git a/bundles/org.openhab.core.config.discovery.mdns/pom.xml b/bundles/org.openhab.core.config.discovery.mdns/pom.xml index fafd855d6dd..446acaa2a60 100644 --- a/bundles/org.openhab.core.config.discovery.mdns/pom.xml +++ b/bundles/org.openhab.core.config.discovery.mdns/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.mdns diff --git a/bundles/org.openhab.core.config.discovery.upnp/pom.xml b/bundles/org.openhab.core.config.discovery.upnp/pom.xml index 4c99a1bb0af..9fb27e38f4f 100644 --- a/bundles/org.openhab.core.config.discovery.upnp/pom.xml +++ b/bundles/org.openhab.core.config.discovery.upnp/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.upnp diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/pom.xml index a02f1b38fd8..da574896bc3 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.usbserial.linuxsysfs diff --git a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/pom.xml index ba0ed4a962e..ef2f388b3eb 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.usbserial.ser2net diff --git a/bundles/org.openhab.core.config.discovery.usbserial/pom.xml b/bundles/org.openhab.core.config.discovery.usbserial/pom.xml index b8b957e21fa..3b90152d168 100644 --- a/bundles/org.openhab.core.config.discovery.usbserial/pom.xml +++ b/bundles/org.openhab.core.config.discovery.usbserial/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.usbserial diff --git a/bundles/org.openhab.core.config.discovery/pom.xml b/bundles/org.openhab.core.config.discovery/pom.xml index a3753c11e73..7f29dafcb9b 100644 --- a/bundles/org.openhab.core.config.discovery/pom.xml +++ b/bundles/org.openhab.core.config.discovery/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery diff --git a/bundles/org.openhab.core.config.dispatch/pom.xml b/bundles/org.openhab.core.config.dispatch/pom.xml index 7d2dcf65a2f..ff80f39d4fb 100644 --- a/bundles/org.openhab.core.config.dispatch/pom.xml +++ b/bundles/org.openhab.core.config.dispatch/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.dispatch diff --git a/bundles/org.openhab.core.config.serial/pom.xml b/bundles/org.openhab.core.config.serial/pom.xml index 7ac734201d9..2394de45fad 100644 --- a/bundles/org.openhab.core.config.serial/pom.xml +++ b/bundles/org.openhab.core.config.serial/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.serial diff --git a/bundles/org.openhab.core.ephemeris/pom.xml b/bundles/org.openhab.core.ephemeris/pom.xml index 820aa10dfbf..05f85eb7282 100644 --- a/bundles/org.openhab.core.ephemeris/pom.xml +++ b/bundles/org.openhab.core.ephemeris/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.ephemeris diff --git a/bundles/org.openhab.core.id/pom.xml b/bundles/org.openhab.core.id/pom.xml index 162d5223f68..c97fef0a65c 100644 --- a/bundles/org.openhab.core.id/pom.xml +++ b/bundles/org.openhab.core.id/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.id diff --git a/bundles/org.openhab.core.io.bin2json/pom.xml b/bundles/org.openhab.core.io.bin2json/pom.xml index d83ca2482bd..b00801d432d 100644 --- a/bundles/org.openhab.core.io.bin2json/pom.xml +++ b/bundles/org.openhab.core.io.bin2json/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.bin2json diff --git a/bundles/org.openhab.core.io.console.eclipse/pom.xml b/bundles/org.openhab.core.io.console.eclipse/pom.xml index de8da32578f..2d1106c2be1 100644 --- a/bundles/org.openhab.core.io.console.eclipse/pom.xml +++ b/bundles/org.openhab.core.io.console.eclipse/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.console.eclipse diff --git a/bundles/org.openhab.core.io.console.karaf/pom.xml b/bundles/org.openhab.core.io.console.karaf/pom.xml index 82a53b412bf..d170a34ca56 100644 --- a/bundles/org.openhab.core.io.console.karaf/pom.xml +++ b/bundles/org.openhab.core.io.console.karaf/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.console.karaf diff --git a/bundles/org.openhab.core.io.console.rfc147/pom.xml b/bundles/org.openhab.core.io.console.rfc147/pom.xml index 83103b501eb..3914f98bb9d 100644 --- a/bundles/org.openhab.core.io.console.rfc147/pom.xml +++ b/bundles/org.openhab.core.io.console.rfc147/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.console.rfc147 diff --git a/bundles/org.openhab.core.io.console/pom.xml b/bundles/org.openhab.core.io.console/pom.xml index a35e5d748ab..05f24d4002f 100644 --- a/bundles/org.openhab.core.io.console/pom.xml +++ b/bundles/org.openhab.core.io.console/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.console diff --git a/bundles/org.openhab.core.io.http.auth/pom.xml b/bundles/org.openhab.core.io.http.auth/pom.xml index 2872f4b54f0..c6e0378be7b 100644 --- a/bundles/org.openhab.core.io.http.auth/pom.xml +++ b/bundles/org.openhab.core.io.http.auth/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.http.auth diff --git a/bundles/org.openhab.core.io.http/pom.xml b/bundles/org.openhab.core.io.http/pom.xml index fad7fddf0f4..953069e2361 100644 --- a/bundles/org.openhab.core.io.http/pom.xml +++ b/bundles/org.openhab.core.io.http/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.http diff --git a/bundles/org.openhab.core.io.jetty.certificate/pom.xml b/bundles/org.openhab.core.io.jetty.certificate/pom.xml index 2034757bd44..6d43ddd9539 100644 --- a/bundles/org.openhab.core.io.jetty.certificate/pom.xml +++ b/bundles/org.openhab.core.io.jetty.certificate/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.jetty.certificate @@ -51,8 +49,7 @@ true - + . diff --git a/bundles/org.openhab.core.io.monitor/pom.xml b/bundles/org.openhab.core.io.monitor/pom.xml index c9cca62175f..ea907a25c7f 100644 --- a/bundles/org.openhab.core.io.monitor/pom.xml +++ b/bundles/org.openhab.core.io.monitor/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.monitor diff --git a/bundles/org.openhab.core.io.net/pom.xml b/bundles/org.openhab.core.io.net/pom.xml index 23c9df05d82..b0715816e50 100644 --- a/bundles/org.openhab.core.io.net/pom.xml +++ b/bundles/org.openhab.core.io.net/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.net diff --git a/bundles/org.openhab.core.io.rest.audio/pom.xml b/bundles/org.openhab.core.io.rest.audio/pom.xml index f1bfc40a292..7dd5b45e2a7 100644 --- a/bundles/org.openhab.core.io.rest.audio/pom.xml +++ b/bundles/org.openhab.core.io.rest.audio/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.audio diff --git a/bundles/org.openhab.core.io.rest.auth/pom.xml b/bundles/org.openhab.core.io.rest.auth/pom.xml index 853f0962658..6781884dec9 100644 --- a/bundles/org.openhab.core.io.rest.auth/pom.xml +++ b/bundles/org.openhab.core.io.rest.auth/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.auth diff --git a/bundles/org.openhab.core.io.rest.core/pom.xml b/bundles/org.openhab.core.io.rest.core/pom.xml index 20f2604bbf4..45fec2cec1d 100644 --- a/bundles/org.openhab.core.io.rest.core/pom.xml +++ b/bundles/org.openhab.core.io.rest.core/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.core diff --git a/bundles/org.openhab.core.io.rest.log/pom.xml b/bundles/org.openhab.core.io.rest.log/pom.xml index 9cf4c1437c6..ac76d4bcb92 100644 --- a/bundles/org.openhab.core.io.rest.log/pom.xml +++ b/bundles/org.openhab.core.io.rest.log/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.log diff --git a/bundles/org.openhab.core.io.rest.mdns/pom.xml b/bundles/org.openhab.core.io.rest.mdns/pom.xml index 79bb6fc31d3..6b6ea3d504c 100644 --- a/bundles/org.openhab.core.io.rest.mdns/pom.xml +++ b/bundles/org.openhab.core.io.rest.mdns/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.mdns diff --git a/bundles/org.openhab.core.io.rest.sitemap/pom.xml b/bundles/org.openhab.core.io.rest.sitemap/pom.xml index 8a2b5ec5065..b220ca6ddf0 100644 --- a/bundles/org.openhab.core.io.rest.sitemap/pom.xml +++ b/bundles/org.openhab.core.io.rest.sitemap/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.sitemap diff --git a/bundles/org.openhab.core.io.rest.sse/pom.xml b/bundles/org.openhab.core.io.rest.sse/pom.xml index 873873450dd..487d978f659 100644 --- a/bundles/org.openhab.core.io.rest.sse/pom.xml +++ b/bundles/org.openhab.core.io.rest.sse/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.sse diff --git a/bundles/org.openhab.core.io.rest.swagger/pom.xml b/bundles/org.openhab.core.io.rest.swagger/pom.xml index 55eacced95c..52059e3ebcd 100644 --- a/bundles/org.openhab.core.io.rest.swagger/pom.xml +++ b/bundles/org.openhab.core.io.rest.swagger/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.swagger diff --git a/bundles/org.openhab.core.io.rest.transform/pom.xml b/bundles/org.openhab.core.io.rest.transform/pom.xml index 31514c845e8..487a6523e68 100644 --- a/bundles/org.openhab.core.io.rest.transform/pom.xml +++ b/bundles/org.openhab.core.io.rest.transform/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.transform diff --git a/bundles/org.openhab.core.io.rest.ui/pom.xml b/bundles/org.openhab.core.io.rest.ui/pom.xml index f98d1b7b97d..0236b53a615 100644 --- a/bundles/org.openhab.core.io.rest.ui/pom.xml +++ b/bundles/org.openhab.core.io.rest.ui/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.ui diff --git a/bundles/org.openhab.core.io.rest.voice/pom.xml b/bundles/org.openhab.core.io.rest.voice/pom.xml index f3983792953..60b1a4fffe6 100644 --- a/bundles/org.openhab.core.io.rest.voice/pom.xml +++ b/bundles/org.openhab.core.io.rest.voice/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.voice diff --git a/bundles/org.openhab.core.io.rest/pom.xml b/bundles/org.openhab.core.io.rest/pom.xml index 1775d4bb823..795ec7f5646 100644 --- a/bundles/org.openhab.core.io.rest/pom.xml +++ b/bundles/org.openhab.core.io.rest/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest diff --git a/bundles/org.openhab.core.io.transport.mdns/pom.xml b/bundles/org.openhab.core.io.transport.mdns/pom.xml index 656b7179110..71a86c85207 100644 --- a/bundles/org.openhab.core.io.transport.mdns/pom.xml +++ b/bundles/org.openhab.core.io.transport.mdns/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.transport.mdns diff --git a/bundles/org.openhab.core.io.transport.modbus/pom.xml b/bundles/org.openhab.core.io.transport.modbus/pom.xml index 2928f3fc1bb..d40f9cffb77 100644 --- a/bundles/org.openhab.core.io.transport.modbus/pom.xml +++ b/bundles/org.openhab.core.io.transport.modbus/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.transport.modbus diff --git a/bundles/org.openhab.core.io.transport.mqtt/pom.xml b/bundles/org.openhab.core.io.transport.mqtt/pom.xml index fef869a1c19..254a136ae12 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/pom.xml +++ b/bundles/org.openhab.core.io.transport.mqtt/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.transport.mqtt diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/pom.xml b/bundles/org.openhab.core.io.transport.serial.javacomm/pom.xml index 1d616b0252c..d61305d171d 100644 --- a/bundles/org.openhab.core.io.transport.serial.javacomm/pom.xml +++ b/bundles/org.openhab.core.io.transport.serial.javacomm/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.transport.serial.javacomm diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/pom.xml b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/pom.xml index 777820fcc1a..d5e6263a8d0 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/pom.xml +++ b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.transport.serial.rxtx.rfc2217 diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/pom.xml b/bundles/org.openhab.core.io.transport.serial.rxtx/pom.xml index 0625bfedf7d..b12417b2003 100644 --- a/bundles/org.openhab.core.io.transport.serial.rxtx/pom.xml +++ b/bundles/org.openhab.core.io.transport.serial.rxtx/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.transport.serial.rxtx diff --git a/bundles/org.openhab.core.io.transport.serial/pom.xml b/bundles/org.openhab.core.io.transport.serial/pom.xml index 7336a370aef..d6129f3c5ed 100644 --- a/bundles/org.openhab.core.io.transport.serial/pom.xml +++ b/bundles/org.openhab.core.io.transport.serial/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.transport.serial diff --git a/bundles/org.openhab.core.io.transport.upnp/pom.xml b/bundles/org.openhab.core.io.transport.upnp/pom.xml index b9de5808c82..37aefdedaa1 100644 --- a/bundles/org.openhab.core.io.transport.upnp/pom.xml +++ b/bundles/org.openhab.core.io.transport.upnp/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.transport.upnp diff --git a/bundles/org.openhab.core.io.websocket/pom.xml b/bundles/org.openhab.core.io.websocket/pom.xml index dca8a41f81e..027b9cd046c 100644 --- a/bundles/org.openhab.core.io.websocket/pom.xml +++ b/bundles/org.openhab.core.io.websocket/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.websocket diff --git a/bundles/org.openhab.core.karaf/pom.xml b/bundles/org.openhab.core.karaf/pom.xml index aa2d40cd057..a0115ed4474 100644 --- a/bundles/org.openhab.core.karaf/pom.xml +++ b/bundles/org.openhab.core.karaf/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.karaf diff --git a/bundles/org.openhab.core.model.core/pom.xml b/bundles/org.openhab.core.model.core/pom.xml index c50d6ebad17..b0325b599ae 100644 --- a/bundles/org.openhab.core.model.core/pom.xml +++ b/bundles/org.openhab.core.model.core/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.core diff --git a/bundles/org.openhab.core.model.item.ide/pom.xml b/bundles/org.openhab.core.model.item.ide/pom.xml index 05df5b8d7a8..b888bf7bd8f 100644 --- a/bundles/org.openhab.core.model.item.ide/pom.xml +++ b/bundles/org.openhab.core.model.item.ide/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.item.ide diff --git a/bundles/org.openhab.core.model.item.runtime/pom.xml b/bundles/org.openhab.core.model.item.runtime/pom.xml index 12474451ed0..034df24bfbb 100644 --- a/bundles/org.openhab.core.model.item.runtime/pom.xml +++ b/bundles/org.openhab.core.model.item.runtime/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.item.runtime diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml index 29520867e2d..2b7c8e537a6 100644 --- a/bundles/org.openhab.core.model.item/pom.xml +++ b/bundles/org.openhab.core.model.item/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.item diff --git a/bundles/org.openhab.core.model.lazygen/pom.xml b/bundles/org.openhab.core.model.lazygen/pom.xml index 5f597e208bd..78077837944 100644 --- a/bundles/org.openhab.core.model.lazygen/pom.xml +++ b/bundles/org.openhab.core.model.lazygen/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.lazygen diff --git a/bundles/org.openhab.core.model.lsp/pom.xml b/bundles/org.openhab.core.model.lsp/pom.xml index 0b04b3686c6..b4a94b5ea12 100644 --- a/bundles/org.openhab.core.model.lsp/pom.xml +++ b/bundles/org.openhab.core.model.lsp/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.lsp diff --git a/bundles/org.openhab.core.model.persistence.ide/pom.xml b/bundles/org.openhab.core.model.persistence.ide/pom.xml index 369f7137ecd..70f70c28e4a 100644 --- a/bundles/org.openhab.core.model.persistence.ide/pom.xml +++ b/bundles/org.openhab.core.model.persistence.ide/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.persistence.ide diff --git a/bundles/org.openhab.core.model.persistence.runtime/pom.xml b/bundles/org.openhab.core.model.persistence.runtime/pom.xml index c3ee9f7399f..60bc052261c 100644 --- a/bundles/org.openhab.core.model.persistence.runtime/pom.xml +++ b/bundles/org.openhab.core.model.persistence.runtime/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.persistence.runtime diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml index a06b5b2d206..d648f05eb82 100644 --- a/bundles/org.openhab.core.model.persistence/pom.xml +++ b/bundles/org.openhab.core.model.persistence/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.persistence diff --git a/bundles/org.openhab.core.model.rule.ide/pom.xml b/bundles/org.openhab.core.model.rule.ide/pom.xml index 9a5340242f7..74ac3b4d958 100644 --- a/bundles/org.openhab.core.model.rule.ide/pom.xml +++ b/bundles/org.openhab.core.model.rule.ide/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.rule.ide diff --git a/bundles/org.openhab.core.model.rule.runtime/pom.xml b/bundles/org.openhab.core.model.rule.runtime/pom.xml index c50f352a685..d01efccb2b1 100644 --- a/bundles/org.openhab.core.model.rule.runtime/pom.xml +++ b/bundles/org.openhab.core.model.rule.runtime/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.rule.runtime diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml index 1ed15469225..2b8efa812b9 100644 --- a/bundles/org.openhab.core.model.rule/pom.xml +++ b/bundles/org.openhab.core.model.rule/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.rule diff --git a/bundles/org.openhab.core.model.script.ide/pom.xml b/bundles/org.openhab.core.model.script.ide/pom.xml index f8f46e5b217..40f28780448 100644 --- a/bundles/org.openhab.core.model.script.ide/pom.xml +++ b/bundles/org.openhab.core.model.script.ide/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.script.ide diff --git a/bundles/org.openhab.core.model.script.runtime/pom.xml b/bundles/org.openhab.core.model.script.runtime/pom.xml index 1536cca6f37..11f2c863c6a 100644 --- a/bundles/org.openhab.core.model.script.runtime/pom.xml +++ b/bundles/org.openhab.core.model.script.runtime/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.script.runtime diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml index 225e2d63f02..cb08d42f257 100644 --- a/bundles/org.openhab.core.model.script/pom.xml +++ b/bundles/org.openhab.core.model.script/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.script diff --git a/bundles/org.openhab.core.model.sitemap.ide/pom.xml b/bundles/org.openhab.core.model.sitemap.ide/pom.xml index 6dd2078c880..b39b00f2029 100644 --- a/bundles/org.openhab.core.model.sitemap.ide/pom.xml +++ b/bundles/org.openhab.core.model.sitemap.ide/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.sitemap.ide diff --git a/bundles/org.openhab.core.model.sitemap.runtime/pom.xml b/bundles/org.openhab.core.model.sitemap.runtime/pom.xml index 129184a9705..6429f72935d 100644 --- a/bundles/org.openhab.core.model.sitemap.runtime/pom.xml +++ b/bundles/org.openhab.core.model.sitemap.runtime/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.sitemap.runtime diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml index de71ef4e022..582776cbd48 100644 --- a/bundles/org.openhab.core.model.sitemap/pom.xml +++ b/bundles/org.openhab.core.model.sitemap/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.sitemap diff --git a/bundles/org.openhab.core.model.thing.ide/pom.xml b/bundles/org.openhab.core.model.thing.ide/pom.xml index feb6483a37c..0dc7b14bcad 100644 --- a/bundles/org.openhab.core.model.thing.ide/pom.xml +++ b/bundles/org.openhab.core.model.thing.ide/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.thing.ide diff --git a/bundles/org.openhab.core.model.thing.runtime/pom.xml b/bundles/org.openhab.core.model.thing.runtime/pom.xml index f97a5278d38..48098891d3e 100644 --- a/bundles/org.openhab.core.model.thing.runtime/pom.xml +++ b/bundles/org.openhab.core.model.thing.runtime/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.thing.runtime diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml index 8ddac3a2890..c6005e703d6 100644 --- a/bundles/org.openhab.core.model.thing/pom.xml +++ b/bundles/org.openhab.core.model.thing/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.thing diff --git a/bundles/org.openhab.core.model.yaml/pom.xml b/bundles/org.openhab.core.model.yaml/pom.xml index 00941ec4b21..e97653e3c51 100644 --- a/bundles/org.openhab.core.model.yaml/pom.xml +++ b/bundles/org.openhab.core.model.yaml/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.yaml diff --git a/bundles/org.openhab.core.persistence/pom.xml b/bundles/org.openhab.core.persistence/pom.xml index 062427ac6bd..d7d59a7f4ba 100644 --- a/bundles/org.openhab.core.persistence/pom.xml +++ b/bundles/org.openhab.core.persistence/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.persistence diff --git a/bundles/org.openhab.core.semantics/pom.xml b/bundles/org.openhab.core.semantics/pom.xml index f737fed3136..0f4af25542d 100644 --- a/bundles/org.openhab.core.semantics/pom.xml +++ b/bundles/org.openhab.core.semantics/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.semantics diff --git a/bundles/org.openhab.core.storage.json/pom.xml b/bundles/org.openhab.core.storage.json/pom.xml index 6cd641f7d31..16d9addd3b8 100644 --- a/bundles/org.openhab.core.storage.json/pom.xml +++ b/bundles/org.openhab.core.storage.json/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.storage.json diff --git a/bundles/org.openhab.core.test.magic/pom.xml b/bundles/org.openhab.core.test.magic/pom.xml index 9fa196648c5..fccb5185b39 100644 --- a/bundles/org.openhab.core.test.magic/pom.xml +++ b/bundles/org.openhab.core.test.magic/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.test.magic diff --git a/bundles/org.openhab.core.test/pom.xml b/bundles/org.openhab.core.test/pom.xml index 32e48a16881..5385e96b670 100644 --- a/bundles/org.openhab.core.test/pom.xml +++ b/bundles/org.openhab.core.test/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.test diff --git a/bundles/org.openhab.core.thing/pom.xml b/bundles/org.openhab.core.thing/pom.xml index 77491668103..4f304d3756e 100644 --- a/bundles/org.openhab.core.thing/pom.xml +++ b/bundles/org.openhab.core.thing/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.thing diff --git a/bundles/org.openhab.core.transform/pom.xml b/bundles/org.openhab.core.transform/pom.xml index 19f6b78fdb4..52d1c03d1e5 100644 --- a/bundles/org.openhab.core.transform/pom.xml +++ b/bundles/org.openhab.core.transform/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.transform diff --git a/bundles/org.openhab.core.ui.icon/pom.xml b/bundles/org.openhab.core.ui.icon/pom.xml index 25dbb67d649..7331845be54 100644 --- a/bundles/org.openhab.core.ui.icon/pom.xml +++ b/bundles/org.openhab.core.ui.icon/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.ui.icon diff --git a/bundles/org.openhab.core.ui/pom.xml b/bundles/org.openhab.core.ui/pom.xml index 12834e618f5..96f08194a7e 100644 --- a/bundles/org.openhab.core.ui/pom.xml +++ b/bundles/org.openhab.core.ui/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.ui diff --git a/bundles/org.openhab.core.voice/pom.xml b/bundles/org.openhab.core.voice/pom.xml index 1c70f3ffd2d..66a5cc60ebf 100644 --- a/bundles/org.openhab.core.voice/pom.xml +++ b/bundles/org.openhab.core.voice/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.voice diff --git a/bundles/org.openhab.core/pom.xml b/bundles/org.openhab.core/pom.xml index 5595e68071f..c855799fe67 100644 --- a/bundles/org.openhab.core/pom.xml +++ b/bundles/org.openhab.core/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.bundles org.openhab.core.reactor.bundles - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core diff --git a/bundles/pom.xml b/bundles/pom.xml index ca86361706e..58e8b73239e 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core org.openhab.core.reactor - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.bundles diff --git a/features/karaf/openhab-core/pom.xml b/features/karaf/openhab-core/pom.xml index 625d7bd0cb2..c57a300e8fd 100644 --- a/features/karaf/openhab-core/pom.xml +++ b/features/karaf/openhab-core/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.features.karaf org.openhab.core.reactor.features.karaf - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.features.karaf.openhab-core diff --git a/features/karaf/openhab-tp/pom.xml b/features/karaf/openhab-tp/pom.xml index 9479bb61a88..e25fb066a0e 100644 --- a/features/karaf/openhab-tp/pom.xml +++ b/features/karaf/openhab-tp/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.features.karaf org.openhab.core.reactor.features.karaf - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.features.karaf.openhab-tp diff --git a/features/karaf/pom.xml b/features/karaf/pom.xml index 93c9e575a3b..f1b1feefc0e 100644 --- a/features/karaf/pom.xml +++ b/features/karaf/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.features org.openhab.core.reactor.features - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.features.karaf diff --git a/features/pom.xml b/features/pom.xml index 6e1c810ded0..e860aeb07b3 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core org.openhab.core.reactor - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.features diff --git a/itests/org.openhab.core.addon.tests/pom.xml b/itests/org.openhab.core.addon.tests/pom.xml index b3a8d3f4b3b..afa9bc7ecc0 100644 --- a/itests/org.openhab.core.addon.tests/pom.xml +++ b/itests/org.openhab.core.addon.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.addon.tests diff --git a/itests/org.openhab.core.auth.oauth2client.tests/pom.xml b/itests/org.openhab.core.auth.oauth2client.tests/pom.xml index 6d3dcf03cfb..52ad3543fb9 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/pom.xml +++ b/itests/org.openhab.core.auth.oauth2client.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.auth.oauth2client.tests diff --git a/itests/org.openhab.core.automation.integration.tests/pom.xml b/itests/org.openhab.core.automation.integration.tests/pom.xml index 16ba28ae9b3..522e5590c09 100644 --- a/itests/org.openhab.core.automation.integration.tests/pom.xml +++ b/itests/org.openhab.core.automation.integration.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.integration.tests diff --git a/itests/org.openhab.core.automation.module.core.tests/pom.xml b/itests/org.openhab.core.automation.module.core.tests/pom.xml index 4b41bd0ef50..9584236425a 100644 --- a/itests/org.openhab.core.automation.module.core.tests/pom.xml +++ b/itests/org.openhab.core.automation.module.core.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.module.core.tests diff --git a/itests/org.openhab.core.automation.module.script.tests/pom.xml b/itests/org.openhab.core.automation.module.script.tests/pom.xml index eed244eec6d..5398018d48d 100644 --- a/itests/org.openhab.core.automation.module.script.tests/pom.xml +++ b/itests/org.openhab.core.automation.module.script.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.module.script.tests diff --git a/itests/org.openhab.core.automation.module.timer.tests/pom.xml b/itests/org.openhab.core.automation.module.timer.tests/pom.xml index 8d538158fa0..7a9f6e206e0 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/pom.xml +++ b/itests/org.openhab.core.automation.module.timer.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.module.timer.tests diff --git a/itests/org.openhab.core.automation.tests/pom.xml b/itests/org.openhab.core.automation.tests/pom.xml index 115bd6e29ef..fdcddaa4175 100644 --- a/itests/org.openhab.core.automation.tests/pom.xml +++ b/itests/org.openhab.core.automation.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.automation.tests diff --git a/itests/org.openhab.core.config.core.tests/pom.xml b/itests/org.openhab.core.config.core.tests/pom.xml index 2c5fcfc013b..760d51a9ebc 100644 --- a/itests/org.openhab.core.config.core.tests/pom.xml +++ b/itests/org.openhab.core.config.core.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.core.tests diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml b/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml index 0af0ff6e628..ff409c96f0d 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml +++ b/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.mdns.tests diff --git a/itests/org.openhab.core.config.discovery.tests/pom.xml b/itests/org.openhab.core.config.discovery.tests/pom.xml index 6dc13488de0..66ab8ea2704 100644 --- a/itests/org.openhab.core.config.discovery.tests/pom.xml +++ b/itests/org.openhab.core.config.discovery.tests/pom.xml @@ -1,11 +1,9 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.tests diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml index 8d7170ab315..1bf1bd4c16a 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml @@ -1,11 +1,9 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.usbserial.linuxsysfs.tests diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml b/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml index c35da0d686e..44702cdbfca 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.discovery.usbserial.tests diff --git a/itests/org.openhab.core.config.dispatch.tests/pom.xml b/itests/org.openhab.core.config.dispatch.tests/pom.xml index c1846605aba..a667016f739 100644 --- a/itests/org.openhab.core.config.dispatch.tests/pom.xml +++ b/itests/org.openhab.core.config.dispatch.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.config.dispatch.tests diff --git a/itests/org.openhab.core.ephemeris.tests/pom.xml b/itests/org.openhab.core.ephemeris.tests/pom.xml index 7f81ccbdd59..af4bf476f89 100644 --- a/itests/org.openhab.core.ephemeris.tests/pom.xml +++ b/itests/org.openhab.core.ephemeris.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.ephemeris.tests diff --git a/itests/org.openhab.core.io.net.tests/pom.xml b/itests/org.openhab.core.io.net.tests/pom.xml index d0365b034be..144a83a240d 100644 --- a/itests/org.openhab.core.io.net.tests/pom.xml +++ b/itests/org.openhab.core.io.net.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.net.tests diff --git a/itests/org.openhab.core.io.rest.core.tests/pom.xml b/itests/org.openhab.core.io.rest.core.tests/pom.xml index 3d21d3c1fb6..5a6576053e6 100644 --- a/itests/org.openhab.core.io.rest.core.tests/pom.xml +++ b/itests/org.openhab.core.io.rest.core.tests/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.io.rest.core.tests diff --git a/itests/org.openhab.core.model.item.tests/pom.xml b/itests/org.openhab.core.model.item.tests/pom.xml index 862eb5db666..5c0d4aa991e 100644 --- a/itests/org.openhab.core.model.item.tests/pom.xml +++ b/itests/org.openhab.core.model.item.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.item.tests diff --git a/itests/org.openhab.core.model.rule.tests/pom.xml b/itests/org.openhab.core.model.rule.tests/pom.xml index 422dd069c9a..3a44e9a076c 100644 --- a/itests/org.openhab.core.model.rule.tests/pom.xml +++ b/itests/org.openhab.core.model.rule.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.rule.tests diff --git a/itests/org.openhab.core.model.script.tests/pom.xml b/itests/org.openhab.core.model.script.tests/pom.xml index 2335a5d0547..a1d93b25e81 100644 --- a/itests/org.openhab.core.model.script.tests/pom.xml +++ b/itests/org.openhab.core.model.script.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.script.tests diff --git a/itests/org.openhab.core.model.thing.tests/pom.xml b/itests/org.openhab.core.model.thing.tests/pom.xml index cfba8c32f84..d57e81a3902 100644 --- a/itests/org.openhab.core.model.thing.tests/pom.xml +++ b/itests/org.openhab.core.model.thing.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.thing.tests diff --git a/itests/org.openhab.core.model.thing.testsupport/pom.xml b/itests/org.openhab.core.model.thing.testsupport/pom.xml index 57ef4752135..bc62f03911a 100644 --- a/itests/org.openhab.core.model.thing.testsupport/pom.xml +++ b/itests/org.openhab.core.model.thing.testsupport/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.model.thing.testsupport diff --git a/itests/org.openhab.core.storage.json.tests/pom.xml b/itests/org.openhab.core.storage.json.tests/pom.xml index 763c75b60fd..644df8546d1 100644 --- a/itests/org.openhab.core.storage.json.tests/pom.xml +++ b/itests/org.openhab.core.storage.json.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.storage.json.tests diff --git a/itests/org.openhab.core.tests/pom.xml b/itests/org.openhab.core.tests/pom.xml index 755b0a6fae4..9739ba81aeb 100644 --- a/itests/org.openhab.core.tests/pom.xml +++ b/itests/org.openhab.core.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.tests diff --git a/itests/org.openhab.core.thing.tests/pom.xml b/itests/org.openhab.core.thing.tests/pom.xml index a31d4cc148f..804c2436a55 100644 --- a/itests/org.openhab.core.thing.tests/pom.xml +++ b/itests/org.openhab.core.thing.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.thing.tests diff --git a/itests/org.openhab.core.voice.tests/pom.xml b/itests/org.openhab.core.voice.tests/pom.xml index 695523d6d82..c1c4532a7ef 100644 --- a/itests/org.openhab.core.voice.tests/pom.xml +++ b/itests/org.openhab.core.voice.tests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.itests org.openhab.core.reactor.itests - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.voice.tests diff --git a/itests/pom.xml b/itests/pom.xml index d6f79b92747..b82bff2ae3a 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core org.openhab.core.reactor - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.itests diff --git a/pom.xml b/pom.xml index dde28aa8d3a..b0066b3e10b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - - + 4.0.0 @@ -11,7 +9,7 @@ org.openhab.core org.openhab.core.reactor - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT pom diff --git a/tools/archetype/binding/pom.xml b/tools/archetype/binding/pom.xml index 66c3db94426..73f46134d15 100644 --- a/tools/archetype/binding/pom.xml +++ b/tools/archetype/binding/pom.xml @@ -1,12 +1,10 @@ - - + 4.0.0 org.openhab.core.tools.archetypes org.openhab.core.reactor.tools.archetypes - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.tools.archetypes.binding diff --git a/tools/archetype/pom.xml b/tools/archetype/pom.xml index 192c0237319..d84c2edbdba 100644 --- a/tools/archetype/pom.xml +++ b/tools/archetype/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.tools org.openhab.core.reactor.tools - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.tools.archetypes diff --git a/tools/i18n-plugin/pom.xml b/tools/i18n-plugin/pom.xml index f42f0e590fa..b65d9eac20e 100644 --- a/tools/i18n-plugin/pom.xml +++ b/tools/i18n-plugin/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.tools org.openhab.core.reactor.tools - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT i18n-maven-plugin diff --git a/tools/pom.xml b/tools/pom.xml index 7f04b6eecb0..880483753ec 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core org.openhab.core.reactor - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT org.openhab.core.tools diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml index a0c99143202..76d8fdbe8c3 100644 --- a/tools/upgradetool/pom.xml +++ b/tools/upgradetool/pom.xml @@ -1,13 +1,11 @@ - - + 4.0.0 org.openhab.core.tools org.openhab.core.reactor.tools - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT upgradetool