diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33d073e2..5b04dd7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Cache local Maven repository uses: actions/cache@v2.1.4 with: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ed0c6845..7361ce2f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -14,10 +14,10 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Generate coverage with JaCoCo env: BROWSER: firefox-container diff --git a/plugin/pom.xml b/plugin/pom.xml index 3cc8bf25..b151dfe1 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ org.jvnet.hudson.plugins analysis-pom - 4.7.0 + 5.0.0 @@ -22,18 +22,17 @@ -SNAPSHOT ${project.groupId}.autograding - 1.1.0 + 1.2.0 - 3.11 - - 5.15.2-1 - 3.5.1-2 - 4.6.0-1 - 1.10.23-2 - 4.9.0-3 + 2.0.0 + 1.10.23-3 + 4.9.0-4 2.0.0 - 1.7.0 - 1.6.0 + + 5.15.2-2 + 3.5.1-3 + 4.6.0-2 + 1.16.1-2 1.2.1 1.0-18 @@ -42,8 +41,9 @@ 2.5 3.3 - 2.11.1 + 2.12.1 1.5.0 + @@ -63,18 +63,6 @@ - - edu.hm.hafner - codingstyle - ${codingstyle.library.version} - - - - com.github.spotbugs - spotbugs-annotations - - - org.jenkins-ci.plugins apache-httpcomponents-client-4-api @@ -82,9 +70,14 @@ compile - commons-io - commons-io - 2.8.0 + org.json + json + 20201115 + + + io.jenkins.plugins + popper-api + ${popper-api.version} @@ -119,12 +112,6 @@ plugin-util-api ${plugin-util-api.version} - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - io.jenkins.plugins checks-api @@ -157,6 +144,10 @@ guava com.google.guava + + commons-beanutils + commons-beanutils + @@ -214,6 +205,10 @@ com.github.spotbugs spotbugs-annotations + + commons-io + commons-io + diff --git a/plugin/src/test/java/io/jenkins/plugins/grading/AggregatedScoreXmlStreamTest.java b/plugin/src/test/java/io/jenkins/plugins/grading/AggregatedScoreXmlStreamTest.java index d92295f4..348cabb8 100644 --- a/plugin/src/test/java/io/jenkins/plugins/grading/AggregatedScoreXmlStreamTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/grading/AggregatedScoreXmlStreamTest.java @@ -70,13 +70,4 @@ private void verifyStream(final AggregatedScore score) { assertThat(score).hasPitAchieved(73); assertThat(score.getPitScores()).hasSize(1); } - - private Path createTempFile() { - try { - return Files.createTempFile("test", ".test"); - } - catch (IOException exception) { - throw new AssertionError(exception); - } - } } diff --git a/ui-tests/pom.xml b/ui-tests/pom.xml index 4a1dee7f..06e058c2 100644 --- a/ui-tests/pom.xml +++ b/ui-tests/pom.xml @@ -5,7 +5,7 @@ edu.hm.hafner codingstyle-pom - 1.6.0 + 2.0.2 @@ -16,10 +16,7 @@ UI Tests of Autograding Plugin - 2.235.1 - UTF-8 - 1.8 - 3.8.1 + 2.263.3 @@ -130,7 +127,7 @@ ../plugin/target/test-classes/test-dependencies ${jenkins.version} - firefox-container + chrome-container 1