Merge branch 'master' into jep-227

jenkinsci · Dec 1, 2021 · f6e22f3 · f6e22f3
2 parents 076b6b0 + b288322
commit f6e22f3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,6 +2,6 @@
 
 /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
 buildPlugin(timeout: 180, configurations: [
-        [platform: "docker && highmem", jdk: "8", jenkins: null],
-        [platform: "docker && highmem", jdk: "11", jenkins: null]
+        [platform: "docker && linux", jdk: "8", jenkins: null],
+        [platform: "docker && linux", jdk: "11", jenkins: null]
 ])
diff --git a/plugin/pom.xml b/plugin/pom.xml
diff --git a/plugin/src/main/java/com/redhat/jenkins/plugins/ci/threads/CITriggerThread.java b/plugin/src/main/java/com/redhat/jenkins/plugins/ci/threads/CITriggerThread.java
diff --git a/.../java/com/redhat/jenkins/plugins/ci/integration/SharedMessagingPluginIntegrationTest.java b/.../java/com/redhat/jenkins/plugins/ci/integration/SharedMessagingPluginIntegrationTest.java
diff --git a/pom.xml b/pom.xml