Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion bom/compile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,25 @@
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp</artifactId>
<version>3.0.5</version>
<version>${jupnp.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp.transport.jetty9</artifactId>
<version>${jupnp.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp.transport.javax.servlet</artifactId>
<version>${jupnp.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp.transport.javax.httpservice</artifactId>
<version>${jupnp.version}</version>
<scope>compile</scope>
</dependency>

Expand Down
20 changes: 19 additions & 1 deletion bom/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,25 @@
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp</artifactId>
<version>3.0.5</version>
<version>${jupnp.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp.transport.jetty9</artifactId>
<version>${jupnp.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp.transport.javax.servlet</artifactId>
<version>${jupnp.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jupnp</groupId>
<artifactId>org.jupnp.transport.javax.httpservice</artifactId>
<version>${jupnp.version}</version>
<scope>compile</scope>
</dependency>

Expand Down
12 changes: 10 additions & 2 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,19 @@
</feature>

<feature name="openhab.tp-jupnp" description="UPnP/DLNA library for Java" version="${project.version}">
<capability>openhab.tp;feature=jupnp;version=3.0.5</capability>
<capability>openhab.tp;feature=jupnp;version=${jupnp.version}</capability>
<feature dependency="true">http</feature>
<feature dependency="true">scr</feature>
<feature dependency="true">openhab.tp-httpclient</feature>
<bundle>mvn:org.jupnp/org.jupnp/3.0.5</bundle>
<bundle>mvn:org.jupnp/org.jupnp/${jupnp.version}</bundle>
<!-- jUPnP no longer bundles a transport implementation; the Jetty 9 transport (and the
generic servlet transport infrastructure it depends on) must be added explicitly. -->
<bundle>mvn:org.jupnp/org.jupnp.transport.javax.servlet/${jupnp.version}</bundle>
<bundle>mvn:org.jupnp/org.jupnp.transport.jetty9/${jupnp.version}</bundle>
<!-- Without this bridge, OSGiUpnpServiceConfiguration falls through to jetty9's standalone
StreamServer, which opens its own socket on the UPnP callback port (default 8080) instead
of sharing openHAB's existing HttpService - colliding with pax-web on that same port. -->
<bundle>mvn:org.jupnp/org.jupnp.transport.javax.httpservice/${jupnp.version}</bundle>
</feature>

<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<bouncycastle.version>1.85</bouncycastle.version>
<commons.net.version>3.13.0</commons.net.version>
<eea.version>2.4.0</eea.version>
<jupnp.version>4.0.0-SNAPSHOT</jupnp.version>
<karaf.compile.version>4.4.11</karaf.compile.version>
<karaf.tooling.version>4.4.11</karaf.tooling.version>
<sat.version>0.18.0</sat.version>
Expand Down
Loading