unwrap some features (openhab#5701)

* unwrap some features Signed-off-by: Jan N. Klug <jan.n.klug@rub.de> Signed-off-by: Pshatsillo <pshatsillo@gmail.com>
Pshatsillo · Jun 19, 2019 · abb66ea · abb66ea
1 parent 7195dd9
commit abb66ea
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 20 deletions.
diff --git a/bundles/org.openhab.binding.avmfritz/src/main/feature/feature.xml b/bundles/org.openhab.binding.avmfritz/src/main/feature/feature.xml
@@ -5,8 +5,7 @@
  <feature name="openhab-binding-avmfritz" description="AVM FRITZ!Box Binding" version="${project.version}">
  <feature>openhab-runtime-base</feature>
  <feature>openhab-transport-upnp</feature>
- <feature prerequisite="true">wrap</feature>
- <bundle dependency="true">wrap:mvn:javax.activation/activation/1.1.1$Bundle-Name=Javax%20Activation&amp;Bundle-SymbolicName=javax.activation.activation&amp;Bundle-Version=1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
  <bundle dependency="true">mvn:javax.xml.bind/jaxb-api/2.2.12</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-impl/2.2.11</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-core/2.2.11</bundle>

diff --git a/bundles/org.openhab.binding.denonmarantz/src/main/feature/feature.xml b/bundles/org.openhab.binding.denonmarantz/src/main/feature/feature.xml
@@ -5,8 +5,7 @@
  <feature name="openhab-binding-denonmarantz" description="DenonMarantz Binding" version="${project.version}">
  <feature>openhab-runtime-base</feature>
  <feature>openhab-transport-mdns</feature>
- <feature prerequisite="true">wrap</feature>
- <bundle dependency="true">wrap:mvn:javax.activation/activation/1.1.1$Bundle-Name=Javax%20Activation&amp;Bundle-SymbolicName=javax.activation.activation&amp;Bundle-Version=1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
  <bundle dependency="true">mvn:javax.xml.bind/jaxb-api/2.2.12</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-impl/2.2.11</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-core/2.2.11</bundle>

diff --git a/bundles/org.openhab.binding.dlinksmarthome/src/main/feature/feature.xml b/bundles/org.openhab.binding.dlinksmarthome/src/main/feature/feature.xml
@@ -7,7 +7,7 @@
  <feature>openhab-transport-mdns</feature>
  <feature prerequisite="true">wrap</feature>
  <!-- JAXB bundles -->
- <bundle dependency="true">wrap:mvn:javax.activation/activation/1.1.1$Bundle-Name=Javax%20Activation&amp;Bundle-SymbolicName=javax.activation.activation&amp;Bundle-Version=1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
  <bundle dependency="true">mvn:javax.xml.bind/jaxb-api/2.2.12</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-impl/2.2.11</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-core/2.2.11</bundle>

diff --git a/bundles/org.openhab.binding.lgwebos/src/main/feature/feature.xml b/bundles/org.openhab.binding.lgwebos/src/main/feature/feature.xml
@@ -7,8 +7,8 @@
  <feature prerequisite="true">wrap</feature>
  <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.4</bundle>
  <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
- <bundle dependency="true">wrap:mvn:xpp3/xpp3/1.1.4c$Bundle-Name=MXP1%20XmlPull%20Engine&amp;Bundle-SymbolicName=xpp3.xpp3&amp;Bundle-Version=1.1.4.c</bundle>
- <bundle dependency="true">wrap:mvn:org.json/json/20140107$Bundle-Name=JSON%20in%20Java&amp;Bundle-SymbolicName=org.json.json&amp;Bundle-Version=20140107</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_7</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json/20140107_1</bundle>
  <bundle dependency="true">wrap:mvn:org.java-websocket/java-websocket/1.3.2$Bundle-Name=Java%20Websocket%20Client&amp;Bundle-SymbolicName=org.java-websocket.java-websocket&amp;Bundle-Version=1.3.2</bundle>
  <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.lgwebos/${project.version}</bundle>
  </feature>

diff --git a/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml b/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
@@ -6,9 +6,8 @@
  <feature>openhab-runtime-base</feature>
  <feature>openhab-runtime-jna</feature>
  <feature>openhab-transport-serial</feature>
- <feature prerequisite="true">wrap</feature>
  <!-- JAXB bundles -->
- <bundle dependency="true">wrap:mvn:javax.activation/activation/1.1.1$Bundle-Name=Javax%20Activation&amp;Bundle-SymbolicName=javax.activation.activation&amp;Bundle-Version=1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
  <bundle dependency="true">mvn:javax.xml.bind/jaxb-api/2.2.12</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-impl/2.2.11</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-core/2.2.11</bundle>

diff --git a/bundles/org.openhab.binding.xmltv/src/main/feature/feature.xml b/bundles/org.openhab.binding.xmltv/src/main/feature/feature.xml
@@ -4,8 +4,7 @@
 
  <feature name="openhab-binding-xmltv" description="XMLTV Binding" version="${project.version}">
  <feature>openhab-runtime-base</feature>
- <feature prerequisite="true">wrap</feature>
- <bundle dependency="true">wrap:mvn:javax.activation/activation/1.1.1$Bundle-Name=Javax%20Activation&amp;Bundle-SymbolicName=javax.activation.activation&amp;Bundle-Version=1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
  <bundle dependency="true">mvn:javax.xml.bind/jaxb-api/2.2.12</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-impl/2.2.11</bundle>
  <bundle dependency="true">mvn:com.sun.xml.bind/jaxb-core/2.2.11</bundle>

diff --git a/bundles/org.openhab.io.mqttembeddedbroker/src/main/feature/feature.xml b/bundles/org.openhab.io.mqttembeddedbroker/src/main/feature/feature.xml
@@ -6,13 +6,13 @@
  <feature>openhab-runtime-base</feature>
  <feature>openhab-transport-mqtt</feature>
  <feature prerequisite="true">wrap</feature>
- <bundle dependency="true">wrap:mvn:io.netty/netty-common/4.1.34.Final$Bundle-Name=Netty%20Common&amp;Bundle-SymbolicName=io.netty.netty-common&amp;Bundle-Version=4.1.34</bundle>
- <bundle dependency="true">wrap:mvn:io.netty/netty-buffer/4.1.34.Final$Bundle-Name=Netty%20Buffer&amp;Bundle-SymbolicName=io.netty.netty-buffer&amp;Bundle-Version=4.1.34</bundle>
- <bundle dependency="true">wrap:mvn:io.netty/netty-transport/4.1.34.Final$Bundle-Name=Netty%20Transport&amp;Bundle-SymbolicName=io.netty.netty-transport&amp;Bundle-Version=4.1.34</bundle>
- <bundle dependency="true">wrap:mvn:io.netty/netty-codec/4.1.34.Final$Bundle-Name=Netty%20Codec&amp;Bundle-SymbolicName=io.netty.netty-codec&amp;Bundle-Version=4.1.34</bundle>
- <bundle dependency="true">wrap:mvn:io.netty/netty-codec-mqtt/4.1.34.Final$Bundle-Name=Netty%20Codec&amp;Bundle-SymbolicName=io.netty.netty-codec-mqtt&amp;Bundle-Version=4.1.34</bundle>
- <bundle dependency="true">wrap:mvn:io.netty/netty-resolver/4.1.34.Final$Bundle-Name=Netty%20Resolver&amp;Bundle-SymbolicName=io.netty.netty-resolver&amp;Bundle-Version=4.1.34</bundle>
- <bundle dependency="true">wrap:mvn:io.netty/netty-handler/4.1.34.Final$Bundle-Name=Netty%20Handler&amp;Bundle-SymbolicName=io.netty.netty-handler&amp;Bundle-Version=4.1.34</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-common/4.1.34.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-buffer/4.1.34.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-transport/4.1.34.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-codec/4.1.34.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-codec-mqtt/4.1.34.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-resolver/4.1.34.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-handler/4.1.34.Final</bundle>
  <bundle dependency="true">mvn:com.h2database/h2-mvstore/1.4.199</bundle>
  <bundle dependency="true">wrap:mvn:io.moquette/moquette-broker/0.12.1$Bundle-Name=Moquette%20MQTT%20Broker&amp;Bundle-SymbolicName=io.moquette.moquette-broker&amp;Bundle-Version=0.12.1</bundle>
  <bundle start-level="75">mvn:org.openhab.addons.bundles/org.openhab.io.mqttembeddedbroker/${project.version}</bundle>

diff --git a/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml b/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml
@@ -6,8 +6,8 @@
  <feature>openhab-runtime-base</feature>
  <feature prerequisite="true">wrap</feature>
  <bundle dependency="true">mvn:org.json/json/20180813</bundle>
- <bundle dependency="true">wrap:mvn:com.squareup.okhttp3/okhttp/3.12.1$Bundle-Name=OkHttp&amp;Bundle-SymbolicName=com.squareup.okhttp&amp;Bundle-Version=3.12.1</bundle>
- <bundle dependency="true">wrap:mvn:com.squareup.okio/okio/1.15.0$Bundle-Name=Okio&amp;Bundle-SymbolicName=com.squareup.okio&amp;Bundle-Version=1.15.0</bundle> 
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.12.1_1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.15.0_1</bundle>
  <bundle dependency="true">wrap:mvn:io.socket/socket.io-client/1.0.0$Bundle-Name=Socket.IO%20Client&amp;Bundle-SymbolicName=io.socket.socket.io-client&amp;Bundle-Version=1.0.0</bundle>
  <bundle dependency="true">wrap:mvn:io.socket/engine.io-client/1.0.0$Bundle-Name=Engine.IO%20Client&amp;Bundle-SymbolicName=io.socket.engine.io-client&amp;Bundle-Version=1.0.0</bundle>
  <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.io.openhabcloud/${project.version}</bundle>