diff --git a/pom.xml b/pom.xml index 34c5b50f..16e59f53 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ -SNAPSHOT jenkinsci/config-file-provider-plugin true - 2.303.3 + 2.332.1 8 2.15 @@ -57,8 +57,8 @@ io.jenkins.tools.bom - bom-2.303.x - 1210.vcd41f6657f03 + bom-2.332.x + 1342.v729ca_3818e88 import pom @@ -67,7 +67,17 @@ org.jenkins-ci symbol-annotation 1.23 - + + + com.google.errorprone + error_prone_annotations + 2.11.0 + + + org.jenkins-ci.main + jenkins-test-harness + 1736.vc72c458c5103 + diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java b/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java index 6525f7e0..7a97ccf7 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java @@ -55,7 +55,7 @@ public void regularCaseStillWorking() throws Exception { assertThat(store.getConfigs(), hasSize(1)); HtmlPage configFiles = wc.goTo("configfiles"); - HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@onclick, 'removeConfig?id=" + CONFIG_ID + "')]"); + HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@data-url, 'removeConfig?id=" + CONFIG_ID + "')]"); AtomicReference confirmCalled = new AtomicReference<>(false); wc.setConfirmHandler((page, s) -> { @@ -87,7 +87,7 @@ public void xssPrevention() throws Exception { JenkinsRule.WebClient wc = j.createWebClient(); HtmlPage configFiles = wc.goTo("configfiles"); - HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@onclick, 'removeConfig?id=" + CONFIG_ID + "')]"); + HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@data-url, 'removeConfig?id=" + CONFIG_ID + "')]"); AtomicReference confirmCalled = new AtomicReference<>(false); AtomicReference alertCalled = new AtomicReference<>(false); diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java index 0eb786ec..e77b8ba1 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java @@ -241,7 +241,7 @@ public void xssPreventionInFolder() throws Exception { // Clicking the button works // If we click on the link, it goes via POST, therefore it removes it successfully HtmlPage configFiles = wc.goTo(f1.getUrl() + "configfiles"); - HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@onclick, 'removeConfig?id=" + CONFIG_ID + "')]"); + HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@data-url, 'removeConfig?id=" + CONFIG_ID + "')]"); AtomicReference confirmCalled = new AtomicReference<>(false); wc.setConfirmHandler((page, s) -> { diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/sec/Security2002Test.java b/src/test/java/org/jenkinsci/plugins/configfiles/sec/Security2002Test.java index 9e24abda..abd857f0 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/sec/Security2002Test.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/sec/Security2002Test.java @@ -50,7 +50,7 @@ public void xssPrevention() throws Exception { // Clicking the button works // If we click on the link, it goes via POST, therefore it removes it successfully HtmlPage configFiles = wc.goTo("configfiles"); - HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@onclick, 'removeConfig?id=" + CONFIG_ID + "')]"); + HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@data-url, 'removeConfig?id=" + CONFIG_ID + "')]"); AtomicReference confirmCalled = new AtomicReference<>(false); wc.setConfirmHandler((page, s) -> {