Skip to content
Snippets Groups Projects
Commit 08c43495 authored by Otto Visser's avatar Otto Visser
Browse files

Make it Java 11 compatible

parent 8b182d81
No related branches found
No related tags found
1 merge request!105WIP: Resolve "Make queue and build process fully java 11 compatible"
......@@ -99,6 +99,12 @@ dependencies {
compile "com.sun.mail:javax.mail:1.6.2"
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
// replacement for deprecated JDK module java.xml.bind
runtimeOnly 'javax.xml.bind:jaxb-api'
runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:2.3.0.1'
runtimeOnly 'org.glassfish:javax.json:1.1.2'
runtimeOnly 'org.eclipse:yasson:1.0.1'
testCompile('org.springframework.boot:spring-boot-starter-test')
testCompile group: 'org.springframework.security', name: 'spring-security-test', version: '4.2.7.RELEASE'
......@@ -143,3 +149,13 @@ jacocoTestReport {
}
}
// to get it to work again with JDK 10
//tasks.withType(AbstractCompile) {
//options.compilerArgs += ["--add-modules", "java.xml.bind"]
//}
//tasks.withType(Test) {
//jvmArgs += ["--add-modules", "java.xml.bind"]
//}
......@@ -255,7 +255,7 @@
<div class="col-sm-12" style="margin-top:1em;">
<h3>Requests for this lab</h3>
<p>
<p th:unless="${(#authenticated.teaches(course) || #authenticated.assists(course) || #authenticated.manages(course))}">
<th:block th:if="${lab.isEnqueued(#authentication.principal.user)}">
You are waiting to be processed.
</th:block>
......@@ -323,7 +323,7 @@
</td>
</tr>
<!--todo: make the line below depend on whether you are teacher or student-->
<tr th:if="${lab.countRequestsBy(#authentication.principal.user) == 0}">
<tr th:if="${lab.countRequestsBy(#authentication.principal.user) == 0 && !#authenticated.teaches(course)}">
<td colspan="5">You don't have any requests yet for this lab.</td>
</tr>
</tbody>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment