OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added coap transport feature (#153) 

Signed-off-by: Kai Kreuzer <kai@openhab.org>
pull/154/head
Kai Kreuzer 2017-06-02 16:44:37 +02:00
parent 4109d4a497
commit 62324222f0
No known key found for this signature in database
GPG Key ID: 5110767B6248D3C0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
features/openhab-core/src/main/feature/feature.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright (c) 2015-2016 by the respective copyright holders. Copyright (c) 2015-2017 by the respective copyright holders.
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0 are made available under the terms of the Eclipse Public License v1.0
@ -60,6 +60,13 @@
<bundle>mvn:org.openhab.core/org.openhab.core.compat1x/${project.version}</bundle> <bundle>mvn:org.openhab.core/org.openhab.core.compat1x/${project.version}</bundle>
</feature> </feature>
<feature name="openhab-transport-coap" description="Serial Transport" version="${project.version}">
<bundle start-level="80">mvn:org.eclipse.californium/californium-osgi/${californium.version}</bundle>
<bundle start-level="80">mvn:org.eclipse.californium/element-connector/${californium.version}</bundle>
<bundle start-level="80">mvn:org.eclipse.californium/scandium/${californium.version} </bundle>
</feature>
<feature name="openhab-transport-mdns" description="mDNS Transport" version="${project.version}"> <feature name="openhab-transport-mdns" description="mDNS Transport" version="${project.version}">
<feature>esh-io-transport-mdns</feature> <feature>esh-io-transport-mdns</feature>
</feature> </feature>
@ -69,7 +76,6 @@
</feature> </feature>
<feature name="openhab-transport-serial" description="Serial Transport" version="${project.version}"> <feature name="openhab-transport-serial" description="Serial Transport" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle start-level="80">mvn:org.openhab/nrjavaserial/${nrjavaserial.version}</bundle> <bundle start-level="80">mvn:org.openhab/nrjavaserial/${nrjavaserial.version}</bundle>
</feature> </feature>

3
poms/pom.xml
View File

@ -55,7 +55,7 @@
<groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
<groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
<ohdr.version>1.0.11</ohdr.version> <ohdr.version>1.0.12</ohdr.version>
<esh.version>0.9.0-SNAPSHOT</esh.version> <esh.version>0.9.0-SNAPSHOT</esh.version>
<repo.version>2.1.x</repo.version> <repo.version>2.1.x</repo.version>
<karaf.version>4.0.8</karaf.version> <karaf.version>4.0.8</karaf.version>
@ -63,6 +63,7 @@
<jackson.version>1.9.13</jackson.version> <jackson.version>1.9.13</jackson.version>
<sat.version>0.0.6</sat.version> <sat.version>0.0.6</sat.version>
<nrjavaserial.version>3.12.0.OH</nrjavaserial.version> <nrjavaserial.version>3.12.0.OH</nrjavaserial.version>
<californium.version>1.0.5</californium.version>
<maven.compiler.plugin.version>3.3</maven.compiler.plugin.version> <maven.compiler.plugin.version>3.3</maven.compiler.plugin.version>
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version> <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
<license.maven.plugin.version>2.10</license.maven.plugin.version> <license.maven.plugin.version>2.10</license.maven.plugin.version>