From cd920a3c5e43fcb4d1a8745324feb5f3a837a6de Mon Sep 17 00:00:00 2001 From: Markus Rathgeb Date: Fri, 21 Sep 2018 13:13:52 +0200 Subject: [PATCH] satisfy bundle requirements on Maven compilation Signed-off-by: Markus Rathgeb --- .../META-INF/MANIFEST.MF | 10 +++++++ .../org.openhab.core.karaf.dep.war/about.html | 28 +++++++++++++++++++ .../build.properties | 4 +++ .../org.openhab.core.karaf.dep.war/pom.xml | 17 +++++++++++ bundles/pom.xml | 1 + 5 files changed, 60 insertions(+) create mode 100644 bundles/org.openhab.core.karaf.dep.war/META-INF/MANIFEST.MF create mode 100644 bundles/org.openhab.core.karaf.dep.war/about.html create mode 100644 bundles/org.openhab.core.karaf.dep.war/build.properties create mode 100644 bundles/org.openhab.core.karaf.dep.war/pom.xml diff --git a/bundles/org.openhab.core.karaf.dep.war/META-INF/MANIFEST.MF b/bundles/org.openhab.core.karaf.dep.war/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..5cd1188b22 --- /dev/null +++ b/bundles/org.openhab.core.karaf.dep.war/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: openHAB Karaf Integration Dependency WAR +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-SymbolicName: org.openhab.core.karaf.dep.war;singleton:=true +Bundle-Vendor: openHAB +Bundle-Version: 2.4.0.qualifier +Provide-Capability: + osgi.service;objectClass:List="org.osgi.service.cm.ConfigurationAdmin", + osgi.service;objectClass:List="org.osgi.service.url.URLStreamHandlerService";url.handler.protocol=mvn diff --git a/bundles/org.openhab.core.karaf.dep.war/about.html b/bundles/org.openhab.core.karaf.dep.war/about.html new file mode 100644 index 0000000000..1c1bb3d48e --- /dev/null +++ b/bundles/org.openhab.core.karaf.dep.war/about.html @@ -0,0 +1,28 @@ + + + + +About + + +

About This Content

+ +

March 22, 2017

+

License

+ +

The openHAB community makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the openHAB community, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at openhab.org.

+ + + \ No newline at end of file diff --git a/bundles/org.openhab.core.karaf.dep.war/build.properties b/bundles/org.openhab.core.karaf.dep.war/build.properties new file mode 100644 index 0000000000..248e8b25d3 --- /dev/null +++ b/bundles/org.openhab.core.karaf.dep.war/build.properties @@ -0,0 +1,4 @@ +output.. = target/classes/ +bin.includes = META-INF/,\ + .,\ + about.html diff --git a/bundles/org.openhab.core.karaf.dep.war/pom.xml b/bundles/org.openhab.core.karaf.dep.war/pom.xml new file mode 100644 index 0000000000..eff7c3df18 --- /dev/null +++ b/bundles/org.openhab.core.karaf.dep.war/pom.xml @@ -0,0 +1,17 @@ + + + + 4.0.0 + + + org.openhab.core + pom-bundles + 2.4.0-SNAPSHOT + + + org.openhab.core.karaf.dep.war + eclipse-plugin + + openHAB Karaf Integration - Dependency WAR + + diff --git a/bundles/pom.xml b/bundles/pom.xml index a7920fe61b..81f01e935c 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -21,6 +21,7 @@ org.openhab.core.compat1x org.openhab.core.compat1x.test org.openhab.core.karaf + org.openhab.core.karaf.dep.war org.openhab.io.jetty.certificate org.openhab.io.rest.docs org.openhab.io.sound