diff --git a/.mvn/maven.config b/.mvn/maven.config index e54fdacfe62468e4e85ebe51890384926933b476..2a0299c4865d58b47a576f7effc4a15f3fcf4ee9 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +1,2 @@ +-Pconsume-incrementals -Pmight-produce-incrementals diff --git a/core/pom.xml b/core/pom.xml index f708264d070cd08a2ec3f652ea189c3a90423791..36ff6543a65ae241b05e74f2e394ab2dcd676f7c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -101,6 +101,11 @@ THE SOFTWARE. + + org.connectbot.jbcrypt + jbcrypt + 1.0.0 + org.jruby.ext.posix jna-posix @@ -116,11 +121,6 @@ THE SOFTWARE. trilead-putty-extension 1.2 - - org.jenkins-ci - trilead-ssh2 - build-217-jenkins-14 - org.kohsuke.stapler stapler-groovy diff --git a/core/src/main/resources/jenkins/split-plugins.txt b/core/src/main/resources/jenkins/split-plugins.txt index 6b09bbe8777f264b9f31dad7f3fd07333ee71764..98a89ebccd310f4bfd650a1ee75df2b371a447a2 100644 --- a/core/src/main/resources/jenkins/split-plugins.txt +++ b/core/src/main/resources/jenkins/split-plugins.txt @@ -28,3 +28,6 @@ jdk-tool 2.112 1.0 # JENKINS-55681 jaxb 2.163 2.3.0 11 + +#JENKINS-43610 Split Trilead out from Core +trilead-api 2.184 1.0.4-rc17.8e3daef99f43 diff --git a/war/pom.xml b/war/pom.xml index ee080b92786c4872e420988a27b70b88f5b835a2..e3a711c6b71a499c617d71f251e12ab34a589018 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -420,6 +420,12 @@ THE SOFTWARE. 2.3.0 hpi + + org.jenkins-ci.plugins + trilead-api + 1.0.4-rc17.8e3daef99f43 + hpi + ${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins true