From 5c6bfba450a90b9f361ae030e031b42a4d0df979 Mon Sep 17 00:00:00 2001 From: "CloudBees DEV@Cloud" Date: Sun, 17 Dec 2017 23:40:22 +0100 Subject: [PATCH] [unleash-maven-plugin] Preparation for next development cycle. --- .../META-INF/MANIFEST.MF | 2 +- .../org.openhab.core.compat1x.test/pom.xml | 7 +++-- .../META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.core.compat1x/pom.xml | 5 ++-- .../META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.core.karaf/pom.xml | 13 ++++----- bundles/org.openhab.core/META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.core/pom.xml | 5 ++-- .../META-INF/MANIFEST.MF | 2 +- .../org.openhab.io.jetty.certificate/pom.xml | 7 +++-- .../META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.io.rest.docs/pom.xml | 5 ++-- .../org.openhab.io.sound/META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.io.sound/pom.xml | 5 ++-- .../META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.ui.basicui/pom.xml | 7 ++--- .../META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.ui.classicui/pom.xml | 7 ++--- .../META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.ui.dashboard/pom.xml | 27 +++++++++---------- .../META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.ui.homebuilder/pom.xml | 7 ++--- .../META-INF/MANIFEST.MF | 2 +- bundles/org.openhab.ui.paperui/pom.xml | 7 ++--- bundles/pom.xml | 5 ++-- features/openhab-core/pom.xml | 5 ++-- features/p2/feature.xml | 2 +- features/p2/pom.xml | 5 ++-- features/pom.xml | 5 ++-- features/repo/category.xml | 2 +- features/repo/pom.xml | 5 ++-- features/verify-karaf/pom.xml | 5 ++-- pom.xml | 7 +++-- poms/pom.xml | 5 ++-- poms/tycho/pom.xml | 5 ++-- 35 files changed, 73 insertions(+), 104 deletions(-) diff --git a/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF b/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF index ca386bd0f..171f4a2d6 100644 --- a/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: openHAB 1.x Compatibility Layer Tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.core.compat1x.test Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Fragment-Host: org.openhab.core.compat1x Import-Package: groovy.lang, diff --git a/bundles/org.openhab.core.compat1x.test/pom.xml b/bundles/org.openhab.core.compat1x.test/pom.xml index 089cdd1f3..b6dd7a55f 100644 --- a/bundles/org.openhab.core.compat1x.test/pom.xml +++ b/bundles/org.openhab.core.compat1x.test/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.core.compat1x.test @@ -20,7 +19,7 @@ ${tycho-groupid} target-platform-configuration - + diff --git a/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF b/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF index 492d0f91b..d02b5a676 100644 --- a/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Name: openHAB 1.x Compatibility Layer Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.core.compat1x Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Export-Package: org.codehaus.jackson, org.codehaus.jackson.annotate, diff --git a/bundles/org.openhab.core.compat1x/pom.xml b/bundles/org.openhab.core.compat1x/pom.xml index ac62203b2..d3a5005f8 100644 --- a/bundles/org.openhab.core.compat1x/pom.xml +++ b/bundles/org.openhab.core.compat1x/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.core.compat1x diff --git a/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF b/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF index c1470d6c7..e08cdb13f 100644 --- a/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: openHAB Karaf Integration Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.core.karaf;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Import-Package: com.google.common.base, com.google.common.collect, diff --git a/bundles/org.openhab.core.karaf/pom.xml b/bundles/org.openhab.core.karaf/pom.xml index 6ac806900..c8b7ef81f 100644 --- a/bundles/org.openhab.core.karaf/pom.xml +++ b/bundles/org.openhab.core.karaf/pom.xml @@ -1,14 +1,11 @@ - - + 4.0.0 org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT @@ -60,7 +57,7 @@ - + @@ -73,7 +70,7 @@ - + @@ -88,7 +85,7 @@ - + diff --git a/bundles/org.openhab.core/META-INF/MANIFEST.MF b/bundles/org.openhab.core/META-INF/MANIFEST.MF index 9efee4a05..40744fbbc 100644 --- a/bundles/org.openhab.core/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.core/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Name: openHAB Core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.core Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Export-Package: org.openhab.core Ignore-Package: org.openhab.core.internal.items,org.openhab.core.interna l,org.openhab.core.internal.events diff --git a/bundles/org.openhab.core/pom.xml b/bundles/org.openhab.core/pom.xml index 8148ac249..68a3b8d0a 100644 --- a/bundles/org.openhab.core/pom.xml +++ b/bundles/org.openhab.core/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.core diff --git a/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF b/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF index f3f5e328c..cda51c8ce 100644 --- a/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Name: openHAB SSL Certificate Generator Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.jetty.certificate;singleton:=true Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Import-Package: org.eclipse.jdt.annotation;resolution:=optional, org.osgi.framework, diff --git a/bundles/org.openhab.io.jetty.certificate/pom.xml b/bundles/org.openhab.io.jetty.certificate/pom.xml index 1ce55cb1f..4793983ff 100644 --- a/bundles/org.openhab.io.jetty.certificate/pom.xml +++ b/bundles/org.openhab.io.jetty.certificate/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.io.jetty.certificate @@ -63,4 +62,4 @@ - \ No newline at end of file + diff --git a/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF b/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF index 7c58fb58b..907cbba1a 100644 --- a/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: openHAB REST Documentation Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.rest.docs Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Import-Package: com.google.gson, com.google.gson.annotations, diff --git a/bundles/org.openhab.io.rest.docs/pom.xml b/bundles/org.openhab.io.rest.docs/pom.xml index f3d7e515a..fb8bed32b 100644 --- a/bundles/org.openhab.io.rest.docs/pom.xml +++ b/bundles/org.openhab.io.rest.docs/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 eclipse-plugin org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.io.rest.docs diff --git a/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF b/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF index 36663af16..68c580e39 100644 --- a/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Name: openHAB Sound Support Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.io.sound Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Fragment-Host: org.eclipse.smarthome.io.javasound Import-Package: org.apache.commons.collections, diff --git a/bundles/org.openhab.io.sound/pom.xml b/bundles/org.openhab.io.sound/pom.xml index c12c29dd4..905eab412 100644 --- a/bundles/org.openhab.io.sound/pom.xml +++ b/bundles/org.openhab.io.sound/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 eclipse-plugin org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.io.sound diff --git a/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF index cf642f18d..89251c2c2 100644 --- a/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Name: openHAB Basic UI Fragment Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.ui.basicui Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Fragment-Host: org.eclipse.smarthome.ui.basic Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/bundles/org.openhab.ui.basicui/pom.xml b/bundles/org.openhab.ui.basicui/pom.xml index 0b0bfea1f..3010568f6 100644 --- a/bundles/org.openhab.ui.basicui/pom.xml +++ b/bundles/org.openhab.ui.basicui/pom.xml @@ -1,14 +1,11 @@ - - + 4.0.0 org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.ui.basicui diff --git a/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF index 614fb8ede..858fd0336 100644 --- a/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Name: openHAB Classic UI Fragment Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.ui.classicui Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Fragment-Host: org.eclipse.smarthome.ui.classic Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/bundles/org.openhab.ui.classicui/pom.xml b/bundles/org.openhab.ui.classicui/pom.xml index 5e3815afd..39f1466d6 100644 --- a/bundles/org.openhab.ui.classicui/pom.xml +++ b/bundles/org.openhab.ui.classicui/pom.xml @@ -1,14 +1,11 @@ - - + 4.0.0 org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.ui.classicui diff --git a/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF index 0cad75336..5f2a37bfa 100644 --- a/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: openHAB Dashboard UI Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.ui.dashboard Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Export-Package: org.openhab.ui.dashboard Import-Package: javax.servlet, diff --git a/bundles/org.openhab.ui.dashboard/pom.xml b/bundles/org.openhab.ui.dashboard/pom.xml index 41a06b3ca..22d113856 100644 --- a/bundles/org.openhab.ui.dashboard/pom.xml +++ b/bundles/org.openhab.ui.dashboard/pom.xml @@ -1,14 +1,13 @@ - - - 4.0.0 - - org.openhab.core - pom-bundles - 2.2.0-SNAPSHOT - - - org.openhab.ui.dashboard - openHAB Dashboard UI - - eclipse-plugin - \ No newline at end of file + + 4.0.0 + + org.openhab.core + pom-bundles + 2.3.0-SNAPSHOT + + + org.openhab.ui.dashboard + openHAB Dashboard UI + + eclipse-plugin + diff --git a/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF index cbee8393e..034c6d5c2 100644 --- a/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: HomeBuilder User Interface Bundle-SymbolicName: org.openhab.ui.homebuilder -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/*.xml Import-Package: com.google.gson, diff --git a/bundles/org.openhab.ui.homebuilder/pom.xml b/bundles/org.openhab.ui.homebuilder/pom.xml index d5ba58930..3d98eecf7 100644 --- a/bundles/org.openhab.ui.homebuilder/pom.xml +++ b/bundles/org.openhab.ui.homebuilder/pom.xml @@ -1,12 +1,9 @@ - - + org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT 4.0.0 diff --git a/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF index 390bbf9c7..a4fba4b68 100644 --- a/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF +++ b/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Name: openHAB Paper UI Theme Fragment Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.openhab.ui.paperui Bundle-Vendor: openHAB -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Fragment-Host: org.eclipse.smarthome.ui.paper Import-Package: org.eclipse.jdt.annotation;resolution:=optional, diff --git a/bundles/org.openhab.ui.paperui/pom.xml b/bundles/org.openhab.ui.paperui/pom.xml index 36a4f350f..576f93ec0 100644 --- a/bundles/org.openhab.ui.paperui/pom.xml +++ b/bundles/org.openhab.ui.paperui/pom.xml @@ -1,14 +1,11 @@ - - + 4.0.0 org.openhab.core pom-bundles - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.ui.paperui diff --git a/bundles/pom.xml b/bundles/pom.xml index 4ef451020..c2a25444c 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,10 +1,9 @@ - - + org.openhab.core pom - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT ../pom.xml diff --git a/features/openhab-core/pom.xml b/features/openhab-core/pom.xml index 74a01e49f..5110e0db4 100644 --- a/features/openhab-core/pom.xml +++ b/features/openhab-core/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.core pom-features - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT openhab-core diff --git a/features/p2/feature.xml b/features/p2/feature.xml index 30ddde672..6080918d4 100644 --- a/features/p2/feature.xml +++ b/features/p2/feature.xml @@ -12,7 +12,7 @@ diff --git a/features/p2/pom.xml b/features/p2/pom.xml index 578a362b5..dfe5038b1 100644 --- a/features/p2/pom.xml +++ b/features/p2/pom.xml @@ -1,10 +1,9 @@ - - + org.openhab pom-tycho - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../poms/tycho/pom.xml diff --git a/features/pom.xml b/features/pom.xml index b1be441c6..3fdd4d4e6 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -1,10 +1,9 @@ - - + org.openhab.core pom - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT ../pom.xml diff --git a/features/repo/category.xml b/features/repo/category.xml index a17cf40e1..f4647b69a 100644 --- a/features/repo/category.xml +++ b/features/repo/category.xml @@ -1,6 +1,6 @@ - + diff --git a/features/repo/pom.xml b/features/repo/pom.xml index 96887c7a1..6a9e6c507 100644 --- a/features/repo/pom.xml +++ b/features/repo/pom.xml @@ -1,10 +1,9 @@ - - + org.openhab pom-tycho - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../poms/tycho/pom.xml diff --git a/features/verify-karaf/pom.xml b/features/verify-karaf/pom.xml index c6d09113d..8bd363b7f 100644 --- a/features/verify-karaf/pom.xml +++ b/features/verify-karaf/pom.xml @@ -1,12 +1,11 @@ - - + 4.0.0 org.openhab.core pom-features - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.openhab.features.karaf.verify diff --git a/pom.xml b/pom.xml index b79c44473..f6743975f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,16 @@ - - + 4.0.0 org.openhab pom-tycho - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT poms/tycho/pom.xml org.openhab.core pom - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT pom openHAB diff --git a/poms/pom.xml b/poms/pom.xml index bbab71bcf..b0f64171b 100644 --- a/poms/pom.xml +++ b/poms/pom.xml @@ -1,5 +1,4 @@ - - + 4.0.0 @@ -58,7 +57,7 @@ 2.4.3-01 1.0.19 - 0.10.0.b1 + 0.10.0-SNAPSHOT 0.10.0.b1 2.2.x 4.1.3 diff --git a/poms/tycho/pom.xml b/poms/tycho/pom.xml index 25b5e8032..43e7c177e 100644 --- a/poms/tycho/pom.xml +++ b/poms/tycho/pom.xml @@ -1,5 +1,4 @@ - - + 4.0.0 @@ -10,7 +9,7 @@ pom-tycho - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT pom openHAB - Tycho settings