Update dependencies.
This commit is contained in:
parent
796e46bc99
commit
0997558347
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'org.springframework.boot' version '2.7.10'
|
id 'org.springframework.boot' version '2.7.11'
|
||||||
id 'io.spring.dependency-management' version '1.1.0'
|
id 'io.spring.dependency-management' version '1.1.0'
|
||||||
id 'java'
|
id 'java'
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ dependencies {
|
||||||
implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
|
implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
|
||||||
|
|
||||||
implementation 'org.apache.commons:commons-compress:1.23.0'
|
implementation 'org.apache.commons:commons-compress:1.23.0'
|
||||||
implementation 'com.github.luben:zstd-jni:1.5.4-2' // Even though this is part for the above dependency, it is needed separately as well.
|
implementation 'com.github.luben:zstd-jni:1.5.5-1' // Even though this is part of the above dependency, it is needed separately as well, specifically here, in the Worker.
|
||||||
|
|
||||||
testImplementation 'org.springframework.security:spring-security-test'
|
testImplementation 'org.springframework.security:spring-security-test'
|
||||||
testImplementation "org.springframework.boot:spring-boot-starter-test"
|
testImplementation "org.springframework.boot:spring-boot-starter-test"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
@ -22,7 +22,7 @@ elif [[ $# -gt 2 ]]; then
|
||||||
echo -e "Wrong number of arguments given: ${#} (more than 2)\nPlease execute it like: script.sh <justRun: 0 | 1> <avoidReInstallingPublicationsRetriever: 0 | 1>"; exit 2
|
echo -e "Wrong number of arguments given: ${#} (more than 2)\nPlease execute it like: script.sh <justRun: 0 | 1> <avoidReInstallingPublicationsRetriever: 0 | 1>"; exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
gradleVersion="8.0.2"
|
gradleVersion="8.1"
|
||||||
|
|
||||||
if [[ justRun -eq 0 ]]; then
|
if [[ justRun -eq 0 ]]; then
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,7 @@ public class FilesCompressor {
|
||||||
|
|
||||||
if ( numTarredFiles != filesToTar.size() )
|
if ( numTarredFiles != filesToTar.size() )
|
||||||
logger.warn("The number of \"numTarredFiles\" (" + numTarredFiles + ") is different from the number of files requested to be tarred (" + filesToTar.size() + "), for assignments_" + assignmentsCounter + ", batch_" + tarBatchCounter);
|
logger.warn("The number of \"numTarredFiles\" (" + numTarredFiles + ") is different from the number of files requested to be tarred (" + filesToTar.size() + "), for assignments_" + assignmentsCounter + ", batch_" + tarBatchCounter);
|
||||||
|
// Still, some files may have been tarred, so we move on. It's up to the Controller, to handle such case.
|
||||||
|
|
||||||
return tarFile;
|
return tarFile;
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,8 +31,7 @@ public class UriBuilder {
|
||||||
baseUrl += sslEnabled.equals("true") ? "s" : "";
|
baseUrl += sslEnabled.equals("true") ? "s" : "";
|
||||||
baseUrl += "://";
|
baseUrl += "://";
|
||||||
|
|
||||||
ip = getPublicIP();
|
if ( (ip = getPublicIP()) == null )
|
||||||
if ( ip == null )
|
|
||||||
ip = InetAddress.getLoopbackAddress().getHostAddress(); // Non-null.
|
ip = InetAddress.getLoopbackAddress().getHostAddress(); // Non-null.
|
||||||
|
|
||||||
baseUrl += ip + ":" + webServerAppCtxt.getWebServer().getPort();
|
baseUrl += ip + ":" + webServerAppCtxt.getWebServer().getPort();
|
||||||
|
|
Loading…
Reference in New Issue