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

Move to JUPnP v3.0.1 (#4165)

Browse Source 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2024-04-02 18:21:57 +02:00 committed by GitHub
parent 9f5a60d6fa
commit dcfadaede6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bom/compile/pom.xml
View File

@ -203,7 +203,7 @@
<dependency> <dependency>
<groupId>org.jupnp</groupId> <groupId>org.jupnp</groupId>
<artifactId>org.jupnp</artifactId> <artifactId>org.jupnp</artifactId>
<version>3.0.0</version> <version>3.0.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

2
bom/runtime/pom.xml
View File

@ -475,7 +475,7 @@
<dependency> <dependency>
<groupId>org.jupnp</groupId> <groupId>org.jupnp</groupId>
<artifactId>org.jupnp</artifactId> <artifactId>org.jupnp</artifactId>
<version>3.0.0</version> <version>3.0.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

2
bundles/org.openhab.core.config.jupnp/pom.xml
View File

@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>org.jupnp</groupId> <groupId>org.jupnp</groupId>
<artifactId>org.jupnp</artifactId> <artifactId>org.jupnp</artifactId>
<version>3.0.0</version> <version>3.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>

8
bundles/org.openhab.core.config.jupnp/src/main/java/org/openhab/core/config/jupnp/internal/OHUpnpServiceConfiguration.java
View File

@ -20,6 +20,8 @@ import org.jupnp.UpnpServiceConfiguration;
import org.openhab.basefixes.util.concurrent.LinkedTransferQueue; import org.openhab.basefixes.util.concurrent.LinkedTransferQueue;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy; import org.osgi.service.component.annotations.ConfigurationPolicy;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.http.HttpService;
/** /**
* Uses the Java 11 {@link LinkedTransferQueue} with jUPnP as workaround for the buggy OpenJDK 17 implementation. * Uses the Java 11 {@link LinkedTransferQueue} with jUPnP as workaround for the buggy OpenJDK 17 implementation.
@ -33,6 +35,12 @@ import org.osgi.service.component.annotations.ConfigurationPolicy;
*/ */
@Component(configurationPid = "org.jupnp", configurationPolicy = ConfigurationPolicy.REQUIRE, service = UpnpServiceConfiguration.class) @Component(configurationPid = "org.jupnp", configurationPolicy = ConfigurationPolicy.REQUIRE, service = UpnpServiceConfiguration.class)
public class OHUpnpServiceConfiguration extends OSGiUpnpServiceConfiguration { public class OHUpnpServiceConfiguration extends OSGiUpnpServiceConfiguration {
@Reference
@Override
public void setHttpService(HttpService httpService) {
super.setHttpService(httpService);
}
@Override @Override
protected ExecutorService createMainExecutorService() { protected ExecutorService createMainExecutorService() {
return QueueingThreadPoolExecutor.createInstance("upnp-main", threadPoolSize, new LinkedTransferQueue<>()); return QueueingThreadPoolExecutor.createInstance("upnp-main", threadPoolSize, new LinkedTransferQueue<>());

4
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -194,14 +194,14 @@
</feature> </feature>
<feature name="openhab.tp-jupnp" description="UPnP/DLNA library for Java" version="${project.version}"> <feature name="openhab.tp-jupnp" description="UPnP/DLNA library for Java" version="${project.version}">
<capability>openhab.tp;feature=jupnp;version=3.0.0</capability> <capability>openhab.tp;feature=jupnp;version=3.0.1</capability>
<feature dependency="true">http</feature> <feature dependency="true">http</feature>
<feature dependency="true">scr</feature> <feature dependency="true">scr</feature>
<feature dependency="true">openhab.tp-httpclient</feature> <feature dependency="true">openhab.tp-httpclient</feature>
<!-- Use the Java 11 LinkedTransferQueue as workaround for JDK-8301341 --> <!-- Use the Java 11 LinkedTransferQueue as workaround for JDK-8301341 -->
<bundle>mvn:org.openhab/base-fixes/1.0.0</bundle> <bundle>mvn:org.openhab/base-fixes/1.0.0</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.jupnp/${project.version}</bundle> <bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.jupnp/${project.version}</bundle>
<bundle>mvn:org.jupnp/org.jupnp/3.0.0</bundle> <bundle>mvn:org.jupnp/org.jupnp/3.0.1</bundle>
</feature> </feature>
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}"> <feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">