demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 21:31:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

upgrade to Karaf 4.1.5 (#316)

Browse Source 
* upgrade to Karaf 4.1.5

Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2018-03-15 21:02:34 +01:00 committed by GitHub
parent aa899d7f4d
commit dee3ceea14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,19 @@
<bundle>mvn:org.openhab.core/org.openhab.core.compat1x/${project.version}</bundle>
</feature>
<feature name="openhab-httpclient" version="${project.version}">
<capability>esh.tp;feature=httpclient;version=${jetty.version}</capability>
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-proxy/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.version}</bundle>
</feature>
<feature name="openhab-transport-coap" description="CoAP Transport" version="${project.version}">
<feature>esh-io-transport-coap</feature>
</feature>

4
poms/pom.xml
View File

@ -60,8 +60,8 @@
<esh.version>0.10.0-SNAPSHOT</esh.version>
<esh.releaseVersion>0.9.0</esh.releaseVersion>
<repo.version>2.2.x</repo.version>
<karaf.version>4.1.3</karaf.version>
<jetty.version>9.3.22.v20171030</jetty.version>
<karaf.version>4.1.5</karaf.version>
<jetty.version>9.3.21.v20170918</jetty.version>
<jackson.version>1.9.13</jackson.version>
<sat.version>0.4.1</sat.version>
<nrjavaserial.version>3.12.0.OH</nrjavaserial.version>