Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Queue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Queue
Commits
08c43495
Commit
08c43495
authored
Feb 1, 2019
by
Otto Visser
Browse files
Options
Downloads
Patches
Plain Diff
Make it Java 11 compatible
parent
8b182d81
No related branches found
No related tags found
1 merge request
!105
WIP: Resolve "Make queue and build process fully java 11 compatible"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.gradle
+16
-0
16 additions, 0 deletions
build.gradle
src/main/resources/templates/lab/view.html
+2
-2
2 additions, 2 deletions
src/main/resources/templates/lab/view.html
with
18 additions
and
2 deletions
build.gradle
+
16
−
0
View file @
08c43495
...
...
@@ -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"]
//}
This diff is collapsed.
Click to expand it.
src/main/resources/templates/lab/view.html
+
2
−
2
View file @
08c43495
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment