Skip to content
Snippets Groups Projects
Commit 47f02919 authored by Luc Everse's avatar Luc Everse :passport_control:
Browse files

Merge branch 'update-gradle-ui' into 'development'

Update gradle & ui

See merge request !144
parents 527fb23f 43a18183
No related branches found
No related tags found
2 merge requests!148Release 2.3.0,!144Update gradle & ui
Pipeline #372226 passed with warnings
......@@ -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 ]
......
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
......
......@@ -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"/>
......
No preview for this file type
......@@ -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;
......
......@@ -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
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment