Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[xmppclient] Update smack to 4.4.4 and fix dependencies #11670

Closed
wants to merge 3 commits into from
Closed

[xmppclient] Update smack to 4.4.4 and fix dependencies #11670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f42234
[xmppclient] Fix dependencies and update smack to 4.4.4
fwolter Nov 27, 2021
e4c78f0
Remove smack-resolver-minidns
fwolter Nov 30, 2021
1928773
Cleanup xmlpull dependencies; add missing dependencies to features.xm…
fwolter Nov 30, 2021
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
Empty file removed bundles/org.openhab.binding.xmppclient/noEmbedDependencies.profile
View file
Open in desktop
Empty file.
110 changes: 101 additions & 9 deletions bundles/org.openhab.binding.xmppclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,45 +15,137 @@
<name>openHAB Add-ons :: Bundles :: XMPPClient Binding</name>

<properties>
<smack.version>4.3.3</smack.version>
<smack.version>4.4.4</smack.version>
<bnd.importpackage>
!android.*,!sun.security.*
</bnd.importpackage>
</properties>

<dependencies>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-java7</artifactId>
<artifactId>smack-core</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>${smack.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-xmlparser</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>${smack.version}</version>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-xmlparser-xpp3</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>${smack.version}</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Smack on Java SE does not use xpp3, so it should be possible to drop this.

<artifactId>xpp3</artifactId>
<version>1.1.4c</version>
</dependency>
<dependency>
<groupId>org.jxmpp</groupId>
<artifactId>jxmpp-core</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.jxmpp</groupId>
<artifactId>jxmpp-util-cache</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.jxmpp</groupId>
<artifactId>jxmpp-jid</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>1.0.3</version>
</dependency>

<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-java8</artifactId>
<version>${smack.version}</version>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-sasl-javax</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>${smack.version}</version>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-resolver-javax</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You want to add this dependency explicitly if you want to use the javax resolver instead of MiniDNS.

<version>${smack.version}</version>
</dependency>

<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-extensions</artifactId>
<version>${smack.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-im</artifactId>
<version>${smack.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-tcp</artifactId>
<version>${smack.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-streammanagement</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>${smack.version}</version>
</dependency>

<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-experimental</artifactId>
<version>${smack.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hsluv</groupId>
<artifactId>hsluv</artifactId>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You usually don't want to add this dependency explicitly.

<version>0.2</version>
</dependency>

<dependency>
<groupId>org.minidns</groupId>
<artifactId>minidns-core</artifactId>
<version>0.3.3</version>
<scope>provided</scope>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.0</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.0</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.0</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>9.0</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.0</version>
</dependency>
</dependencies>

Expand Down
37 changes: 21 additions & 16 deletions bundles/org.openhab.binding.xmppclient/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,27 @@

<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>
<!-- 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>
<feature prerequisite="true">wrap</feature>
<bundle>mvn:org.jxmpp/jxmpp-core/1.0.3</bundle>
<bundle>mvn:org.jxmpp/jxmpp-jid/1.0.3</bundle>
<bundle>mvn:org.jxmpp/jxmpp-util-cache/1.0.3</bundle>
<bundle>mvn:org.minidns/minidns-core/1.0.2</bundle>
<bundle>wrap:mvn:org.igniterealtime.smack/smack-core/4.4.4$Import-Package=!sun.security.pkcs11,org.jivesoftware.*&amp;overwrite=merge</bundle>
<bundle>mvn:org.igniterealtime.smack/smack-extensions/4.4.4</bundle>
<bundle>mvn:org.igniterealtime.smack/smack-experimental/4.4.4</bundle>
<bundle>wrap:mvn:org.hsluv/hsluv/0.2</bundle>
<bundle>mvn:org.igniterealtime.smack/smack-im/4.4.4</bundle>
<bundle>mvn:org.igniterealtime.smack/smack-tcp/4.4.4</bundle>
<bundle>mvn:org.igniterealtime.smack/smack-streammanagement/4.4.4</bundle>
<bundle>mvn:org.igniterealtime.smack/smack-resolver-javax/4.4.4</bundle>
<bundle>mvn:org.igniterealtime.smack/smack-sasl-javax/4.4.4</bundle>
<bundle>mvn:org.igniterealtime.smack/smack-java8/4.4.4</bundle>
<!-- SPI Fly provides the ServiceLoader for OSGi, required by smack-xmlparser -->
<bundle start-level="50">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.framework.extension/1.3.2</bundle>
<bundle start-level="50">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.2</bundle>
<bundle start-level="50">wrap:mvn:xpp3/xpp3/1.1.4c</bundle>
<bundle start-level="60">mvn:org.igniterealtime.smack/smack-xmlparser-xpp3/4.4.4</bundle>
<bundle start-level="70">mvn:org.igniterealtime.smack/smack-xmlparser/4.4.4</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.xmppclient/${project.version}</bundle>
</feature>
</features>