mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-05 08:30:24 +00:00
#2076 - Remove JAXB as dependency of ebean-api
- Move JAXB detection to ebean-ddlgen - JAXB as test dependency of ebean-core
This commit is contained in:
1 parent
050a3e2368
commit
c783f26340
7 files changed
+26
-30
No files matched your search
+7
-8
@@ -54,6 +54,13 @@
|
||||
<version>12.4.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- test scope for supporting ebean-ddlgen -->
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jaxb</groupId>
|
||||
<artifactId>jaxb-runtime</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.ebean</groupId>
|
||||
@@ -112,14 +119,6 @@
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<!-- Provided scope to compile with java 11 -->
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jaxb</groupId>
|
||||
<artifactId>jaxb-runtime</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>javax.annotation-api</artifactId>
|
||||
|
||||
@@ -216,10 +216,6 @@ public class InternalConfiguration {
|
||||
}
|
||||
|
||||
private List<XmapEbean> readExternalMapping() {
|
||||
//TODO: Remove the isJavaxJAXBPresent() check once this is external module
|
||||
if (!config.getClassLoadConfig().isJavaxJAXBPresent()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
final XmapService xmapService = config.service(XmapService.class);
|
||||
if (xmapService == null) {
|
||||
return Collections.emptyList();
|
||||
|
||||
Reference in new issue
Block a user