root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[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 <jglick@cloudbees.com>
This commit is contained in:
Ivan Fernandez Calvo 2019-07-11 16:54:07 +02:00 committed by Oleg Nenashev
parent 1b2cd19a61
commit f76ee6d878
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mvn/maven.config
View File

@ -1 +1,2 @@
-Pconsume-incrementals
-Pmight-produce-incrementals -Pmight-produce-incrementals

10
core/pom.xml
View File

@ -101,6 +101,11 @@ THE SOFTWARE.
</exclusions> </exclusions>
</dependency> </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 --> <dependency> <!-- for compatibility only; all new code should use JNR -->
<groupId>org.jruby.ext.posix</groupId> <groupId>org.jruby.ext.posix</groupId>
<artifactId>jna-posix</artifactId> <artifactId>jna-posix</artifactId>
@ -116,11 +121,6 @@ THE SOFTWARE.
<artifactId>trilead-putty-extension</artifactId> <artifactId>trilead-putty-extension</artifactId>
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>trilead-ssh2</artifactId>
<version>build-217-jenkins-14</version>
</dependency>
<dependency> <dependency>
<groupId>org.kohsuke.stapler</groupId> <groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-groovy</artifactId> <artifactId>stapler-groovy</artifactId>

3
core/src/main/resources/jenkins/split-plugins.txt
View File

@ -28,3 +28,6 @@ jdk-tool 2.112 1.0
# JENKINS-55681 # JENKINS-55681
jaxb 2.163 2.3.0 11 jaxb 2.163 2.3.0 11
#JENKINS-43610 Split Trilead out from Core
trilead-api 2.184 1.0.4-rc17.8e3daef99f43

6
war/pom.xml
View File

@ -420,6 +420,12 @@ THE SOFTWARE.
<version>2.3.0</version> <version>2.3.0</version>
<type>hpi</type> <type>hpi</type>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>trilead-api</artifactId>
<version>1.0.4-rc17.8e3daef99f43</version>
<type>hpi</type>
</artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory> <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory>
<stripVersion>true</stripVersion> <stripVersion>true</stripVersion>