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

Upgrade Maven compiler and fix/upgrade some TP dependencies (#1683)

Browse Source 
Upgrades the compiler and its dependencies so the compiler results of Maven builds are more similar to those generated in recent Eclipse versions.

To fix compilation issues in Eclipse for add-ons using classes from javax.xml.stream several dependencies were upgraded/excluded.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-10-02 23:36:37 +02:00
committed by GitHub
parent 3b16f2ce7c
commit 3bf2f4934d
32 changed files with 190 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bom/compile/pom.xml
+22 -24
View File
@@ -252,10 +252,6 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -279,31 +275,33 @@
<!-- JAXB -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>2.2.11_1</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JAX-WS -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
<version>1.3.23_2</version>
<artifactId>org.apache.servicemix.specs.saaj-api-1.4</artifactId>
<version>1.4_2</version>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- jose4j -->
bom/runtime/pom.xml
+22 -17
View File
@@ -137,24 +137,29 @@
<scope>compile</scope>
</dependency>
<!-- JAX-B 2.2 API -->
<!-- JAX-B 2.3 API -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
<version>2.9.0</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>2.2.11_1</version>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgi-resource-locator</artifactId>
<version>1.0.3</version>
</dependency>
<!-- Activation 1.1 API -->
<!-- Activation 1.2 API -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
<version>2.9.0</version>
<artifactId>org.apache.servicemix.specs.activation-api-1.2.1</artifactId>
<version>1.2.1_2</version>
<scope>compile</scope>
</dependency>
@@ -173,25 +178,25 @@
<scope>compile</scope>
</dependency>
<!-- JAX-WS 2.2 API -->
<!-- JAX-WS 2.3 API -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
<version>2.9.0</version>
<artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId>
<version>2.3_3</version>
<scope>compile</scope>
</dependency>
<!-- SAAJ 1.3 API -->
<!-- SAAJ 1.4 API -->
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
<version>2.9.0</version>
<artifactId>org.apache.servicemix.specs.saaj-api-1.4</artifactId>
<version>1.4_2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
<version>1.3.23_2</version>
<version>1.4.0_2</version>
</dependency>
<!-- OSGi Function -->
bom/test/pom.xml
+5 -4
View File
@@ -16,6 +16,11 @@
<name>openHAB Core :: BOM :: Test</name>
<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.annotation</artifactId>
@@ -61,10 +66,6 @@
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.9</version>
<exclusions>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>