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 2020/10/07 12:27:19 UTC
[isis] branch 2441-auditing updated: ISIS-2441: fixes JDK 11 build
(commons)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2441-auditing
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2441-auditing by this push:
new 3c416f3 ISIS-2441: fixes JDK 11 build (commons)
3c416f3 is described below
commit 3c416f3398c00befefb734526a7f88db5f6b6bd2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 7 14:27:05 2020 +0200
ISIS-2441: fixes JDK 11 build (commons)
---
commons/pom.xml | 51 +++++++++++++++++++---
.../isis/commons/internal/resources/_Xml.java | 5 +--
2 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/commons/pom.xml b/commons/pom.xml
index 04eee73..2d6e1ae 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -53,6 +53,48 @@
</resources>
</build>
+ <profiles>
+ <profile>
+ <id>jdk11-supplemental</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+
+ <!-- These dependencies are required in order to build on jdk11 -->
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>0.14.0</version>
+ <configuration>
+ <removeOldOutput>true</removeOldOutput>
+ <episode>true</episode>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+
<dependencies>
<!-- JEE API -->
@@ -105,8 +147,7 @@
<!-- Add Log4j2 Dependency, as a replacement for Spring's default 'logback'.
This requires for the 'spring-boot-starter' to exclude the default logging
- artifact 'org.springframework.boot:spring-boot-starter-logging'
- see https://www.callicoder.com/spring-boot-log4j-2-example/ -->
+ artifact 'org.springframework.boot:spring-boot-starter-logging' see https://www.callicoder.com/spring-boot-log4j-2-example/ -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
@@ -140,9 +181,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/resources/_Xml.java b/commons/src/main/java/org/apache/isis/commons/internal/resources/_Xml.java
index f82eed3..8b51201 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/resources/_Xml.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/resources/_Xml.java
@@ -43,11 +43,10 @@ import lombok.val;
* <h1>- internal use only -</h1>
* <p>
* Utilities for the XML format.
- * </p>
* <p>
- * <b>WARNING</b>: Do <b>NOT</b> use any of the classes provided by this package! <br/>
+ * <b>WARNING</b>: Do <b>NOT</b> use any of the classes provided by this package!
+ * <br/>
* These may be changed or removed without notice!
- * </p>
* @since 2.0
*/
public final class _Xml {