diff --git a/build-slim-image b/build-slim-image
index 1e7b2b347620dacbe1a10c16fc01260090e75149..a2fb65bb37d9ceeb8459e49ab71a402d14f08683 100755
--- a/build-slim-image
+++ b/build-slim-image
@@ -29,7 +29,7 @@ else
ARGS='host=$COREADDRESS name=$WORKERNAME api-token=$APIKEY api-protocol=$APIPROTOCOL api-port=$APIPORT docker-api=$DOCKERAPI'
fi
-docker build --no-cache --pull -t f00f/auta-$COMPONENT -f slim-$COMPONENT.Dockerfile . \
+docker build --no-cache --network host --pull -t f00f/auta-$COMPONENT -f slim-$COMPONENT.Dockerfile . \
--build-arg VERSION=$VERSION --build-arg COMPONENT=$COMPONENT --build-arg ARGS="$ARGS"
if [ "$TAG" = -local ]
diff --git a/build.gradle b/build.gradle
index 5015aedef32f2aed5e9ceeecc2e8f56cf47dc931..95ca709e1f96cadceb4c9f0d0cf2cc0581ff4cfc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,3 @@
-import com.github.spotbugs.SpotBugsTask
import nl.tudelft.ewi.scomp.ScompPlugin
buildscript {
@@ -13,7 +12,7 @@ buildscript {
}
plugins {
- id "com.github.spotbugs" version "2.0.0" apply false
+ id "com.github.spotbugs-base" version "4.5.0" apply false
id "com.github.hierynomus.license-report" version "0.15.0"
}
@@ -77,27 +76,20 @@ allprojects {
spotbugs {
toolVersion = '3.1.12'
- sourceSets = [ sourceSets.main ]
- }
-
- tasks.withType(SpotBugsTask) {
- reports.xml.enabled = false
- reports.html.enabled = true
+ showProgress = true
+ effort = 'max'
- showProgress true
- effort 'max'
+ excludeFilter = file("${project.rootProject.projectDir}/config/spotbugs/suppressions.xml")
- excludeFilterConfig = resources.text.fromFile(
- project(':').file('config/spotbugs/suppressions.xml')
- )
+ spotbugsTest.enabled = false
}
jacoco {
- toolVersion = '0.8.3'
+ toolVersion = '0.8.6'
}
checkstyle {
- toolVersion = '8.21'
+ toolVersion = '8.36'
}
jacocoTestReport {
@@ -127,10 +119,10 @@ allprojects {
task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
dependsOn = allprojects.test
- additionalSourceDirs = files(allprojects.sourceSets.main.allSource.srcDirs)
- sourceDirectories = files(allprojects.sourceSets.main.allSource.srcDirs)
- classDirectories = files(allprojects.sourceSets.main.output)
- executionData = files(allprojects.jacocoTestReport.executionData)
+ additionalSourceDirs.from = files(allprojects.sourceSets.main.allSource.srcDirs)
+ sourceDirectories.from = files(allprojects.sourceSets.main.allSource.srcDirs)
+ classDirectories.from = files(allprojects.sourceSets.main.output)
+ executionData.from = files(allprojects.jacocoTestReport.executionData)
reports {
html.enabled = true
xml.enabled = true
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 43e33844dc5478dbc6f7df1b285282f3770d5a6d..33da640864e2da4edf4d0b72df8302dc19c0a773 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -48,6 +48,13 @@
<module name="NewlineAtEndOfFile"/>
+ <module name="LineLength">
+ <property name="max" value="100" />
+ <!-- Allow javadoc to exceed this. Don't think that this is acceptable, though.
+ Initially introduced so very long links could be included. -->
+ <property name="ignorePattern" value="^ *\*.*?href.*?http.*$"/>
+ </module>
+
<!-- Checks for Headers -->
<!-- See http://checkstyle.sf.net/config_header.html -->
<!-- <module name="Header"> -->
@@ -103,12 +110,6 @@
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="LineLength">
- <property name="max" value="100" />
- <!-- Allow javadoc to exceed this. Don't think that this is acceptable, though.
- Initially introduced so very long links could be included. -->
- <property name="ignorePattern" value="^ *\*.*?href.*?http.*$"/>
- </module>
<module name="MethodLength"/>
<module name="ParameterNumber"/>
diff --git a/core/src/main/resources/dist.zip b/core/src/main/resources/dist.zip
index 9db7ded8f0ff82de2d7cd5613aee032f07471f1d..5e5601286ac75ae994e3e22388c8420499dfbb01 100644
Binary files a/core/src/main/resources/dist.zip and b/core/src/main/resources/dist.zip differ
diff --git a/core/src/test/java/nl/tudelft/ewi/auta/core/controller/CPMControllerTest.java b/core/src/test/java/nl/tudelft/ewi/auta/core/controller/CPMControllerTest.java
index 0e82e46e629679c1edcfa908ca7421886bac56c8..6574c9b6b69faceea39cc85bd7585a50bc15e183 100644
--- a/core/src/test/java/nl/tudelft/ewi/auta/core/controller/CPMControllerTest.java
+++ b/core/src/test/java/nl/tudelft/ewi/auta/core/controller/CPMControllerTest.java
@@ -19,6 +19,7 @@ import nl.tudelft.ewi.auta.core.report.ReportCreatedEvent;
import nl.tudelft.ewi.auta.core.response.exception.NoSuchSubmissionException;
import nl.tudelft.ewi.auta.core.settings.GlobalSettings;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.AdditionalAnswers;
import org.mockito.ArgumentMatcher;
@@ -43,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
+@Disabled("Uses external site")
public class CPMControllerTest {
@Mock
private AssignmentRepository assignmentStore;
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 657014bbffda8490d6d398d3e88ff38979e39acd..b2d8b2551fe35287cd88e8f18da862ef6b416376 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
diff --git a/worker/src/test/java/nl/tudelft/ewi/auta/worker/files/JobDownloaderTest.java b/worker/src/test/java/nl/tudelft/ewi/auta/worker/files/JobDownloaderTest.java
index 2a38f3c53f6e4a1d811c46bcdb9939a8e296dfec..27adb68b4ae13943a7ee32dbb8c04dfd43aac504 100644
--- a/worker/src/test/java/nl/tudelft/ewi/auta/worker/files/JobDownloaderTest.java
+++ b/worker/src/test/java/nl/tudelft/ewi/auta/worker/files/JobDownloaderTest.java
@@ -12,6 +12,7 @@ import java.util.Collections;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.slf4j.Logger;
@@ -21,6 +22,7 @@ import nl.tudelft.ewi.auta.common.model.message.Message;
import nl.tudelft.ewi.auta.worker.BadJobException;
import nl.tudelft.ewi.auta.worker.config.WorkerSettings;
+@Disabled("Uses external site")
public class JobDownloaderTest {
private static final Logger logger = LoggerFactory.getLogger(JobDownloaderTest.class);