Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/upse 285 #569

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ resourceServerVersion=1.0.48
resourceServer13Version=1.3.1
sakaiConnectorPortletVersion=1.5.2
simpleContentPortletVersion=3.3.2
uPortalVersion=5.11.1
uPortalVersion=5.11.2-SNAPSHOT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be removed

weatherPortletVersion=1.1.7
webProxyPortletVersion=2.3.4

Expand Down
2 changes: 1 addition & 1 deletion gradle/tasks/properties.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ task javaVersionCheck() {
description 'Ensures the current Java version is supported'

doLast {
def supportedJavaVersions = [ JavaVersion.VERSION_1_8 ];
def supportedJavaVersions = [ JavaVersion.VERSION_11, JavaVersion.VERSION_1_8 ];
def currentJavaVersion = JavaVersion.current();
if (!supportedJavaVersions.contains(currentJavaVersion)) {
throw new GradleException("Incorrect Java version; found ${currentJavaVersion} but supported versions are: ${supportedJavaVersions}");
Expand Down
4 changes: 2 additions & 2 deletions gradle/tasks/tomcat.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ task tomcatInstall() {

// Gunzip the Tomcat binaries
File tomcatTarGz = configurations.tomcat.files.iterator().next()
ant.gunzip(src: tomcatTarGz, dest: tomcatTarFile.getPath())
ant.gunzip(src: tomcatTarGz, dest: tomcatTarFile.getAbsolutePath())

// Un-archive the tar file
copy {
from tarTree(tomcatTarFile.getPath())
from tarTree(tomcatTarFile.getAbsolutePath())
Comment on lines -57 to +61
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why were these changes needed? In my Java 11 testing I haven't run into any issues with these.

into tomcatTmpDir
}

Expand Down