This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch ISIS-2374
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6885434db74a52cf0929610ea6493edf9d597986
Author: Jörg Rade <joerg.r...@kuehne-nagel.com>
AuthorDate: Tue Jul 14 16:26:35 2020 +0200
ISIS-2374 with jdk11
---
api/schema/build.gradle | 6 ++++++
testing/unittestsupport/applib/build.gradle | 7 +++++++
valuetypes/asciidoc/ui/vaadin/build.gradle | 1 +
valuetypes/asciidoc/ui/vaadin/pom.xml | 26 ++++++++++++++++----------
viewers/wicket/model/pom.xml | 14 ++++++++++----
5 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/api/schema/build.gradle b/api/schema/build.gradle
index f14467d..4fa885c 100644
--- a/api/schema/build.gradle
+++ b/api/schema/build.gradle
@@ -1,5 +1,6 @@
description = 'Apache Isis Core - Schemas'
apply plugin: 'war'
+apply plugin: 'io.freefair.lombok'
sourceSets {
main {
@@ -14,6 +15,11 @@ dependencies {
compile 'org.springframework:spring-context:5.2.6.RELEASE'
compile 'joda-time:joda-time:2.10.6'
+
+ // These dependencies are required in order to build on jdk11
+ compile('javax.xml.bind:jaxb-api:2.3.1') // not set in POM`s ??
+ compile('com.sun.xml.bind:jaxb-core:2.3.0.1')
+ compile('com.sun.xml.bind:jaxb-impl:2.3.2')
}
task packageTests(type: Jar) {
diff --git a/testing/unittestsupport/applib/build.gradle
b/testing/unittestsupport/applib/build.gradle
index 80f6245..f2a89ee 100644
--- a/testing/unittestsupport/applib/build.gradle
+++ b/testing/unittestsupport/applib/build.gradle
@@ -25,6 +25,13 @@ dependencies {
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'org.datanucleus', name: 'javax.jdo', version: '3.2.0-m13'
+
+ compile
project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
+ testCompile
project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
+ testCompile project(':isis-parent:isis-applib')
+
+ // These dependencies are required in order to build on jdk11
+ compile('javax.xml.ws:jaxws-api:2.3.1')
}
task packageTests(type: Jar) {
diff --git a/valuetypes/asciidoc/ui/vaadin/build.gradle
b/valuetypes/asciidoc/ui/vaadin/build.gradle
index 4e18dc0..91d0c09 100644
--- a/valuetypes/asciidoc/ui/vaadin/build.gradle
+++ b/valuetypes/asciidoc/ui/vaadin/build.gradle
@@ -3,6 +3,7 @@ description = 'Apache Isis Val - Asciidoctor (ui vaadin)'
apply plugin: 'war'
dependencies {
providedCompile
project(':isis-parent:isis:isis-incubator:isis-viewer-vaadin:isis-viewer-vaadin-ui')
+ compile
project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
}
task packageTests(type: Jar) {
diff --git a/valuetypes/asciidoc/ui/vaadin/pom.xml
b/valuetypes/asciidoc/ui/vaadin/pom.xml
index fe94201..870ff47 100644
--- a/valuetypes/asciidoc/ui/vaadin/pom.xml
+++ b/valuetypes/asciidoc/ui/vaadin/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file
to
- you under the Apache License, Version 2.0 (the "License"); you may not
use
- this file except in compliance with the License. You may obtain a copy
of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
- by applicable law or agreed to in writing, software distributed under
the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
- OF ANY KIND, either express or implied. See the License for the
specific
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -29,7 +29,7 @@
</properties>
<dependencies>
-
+
<dependency>
<groupId>org.apache.isis.incubator.viewer</groupId>
<artifactId>isis-viewer-vaadin-ui</artifactId>
@@ -37,6 +37,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</project>
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index 38251ab..999b0eb 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -66,12 +66,12 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webapp</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-common</artifactId>
</dependency>
-
+
<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -86,6 +86,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
