Skip to content

Commit

Permalink
updated to latest ESH build with a separate bundle for jmDNS.
Browse files Browse the repository at this point in the history
Signed-off-by: Kai Kreuzer <[email protected]>
  • Loading branch information
kaikreuzer committed Sep 10, 2015
1 parent c383e55 commit 343758d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
7 changes: 7 additions & 0 deletions features/org.openhab.feature.dependencies/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -777,4 +777,11 @@
version="0.0.0"
unpack="false"/>

<plugin
id="javax.jmdns"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
2 changes: 1 addition & 1 deletion targetplatform/openHAB_Runtime.launch
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value=""/>
<stringAttribute key="productFile" value="/org.openhab.runtime.product/org.openhab.runtime.product.product"/>
<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@1:default,ch.qos.logback.core@1:default,ch.qos.logback.slf4j@default:false,com.eclipsesource.jaxrs.jersey-min@default:true,com.eclipsesource.jaxrs.provider.gson@default:true,com.eclipsesource.jaxrs.publisher@default:true,com.google.gson*2.2.4.v201311231704@default:default,com.google.guava@default:default,com.google.inject@default:default,javax.activation@default:default,javax.servlet*3.1.0.v20140303-1611@default:default,javax.transaction@default:false,javax.xml.bind@default:default,javax.xml.stream@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.exec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:true,org.apache.felix.gogo.runtime@default:true,org.apache.felix.gogo.shell@default:true,org.apache.httpcomponents.httpclient*4.2.6.v201311072007@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201411290715@default:default,org.apache.httpcomponents.httpcore*4.2.5.v201311072007@default:default,org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@3:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.2.12.v20150709@default:default,org.eclipse.jetty.io*9.2.12.v20150709@default:default,org.eclipse.jetty.osgi.boot@2:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.rewrite@default:default,org.eclipse.jetty.security*9.2.12.v20150709@default:default,org.eclipse.jetty.server*9.2.12.v20150709@default:default,org.eclipse.jetty.servlet*9.2.12.v20150709@default:default,org.eclipse.jetty.util*9.2.12.v20150709@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.paho.client.mqttv3@default:default,org.eclipse.smarthome.binding.yahooweather@default:default,org.eclipse.smarthome.config.core@default:true,org.eclipse.smarthome.config.discovery@default:true,org.eclipse.smarthome.config.dispatch@default:true,org.eclipse.smarthome.config.xml@default:true,org.eclipse.smarthome.core.autoupdate@default:true,org.eclipse.smarthome.core.binding.xml@default:true,org.eclipse.smarthome.core.id@default:default,org.eclipse.smarthome.core.persistence@default:default,org.eclipse.smarthome.core.scheduler@default:true,org.eclipse.smarthome.core.scriptengine@default:true,org.eclipse.smarthome.core.thing.xml@default:true,org.eclipse.smarthome.core.thing@default:true,org.eclipse.smarthome.core.transform@default:default,org.eclipse.smarthome.core@default:true,org.eclipse.smarthome.io.console.eclipse@default:true,org.eclipse.smarthome.io.console@default:true,org.eclipse.smarthome.io.monitor@default:true,org.eclipse.smarthome.io.multimedia@default:true,org.eclipse.smarthome.io.net@default:true,org.eclipse.smarthome.io.rest.core@default:default,org.eclipse.smarthome.io.rest.sitemap@default:true,org.eclipse.smarthome.io.rest.sse@default:true,org.eclipse.smarthome.io.rest@default:true,org.eclipse.smarthome.io.transport.mdns@default:default,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.io.transport.upnp@default:true,org.eclipse.smarthome.model.core@5:true,org.eclipse.smarthome.model.item.runtime@3:true,org.eclipse.smarthome.model.item@3:true,org.eclipse.smarthome.model.persistence.runtime@3:true,org.eclipse.smarthome.model.persistence@3:default,org.eclipse.smarthome.model.rule.runtime@3:true,org.eclipse.smarthome.model.rule@3:true,org.eclipse.smarthome.model.script.runtime@3:true,org.eclipse.smarthome.model.script@3:true,org.eclipse.smarthome.model.sitemap.runtime@3:true,org.eclipse.smarthome.model.sitemap@3:true,org.eclipse.smarthome.model.thing.runtime@3:true,org.eclipse.smarthome.model.thing@3:true,org.eclipse.smarthome.storage.mapdb@default:true,org.eclipse.smarthome.transform.exec@default:default,org.eclipse.smarthome.transform.javascript@default:default,org.eclipse.smarthome.transform.map@default:default,org.eclipse.smarthome.transform.regex@default:default,org.eclipse.smarthome.transform.xpath@default:default,org.eclipse.smarthome.transform.xslt@default:default,org.eclipse.smarthome.ui.classic@default:default,org.eclipse.smarthome.ui.icon@default:default,org.eclipse.smarthome.ui.paperui@default:default,org.eclipse.smarthome.ui@default:true,org.eclipse.xtend.lib@default:default,org.eclipse.xtext.common.types@default:true,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.jupnp@default:true,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.slf4j.log4j@default:default"/>
<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@1:default,ch.qos.logback.core@1:default,ch.qos.logback.slf4j@default:false,com.eclipsesource.jaxrs.jersey-min@default:true,com.eclipsesource.jaxrs.provider.gson@default:true,com.eclipsesource.jaxrs.publisher@default:true,com.google.gson*2.2.4.v201311231704@default:default,com.google.guava@default:default,com.google.inject@default:default,javax.activation@default:default,javax.jmdns@default:default,javax.servlet*3.1.0.v20140303-1611@default:default,javax.transaction@default:false,javax.xml.bind@default:default,javax.xml.stream@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.exec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:true,org.apache.felix.gogo.runtime@default:true,org.apache.felix.gogo.shell@default:true,org.apache.httpcomponents.httpclient*4.2.6.v201311072007@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201411290715@default:default,org.apache.httpcomponents.httpcore*4.2.5.v201311072007@default:default,org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@3:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.2.12.v20150709@default:default,org.eclipse.jetty.io*9.2.12.v20150709@default:default,org.eclipse.jetty.osgi.boot@2:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.rewrite@default:default,org.eclipse.jetty.security*9.2.12.v20150709@default:default,org.eclipse.jetty.server*9.2.12.v20150709@default:default,org.eclipse.jetty.servlet*9.2.12.v20150709@default:default,org.eclipse.jetty.util*9.2.12.v20150709@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.paho.client.mqttv3@default:default,org.eclipse.smarthome.binding.yahooweather@default:default,org.eclipse.smarthome.config.core@default:true,org.eclipse.smarthome.config.discovery@default:true,org.eclipse.smarthome.config.dispatch@default:true,org.eclipse.smarthome.config.xml@default:true,org.eclipse.smarthome.core.autoupdate@default:true,org.eclipse.smarthome.core.binding.xml@default:true,org.eclipse.smarthome.core.id@default:default,org.eclipse.smarthome.core.persistence@default:default,org.eclipse.smarthome.core.scheduler@default:true,org.eclipse.smarthome.core.scriptengine@default:true,org.eclipse.smarthome.core.thing.xml@default:true,org.eclipse.smarthome.core.thing@default:true,org.eclipse.smarthome.core.transform@default:default,org.eclipse.smarthome.core@default:true,org.eclipse.smarthome.io.console.eclipse@default:true,org.eclipse.smarthome.io.console@default:true,org.eclipse.smarthome.io.monitor@default:true,org.eclipse.smarthome.io.multimedia@default:true,org.eclipse.smarthome.io.net@default:true,org.eclipse.smarthome.io.rest.core@default:default,org.eclipse.smarthome.io.rest.sitemap@default:true,org.eclipse.smarthome.io.rest.sse@default:true,org.eclipse.smarthome.io.rest@default:true,org.eclipse.smarthome.io.transport.mdns@default:default,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.io.transport.upnp@default:true,org.eclipse.smarthome.model.core@5:true,org.eclipse.smarthome.model.item.runtime@3:true,org.eclipse.smarthome.model.item@3:true,org.eclipse.smarthome.model.persistence.runtime@3:true,org.eclipse.smarthome.model.persistence@3:default,org.eclipse.smarthome.model.rule.runtime@3:true,org.eclipse.smarthome.model.rule@3:true,org.eclipse.smarthome.model.script.runtime@3:true,org.eclipse.smarthome.model.script@3:true,org.eclipse.smarthome.model.sitemap.runtime@3:true,org.eclipse.smarthome.model.sitemap@3:true,org.eclipse.smarthome.model.thing.runtime@3:true,org.eclipse.smarthome.model.thing@3:true,org.eclipse.smarthome.storage.mapdb@default:true,org.eclipse.smarthome.transform.exec@default:default,org.eclipse.smarthome.transform.javascript@default:default,org.eclipse.smarthome.transform.map@default:default,org.eclipse.smarthome.transform.regex@default:default,org.eclipse.smarthome.transform.xpath@default:default,org.eclipse.smarthome.transform.xslt@default:default,org.eclipse.smarthome.ui.classic@default:default,org.eclipse.smarthome.ui.icon@default:default,org.eclipse.smarthome.ui.paperui@default:default,org.eclipse.smarthome.ui@default:true,org.eclipse.xtend.lib@default:default,org.eclipse.xtext.common.types@default:true,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.jupnp@default:true,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.slf4j.log4j@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.openhab.binding.astro@default:default,org.openhab.core.compat1x@default:true,org.openhab.core.init@1:true,org.openhab.core@5:true,org.openhab.io.jetty@default:default,org.openhab.io.rest.docs@default:true,org.openhab.io.transport.serial@default:default,org.openhab.ui.classicui@default:default,org.openhab.ui.dashboard@default:true,org.openhab.ui.paperui@default:false"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
Expand Down
6 changes: 5 additions & 1 deletion targetplatform/openhab.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="openHAB 2 Target Platform" sequenceNumber="141">
<target name="openHAB 2 Target Platform" sequenceNumber="142">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.smarthome.feature.runtime.core.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -124,6 +124,10 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.paho.client.mqttv3" version="1.0.2"/>
<repository location="https://download.eclipse.org/paho/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.jmdns.feature.feature.group" version="3.4.2"/>
<repository location="https://www.openhab.org/jmdns/update-site/3.4.2/"/>
</location>
</locations>
</target>

0 comments on commit 343758d

Please sign in to comment.