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

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
@@ -103,7 +103,7 @@
<bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.1.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jaxrs/1.0.0</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.annotation-api-1.3/1.3_1</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/2.9.0</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/2.3_3</bundle>
<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/1.0.9</bundle>
<!-- END: https://issues.apache.org/jira/browse/KARAF-6536 -->
@@ -132,16 +132,17 @@
</feature>
<feature name="openhab.tp-jaxb" description="JAXB bundles" version="${project.version}">
<capability>openhab.tp;feature=jaxb;version=2.9.0</capability>
<bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
<bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/2.9.0</bundle>
<bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/2.2.11_1</bundle>
<capability>openhab.tp;feature=jaxb;version=2.3.3</capability>
<bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.2.1/1.2.1_2</bundle>
<bundle start-level="10">mvn:jakarta.xml.bind/jakarta.xml.bind-api/2.3.3</bundle>
<bundle start-level="20">mvn:com.sun.xml.bind/jaxb-osgi/2.3.3</bundle>
<bundle start-level="20">mvn:org.glassfish.hk2/osgi-resource-locator/1.0.3</bundle>
</feature>
<feature name="openhab.tp-jaxws" description="JAX-WS (SOAP) bundles" version="${project.version}">
<capability>openhab.tp;feature=jax-ws;version=2.9.0</capability>
<bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/2.9.0</bundle>
<bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/1.3.23_2</bundle>
<capability>openhab.tp;feature=jax-ws;version=1.4.0</capability>
<bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.4/1.4_2</bundle>
<bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/1.4.0_2</bundle>
<bundle start-level="20">mvn:org.jvnet.staxex/stax-ex/1.7.4</bundle>
</feature>