This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch UNOMI-259-jdk11-support in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 516d24f097905478e06d50bb3ec580c2f2a5118f Author: Taybou <[email protected]> AuthorDate: Thu Dec 12 16:01:17 2019 +0100 UNOMI-259 support jdk 11 (WIP) --- api/pom.xml | 39 ++++++++++++++++++++++++++++++++++ persistence-elasticsearch/core/pom.xml | 9 +++++--- persistence-elasticsearch/pom.xml | 22 ++++++++++++++++++- plugins/baseplugin/pom.xml | 4 +++- plugins/mail/pom.xml | 14 ++++++++++++ plugins/request/pom.xml | 5 +++++ pom.xml | 19 +++++++++-------- rest/pom.xml | 2 +- 8 files changed, 99 insertions(+), 15 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 3791122..a452cad 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -30,6 +30,22 @@ <description>Main API of the Apache Unomi Context server</description> <packaging>bundle</packaging> + <dependencies> + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>2.3.2</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.2</version> + <scope>provided</scope> + </dependency> + </dependencies> + <reporting> <plugins> <plugin> @@ -67,4 +83,27 @@ </plugin> </plugins> </reporting> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>4.2.1</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Import-Package> + org.jvnet.staxex;resolution:=optional, + org.glassfish.hk2.osgiresourcelocator;resolution:=optional, + javax.activation;resolution:=optional, + com.sun.xml.*;resolution:=optional, + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml index 69c43fd..5b9d569 100644 --- a/persistence-elasticsearch/core/pom.xml +++ b/persistence-elasticsearch/core/pom.xml @@ -133,14 +133,14 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.6.2</version> + <version>2.12.1</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.6.2</version> + <version>2.12.1</version> <scope>compile</scope> <exclusions> <exclusion> @@ -153,7 +153,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> - <version>2.6.2</version> + <version>2.12.1</version> <scope>compile</scope> <exclusions> <exclusion> @@ -223,6 +223,9 @@ <configuration> <instructions> <Import-Package> + org.jctools.queues;resolution:=optional, + org.apache.logging.log4j.util.internal;resolution:=optional, + com.conversantmedia.util.concurrent;resolution:=optional, com.carrotsearch.randomizedtesting;resolution:=optional, com.fasterxml.jackson.*;resolution:=optional, com.google.appengine.api;resolution:=optional, diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml index 9975fa2..2ff1d71 100644 --- a/persistence-elasticsearch/pom.xml +++ b/persistence-elasticsearch/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -34,4 +35,23 @@ <module>core</module> </modules> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>4.2.1</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Import-Package> + com.conversantmedia.util.concurrent;resolution:=optional, + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml index d72a688..0e61331 100644 --- a/plugins/baseplugin/pom.xml +++ b/plugins/baseplugin/pom.xml @@ -70,7 +70,7 @@ <artifactId>ognl</artifactId> </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> <dependency> @@ -105,6 +105,8 @@ <instructions> <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> <Import-Package> + jdk.internal.module;resolution:=optional, + com.sun.tools.attach;resolution:=optional, javassist;resolution:=optional, !com.sun.jdi*, * diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml index bed1ffe..1d18d77 100644 --- a/plugins/mail/pom.xml +++ b/plugins/mail/pom.xml @@ -51,6 +51,20 @@ <build> <plugins> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Import-Package> + javax.activation;resolution:=optional, + * + </Import-Package> + </instructions> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml index 516e787..4cc8f83 100644 --- a/plugins/request/pom.xml +++ b/plugins/request/pom.xml @@ -160,6 +160,11 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index 50032fd..314bc39 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <cxf.version>3.3.2</cxf.version> + <cxf.version>3.3.4</cxf.version> <version.jackson.core>2.9.10</version.jackson.core> <version.jackson.databind>2.9.10.1</version.jackson.databind> <version.jackson.jaxb>2.9.10</version.jackson.jaxb> @@ -73,8 +73,10 @@ <version.pax.exam>4.13.1</version.pax.exam> <elasticsearch.version>7.4.2</elasticsearch.version> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <java.version>11</java.version> + + <maven.compiler.source>${java.version}</maven.compiler.source> + <maven.compiler.target>${java.version}</maven.compiler.target> <scala.version>2.11.4</scala.version> <encoding>UTF-8</encoding> @@ -426,7 +428,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> - <version>1.8</version> + <version>${java.version}</version> <configuration> <verbose>false</verbose> <addSvnKeyWords>true</addSvnKeyWords> @@ -933,9 +935,9 @@ <version>3.0.11</version> </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.11.0.GA</version> + <version>3.23.1-GA</version> </dependency> <dependency> <groupId>org.antlr</groupId> @@ -1104,10 +1106,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> + <version>3.7.0</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <release>${java.version}</release> </configuration> </plugin> <plugin> diff --git a/rest/pom.xml b/rest/pom.xml index 5188db5..7476188 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -171,7 +171,7 @@ <plugin> <groupId>com.qmino</groupId> <artifactId>miredot-plugin</artifactId> - <version>2.1.2</version> + <version>2.2.1-Java10</version> <executions> <execution> <goals>
