From e57cdf700a5e4df21d9169ca4312e48a7e586dc8 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Tue, 23 Feb 2021 15:29:02 +0100 Subject: [PATCH 1/8] Bump version of plugin-util to 2.0.0-rc276.3347381c7e4d. --- plugin/pom.xml | 45 +++++++++++++++------------------------------ ui-tests/pom.xml | 9 +++------ 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 3cc8bf25..e65b55a8 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-beta-1 @@ -22,18 +22,16 @@ -SNAPSHOT ${project.groupId}.autograding - 1.1.0 + 1.2.0 - 3.11 + 2.0.0-rc276.3347381c7e4d + 1.10.23-3-rc391.920c10987e49 + 4.9.0-4-rc351.79d6c6255205 + 2.0.0 5.15.2-1 3.5.1-2 4.6.0-1 - 1.10.23-2 - 4.9.0-3 - 2.0.0 - 1.7.0 - 1.6.0 1.2.1 1.0-18 @@ -42,8 +40,9 @@ 2.5 3.3 - 2.11.1 + 2.12.1 1.5.0 + @@ -63,18 +62,6 @@ - - edu.hm.hafner - codingstyle - ${codingstyle.library.version} - - - - com.github.spotbugs - spotbugs-annotations - - - org.jenkins-ci.plugins apache-httpcomponents-client-4-api @@ -82,9 +69,9 @@ compile - commons-io - commons-io - 2.8.0 + org.json + json + 20201115 @@ -119,12 +106,6 @@ plugin-util-api ${plugin-util-api.version} - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - io.jenkins.plugins checks-api @@ -157,6 +138,10 @@ guava com.google.guava + + commons-beanutils + commons-beanutils + diff --git a/ui-tests/pom.xml b/ui-tests/pom.xml index 4a1dee7f..bc326fa4 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.1 @@ -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 From ecce41beb0e633dc61dd7f56a5a12b0a76a1b05a Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Tue, 23 Feb 2021 15:43:22 +0100 Subject: [PATCH 2/8] Run builds with Java 11. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/coverage.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 From 2c397da7f04fd747f26f35e045176ce2f3d0b70e Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Tue, 23 Feb 2021 19:44:45 +0100 Subject: [PATCH 3/8] Bump versions of codingstyle, codingstyle-pom and analysis-pom. --- plugin/pom.xml | 2 +- ui-tests/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e65b55a8..3caff0aa 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ org.jvnet.hudson.plugins analysis-pom - 5.0.0-beta-1 + 5.0.0-beta-2 diff --git a/ui-tests/pom.xml b/ui-tests/pom.xml index bc326fa4..06e058c2 100644 --- a/ui-tests/pom.xml +++ b/ui-tests/pom.xml @@ -5,7 +5,7 @@ edu.hm.hafner codingstyle-pom - 2.0.1 + 2.0.2 From 6249edd5ccc1337931a523adb6918ad1d764b807 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Wed, 24 Feb 2021 21:09:27 +0100 Subject: [PATCH 4/8] Bump version of BS to 4.6.0-2-rc333.2b112c91d60f. --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 3caff0aa..8c395e3e 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -31,7 +31,7 @@ 5.15.2-1 3.5.1-2 - 4.6.0-1 + 4.6.0-2-rc333.2b112c91d60f 1.2.1 1.0-18 From 086fa0d32908044c01595c81dbc39afe48fe41a9 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Wed, 24 Feb 2021 22:47:17 +0100 Subject: [PATCH 5/8] Remove method that is now part of parent. --- .../plugins/grading/AggregatedScoreXmlStreamTest.java | 9 --------- 1 file changed, 9 deletions(-) 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); - } - } } From 2b846e7d3571bb2c496d48523c7939033cc3df07 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 26 Feb 2021 14:06:10 +0100 Subject: [PATCH 6/8] Bump version of analysis-pom to 5.0.0. --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 8c395e3e..1b2ba4b9 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ org.jvnet.hudson.plugins analysis-pom - 5.0.0-beta-2 + 5.0.0 From 72f27631b2d0104d1e3d1feafd9c1535ef831a4c Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 26 Feb 2021 20:24:07 +0100 Subject: [PATCH 7/8] Bump version of font-awesome to 5.15.2-2-rc239.9679017bcfd6. --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 1b2ba4b9..91ddf23b 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -29,7 +29,7 @@ 4.9.0-4-rc351.79d6c6255205 2.0.0 - 5.15.2-1 + 5.15.2-2-rc239.9679017bcfd6 3.5.1-2 4.6.0-2-rc333.2b112c91d60f From 759d4ab0c7d5420e5252aadb4ee4907dea8f9a82 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Mon, 1 Mar 2021 23:51:55 +0100 Subject: [PATCH 8/8] Bump versions of UI libs. --- plugin/pom.xml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 91ddf23b..b151dfe1 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -24,14 +24,15 @@ 1.2.0 - 2.0.0-rc276.3347381c7e4d - 1.10.23-3-rc391.920c10987e49 - 4.9.0-4-rc351.79d6c6255205 + 2.0.0 + 1.10.23-3 + 4.9.0-4 2.0.0 - 5.15.2-2-rc239.9679017bcfd6 - 3.5.1-2 - 4.6.0-2-rc333.2b112c91d60f + 5.15.2-2 + 3.5.1-3 + 4.6.0-2 + 1.16.1-2 1.2.1 1.0-18 @@ -73,6 +74,11 @@ json 20201115 + + io.jenkins.plugins + popper-api + ${popper-api.version} + @@ -199,6 +205,10 @@ com.github.spotbugs spotbugs-annotations + + commons-io + commons-io +