demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

[xmppclient] Fix bundle installation by upgrading dependency (#18983)

Browse Source 
Also-by: Wouter Born <github@maindrain.net>
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel
2025-09-07 14:44:42 +02:00
committed by GitHub
parent 458fc9550f
commit ef8976982e
3 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.xmppclient/pom.xml
+23 -3
View File
@@ -15,13 +15,33 @@
<name>openHAB Add-ons :: Bundles :: XMPPClient Binding</name>
<properties>
<smack.version>4.3.3</smack.version>
<smack.version>4.5.0-beta6</smack.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jxmpp</groupId>
<artifactId>jxmpp-core</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jxmpp</groupId>
<artifactId>jxmpp-jid</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.minidns</groupId>
<artifactId>minidns-core</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-java7</artifactId>
<artifactId>smack-java11</artifactId>
<version>${smack.version}</version>
<scope>provided</scope>
</dependency>
@@ -52,7 +72,7 @@
<dependency>
<groupId>org.minidns</groupId>
<artifactId>minidns-core</artifactId>
<version>0.3.3</version>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
bundles/org.openhab.binding.xmppclient/src/main/feature/feature.xml
+17 -15
View File
@@ -4,22 +4,24 @@
<feature name="openhab-binding-xmppclient" description="XMPP Client Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-extensions/4.3.3</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-experimental/4.3.3</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-im/4.3.3</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-tcp/4.3.3</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-core/0.6.3</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-jid/0.6.3</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-util-cache/0.6.3</bundle>
<bundle dependency="true">mvn:org.minidns/minidns-core/0.3.3</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk15on/1.69</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-core/4.3.3</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-sasl-javax/4.3.3</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_7</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-extensions/4.5.0-beta6</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-experimental/4.5.0-beta6</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-im/4.5.0-beta6</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-tcp/4.5.0-beta6</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-xmlparser/4.5.0-beta6</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-streammanagement/4.5.0-beta6</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-core/1.1.0</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-jid/1.1.0</bundle>
<bundle dependency="true">mvn:org.jxmpp/jxmpp-util-cache/1.1.0</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/org.hsluv.hsluv/0.2</bundle>
<bundle dependency="true">mvn:org.minidns/minidns-core/1.1.1</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk18on/1.73</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/org.igniterealtime.smack.smack-core/4.5.0-beta6</bundle>
<bundle dependency="true">mvn:org.igniterealtime.smack/smack-sasl-javax/4.5.0-beta6</bundle>
<!-- FIXME: implicit dependencies required at runtime but not automatically installed, this is a workaround -->
<bundle start-level="80">mvn:org.igniterealtime.smack/smack-resolver-javax/4.3.3</bundle>
<bundle start-level="80">mvn:org.igniterealtime.smack/smack-java7/4.3.3</bundle>
<bundle start-level="80">mvn:org.igniterealtime.smack/smack-resolver-javax/4.5.0-beta6</bundle>
<bundle start-level="80">mvn:org.igniterealtime.smack/smack-java11/4.5.0-beta6</bundle>
<bundle start-level="80">mvn:org.igniterealtime.smack/smack-sasl-javax/4.5.0-beta6</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.xmppclient/${project.version}</bundle>
</feature>
</features>
bundles/org.openhab.binding.xmppclient/src/main/java/org/openhab/binding/xmppclient/internal/client/XMPPClient.java
+1 -1
View File
@@ -173,7 +173,7 @@ public class XMPPClient implements IncomingChatMessageListener, ConnectionListen
}
try {
EntityBareJid jid = JidCreate.entityBareFrom(to);
MultiUserChat chat = multiUserChatManager.getMultiUserChat(jid);
MultiUserChat chat = chatManager.getMultiUserChat(jid);
if (!chat.isJoined()) {
chat.join(Resourcepart.from(nickname));