[JENKINS-43610] Split Trilead out from Core (#4085)

* [JENKINS-43610] Split Trilead out from Core * revert changes on ./core/src/main/resources/jenkins/split-plugin-cycles.txt * remove JDK version on split-plugins.txt * bump trilead-api version to 1.0.4 * fix: add trilead-api incremental version to detached plugins * fix: add consume-incrementals setting to maven * Update core/src/main/resources/jenkins/split-plugins.txt Co-Authored-By: Jesse Glick <[email protected]>
jenkinsci · Jul 11, 2019 · f76ee6d · f76ee6d
1 parent 1b2cd19
commit f76ee6d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -101,6 +101,11 @@ THE SOFTWARE.
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.connectbot.jbcrypt</groupId>
+      <artifactId>jbcrypt</artifactId>
+      <version>1.0.0</version>
+    </dependency>
     <dependency> <!-- for compatibility only; all new code should use JNR -->
       <groupId>org.jruby.ext.posix</groupId>
       <artifactId>jna-posix</artifactId>
@@ -116,11 +121,6 @@ THE SOFTWARE.
       <artifactId>trilead-putty-extension</artifactId>
       <version>1.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci</groupId>
-      <artifactId>trilead-ssh2</artifactId>
-      <version>build-217-jenkins-14</version>
-    </dependency>
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-groovy</artifactId>

diff --git 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
@@ -420,6 +420,12 @@ THE SOFTWARE.
                   <version>2.3.0</version>
                   <type>hpi</type>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.jenkins-ci.plugins</groupId>
+                  <artifactId>trilead-api</artifactId>
+                  <version>1.0.4-rc17.8e3daef99f43</version>
+                  <type>hpi</type>
+                </artifactItem>
               </artifactItems>
               <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory>
               <stripVersion>true</stripVersion>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		-Pconsume-incrementals
		-Pmight-produce-incrementals