You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/10/28 10:25:11 UTC
[isis] branch v2 updated: ISIS-1277: updates JAX-B runtime to
newest beta, such that code can run on JDK 11+
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 18ff60c ISIS-1277: updates JAX-B runtime to newest beta, such that code can run on JDK 11+
18ff60c is described below
commit 18ff60c3e1725dfee669dac01ff5307970ec837b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Oct 28 11:24:19 2018 +0100
ISIS-1277: updates JAX-B runtime to newest beta, such that code can run
on JDK 11+
---
core/plugins/jaxrs-resteasy-4/pom.xml | 29 +++++++++++++++++++---
.../isis/core/runtime/headless/IsisSystem.java | 2 --
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/core/plugins/jaxrs-resteasy-4/pom.xml b/core/plugins/jaxrs-resteasy-4/pom.xml
index 6a8ab39..d78baab 100644
--- a/core/plugins/jaxrs-resteasy-4/pom.xml
+++ b/core/plugins/jaxrs-resteasy-4/pom.xml
@@ -67,15 +67,38 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
+ <artifactId>resteasy-jackson-provider</artifactId>
<version>${resteasy4-jaxrs.version}</version>
</dependency>
-
+
+ <!-- OVERRIDES RestEasy JAX-B 2.3, to be the newest,
+ such that code can run on JDK 11+ -->
<dependency>
<groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
<version>${resteasy4-jaxrs.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId> <!-- 2.3 cannot run on JDK 11+ -->
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId> <!-- 2.3 cannot run on JDK 11+ -->
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.4.0-b180830.0359</version> <!-- 2.4 not released yet -->
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version> <!-- 2.4 not released yet -->
</dependency>
+ <!-- end of OVERRIDES -->
<!-- RestEasy -->
<dependency>
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
index 16ad411..aee3a01 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
@@ -28,13 +28,11 @@ import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.headless.auth.AuthenticationRequestNameOnly;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;