From 89e4d518e1a64dcfafd36e398ebdf8a7becfd2a7 Mon Sep 17 00:00:00 2001 From: James Nord Date: Wed, 5 Jun 2024 10:29:25 +0100 Subject: [PATCH 1/2] Update baseline to 2.361 to prevent detached plugins the current baseline caused some detached plugins to be installed when starting a RealJenkinsRule. This has an undersirable effect that when `includeTestClasspathPlugins(false)` is called we still end up with some plugins that can negatively impact the test. To avoid this we are simply moving the baseline forward to 2.361 (which is what the j-t-h specifies as its Jenkins version!) --- RealJenkinsRuleInit/pom.xml | 5 ++--- .../src/main/resources/index.jelly | 4 ++++ .../jvnet/hudson/test/RealJenkinsRuleInit.jpi | Bin 5856 -> 5311 bytes 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 RealJenkinsRuleInit/src/main/resources/index.jelly diff --git a/RealJenkinsRuleInit/pom.xml b/RealJenkinsRuleInit/pom.xml index 5a0df6270..2559202a3 100644 --- a/RealJenkinsRuleInit/pom.xml +++ b/RealJenkinsRuleInit/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.17 + 4.83 io.jenkins.plugins @@ -12,8 +12,7 @@ 0-SNAPSHOT hpi - 2.249 - 8 + 2.361 true true diff --git a/RealJenkinsRuleInit/src/main/resources/index.jelly b/RealJenkinsRuleInit/src/main/resources/index.jelly new file mode 100644 index 000000000..96fecee42 --- /dev/null +++ b/RealJenkinsRuleInit/src/main/resources/index.jelly @@ -0,0 +1,4 @@ + +
+ RealJenkinsRule initialization wrapper +
diff --git a/src/main/resources/org/jvnet/hudson/test/RealJenkinsRuleInit.jpi b/src/main/resources/org/jvnet/hudson/test/RealJenkinsRuleInit.jpi index 50947410a7e8210eadfae6b71dec8ab46fb15670..7b8a1e62634c237c0bcd8816023580c973ae2cc3 100644 GIT binary patch delta 4308 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 WeS`ju7n1zOZ|@T&W+3V9;(q{jhr2ic From cc092efdbcff21704f733403b4c40470e1ff17c6 Mon Sep 17 00:00:00 2001 From: James Nord Date: Wed, 5 Jun 2024 10:36:34 +0100 Subject: [PATCH 2/2] leave a comment for future bumps --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 1842784cc..09ef7f2f8 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ THE SOFTWARE. 999999-SNAPSHOT + 2.361 1.37 jenkinsci/${project.artifactId}