From 230ab9d9d4c861b467d750d8a4263e8d4800e191 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Fri, 26 Feb 2021 10:17:11 +0100
Subject: [PATCH] Added Maven profile for supporting Java 9+
---
README.md | 13 -------------
TASMAN-core/pom.xml | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 3dda138..1386460 100644
--- a/README.md
+++ b/README.md
@@ -22,19 +22,6 @@ See also the [CHANGELOG](CHANGELOG.md).
* **embedded**: build embedded package (to be run _locally!_)
* **installer**: build install script (produce self-extracting install.sh script)
-### WARNING: Java 8 is required
-
-Currently TASMAN needs Java 8, higher versions are not working.
-
-If your default Java installation is a higher version you have to set the `JAVA_HOME` variable while running the build.sh script.
-
- JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 ./build.sh installer
-
-In the same way you have to explicitly configure the Java binary to use in the `/opt/tasman/tasman` file:
-
- #!/bin/bash
- /usr/lib/jvm/java-8-openjdk-amd64/bin/java -jar /opt/tasman/tasman-embedded.jar $1
-
## Supported application servers
The web app has been tested with:
diff --git a/TASMAN-core/pom.xml b/TASMAN-core/pom.xml
index c55f25b..49579a7 100644
--- a/TASMAN-core/pom.xml
+++ b/TASMAN-core/pom.xml
@@ -37,6 +37,25 @@
</dependencies>
<profiles>
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <jdk>[9,</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
<profile>
<id>test</id>
<properties>
--
GitLab