mirror of
https://github.com/danieldemus/openhab-core.git
synced 2025-01-25 11:45:49 +01:00
Stop commons-net proliferation (#2151)
* Exclude commons-net from core dependencies so it is no longer automatically a transitive compile dependency * Update nrjavaserial compile dependency to a version that no longer includes commons-net packages * Define and use commons.net.version property * Rework features so commons-net is only installed when required Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
parent
ec76baa881
commit
d50ea56da8
@ -187,12 +187,24 @@
|
||||
<artifactId>javaxcomm</artifactId>
|
||||
<version>1.0.1</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.neuronrobotics</groupId>
|
||||
<artifactId>nrjavaserial</artifactId>
|
||||
<version>3.12.0</version>
|
||||
<version>3.14.0</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- Servlet and JAX-RS API -->
|
||||
|
@ -14,6 +14,11 @@
|
||||
<name>openHAB Core :: Bundles :: Serial Transport for RFC2217</name>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
<version>${commons.net.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openhab.core.bundles</groupId>
|
||||
<artifactId>org.openhab.core.io.transport.serial.rxtx</artifactId>
|
||||
|
@ -370,8 +370,6 @@
|
||||
</feature>
|
||||
|
||||
<feature name="openhab-runtime-base" description="openHAB Runtime Base" version="${project.version}">
|
||||
<requirement>openhab.tp;filter:="(feature=commons-net)"</requirement>
|
||||
<feature dependency="true">openhab.tp-commons-net</feature>
|
||||
<feature>openhab-core-base</feature>
|
||||
<feature>openhab-core-auth-jaas</feature>
|
||||
<feature>openhab-core-automation-rest</feature>
|
||||
|
1
pom.xml
1
pom.xml
@ -70,6 +70,7 @@
|
||||
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
|
||||
|
||||
<bnd.version>5.2.0</bnd.version>
|
||||
<commons.net.version>3.7.2</commons.net.version>
|
||||
<eea.version>2.2.1</eea.version>
|
||||
<karaf.compile.version>4.2.1</karaf.compile.version>
|
||||
<karaf.tooling.version>4.2.7</karaf.tooling.version>
|
||||
|
Loading…
Reference in New Issue
Block a user