Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-60500] - Promotion API Plugin PoC #145

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

[JENKINS-60500] - Promotion API Plugin PoC #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c3965f0
[JENKINS-57839] - Initial PromotionBadge compatibility code for Jenki…
oleg-nenashev Jun 4, 2019
6808702
Delete AddPromotionBadgeStep.java
oleg-nenashev Jul 21, 2019
f33b6c6
Merge branch 'master' into PromotionBadge_PipelineCompat
oleg-nenashev Jul 29, 2019
72be6a6
Use Jenkinsclass instead of JenkinsHelper
oleg-nenashev Jul 29, 2019
c6c69a9
Merge remote-tracking branch 'jenkinsci/PromotionBadge_PipelineCompat…
oleg-nenashev Dec 15, 2019
8c0f855
[JENKINS-60500] - Introduce the new Promotion API plugin. Break down …
oleg-nenashev Dec 16, 2019
7df5538
[JENKINS-60500] - Update resource links to use the Promotion API reso…
oleg-nenashev Dec 16, 2019
a4a4b88
[JENKINS-60500] - Move the PromotedProjectAction back to the Promoted…
oleg-nenashev Dec 17, 2019
13ef092
[JENKINS-57903] - Breakdown the PromotionProcess class so that the ma…
oleg-nenashev Dec 25, 2019
4c4d165
[JENKINS-60500] - Move ItemPathResolver class to the API plugin
oleg-nenashev Dec 25, 2019
f0b234a
[]JENKINS-60500 - PromotionTrigger is tied to AbstractProject in term…
oleg-nenashev Dec 25, 2019
36f0eb7
More code drag and drop
oleg-nenashev Dec 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
218 changes: 218 additions & 0 deletions .factorypath
View file
Open in desktop

Large diffs are not rendered by default.

150 changes: 9 additions & 141 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
<version>3.45</version>
</parent>

<artifactId>promoted-builds</artifactId>
<!--TODO: this is a fake parent. Plugins will be boken down to separate repositories-->

<groupId>io.jenkins.plugins</groupId>
<artifactId>promoted-builds-parent</artifactId>
<version>3.6-SNAPSHOT</version>
<packaging>hpi</packaging>
<packaging>pom</packaging>

<name>Jenkins promoted builds plugin</name>
<url>https://github.com/jenkinsci/promoted-builds-plugin</url>
Expand All @@ -24,21 +27,6 @@
<hpi.compatibleSinceVersion>3.0</hpi.compatibleSinceVersion>
</properties>

<developers>
<developer>
<id>kohsuke</id>
<name>Kohsuke Kawaguchi</name>
</developer>
<developer>
<id>petehayes</id>
<name>Peter Hayes</name>
</developer>
<developer>
<id>oleg_nenashev</id>
<name>Oleg Nenashev</name>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
Expand All @@ -65,128 +53,8 @@
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
<version>3.2</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>apache-httpcomponents-client-4-api</artifactId>
<version>4.5.3-2.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1.20</version>
</dependency>
<dependency>
<groupId>com.sonyericsson.hudson.plugins.rebuild</groupId>
<artifactId>rebuild</artifactId>
<version>1.31</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.19</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>token-macro</artifactId>
<version>2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.1.4</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<version>1.13</version>
</dependency>
<dependency>
<groupId>hudson.plugins</groupId>
<artifactId>project-inheritance</artifactId>
<version>1.5.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>job-dsl</artifactId>
<version>1.74</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.54</version>
</dependency>
<dependency>
<groupId>org.jvnet.hudson</groupId>
<artifactId>xstream</artifactId>
<version>1.4.7-jenkins-1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>config-file-provider</artifactId>
<version>2.18</version>
<optional>true</optional>
</dependency>
<dependency>
<!-- TODO: it is something insane, no? -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>parameterized-trigger</artifactId>
<version>2.33</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-auth</artifactId>
<version>1.6</version>
<scope>test</scope>
<exclusions>
<!-- Real Upper Bounds dependency issue,
See the discussion in https://github.com/jenkinsci/plugin-pom/pull/72 -->
<exclusion>
<groupId>org.jenkins-ci.plugins.icon-shim</groupId>
<artifactId>icon-set</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>1.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
<module>promotion-api-plugin</module>
<module>promoted-builds-plugin</module>
</modules>
</project>
199 changes: 199 additions & 0 deletions promoted-builds-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.45</version>
</parent>

<artifactId>promoted-builds</artifactId>
<version>3.6-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>Jenkins promoted builds plugin</name>
<description>The plugin includes promotion support for Freestyle/Matrix projects</description>
<url>https://github.com/jenkinsci/promoted-builds-plugin</url>

<properties>
<!-- Last version before https://jenkins.io/security/advisory/2018-08-15/ which causes instabilities
due to Promotion#getTarget(). And we cannot just remove it without breaking binary compatibility
(see JENKINS-59704, JENKINS-59773 and so on for the fallout in 3.4)-->
<jenkins.version>2.121.1</jenkins.version>
<java.level>8</java.level>
<findbugs.effort>Max</findbugs.effort>
<hpi.compatibleSinceVersion>3.0</hpi.compatibleSinceVersion>
</properties>

<developers>
<developer>
<id>kohsuke</id>
<name>Kohsuke Kawaguchi</name>
</developer>
<developer>
<id>petehayes</id>
<name>Peter Hayes</name>
</developer>
<developer>
<id>oleg_nenashev</id>
<name>Oleg Nenashev</name>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag>
</scm>
<licenses>
<license>
<name>MIT</name>
<url>http://opensource.org/licenses/MIT</url>
</license>
</licenses>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>promotion-api</artifactId>
<version>3.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
<version>3.2</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>apache-httpcomponents-client-4-api</artifactId>
<version>4.5.3-2.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1.20</version>
</dependency>
<dependency>
<groupId>com.sonyericsson.hudson.plugins.rebuild</groupId>
<artifactId>rebuild</artifactId>
<version>1.31</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.19</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>token-macro</artifactId>
<version>2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.1.4</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<version>1.13</version>
</dependency>
<dependency>
<groupId>hudson.plugins</groupId>
<artifactId>project-inheritance</artifactId>
<version>1.5.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>job-dsl</artifactId>
<version>1.74</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.54</version>
</dependency>
<dependency>
<groupId>org.jvnet.hudson</groupId>
<artifactId>xstream</artifactId>
<version>1.4.7-jenkins-1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>config-file-provider</artifactId>
<version>2.18</version>
<optional>true</optional>
</dependency>
<dependency>
<!-- TODO: it is something insane, no? -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>parameterized-trigger</artifactId>
<version>2.33</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-auth</artifactId>
<version>1.6</version>
<scope>test</scope>
<exclusions>
<!-- Real Upper Bounds dependency issue,
See the discussion in https://github.com/jenkinsci/plugin-pom/pull/72 -->
<exclusion>
<groupId>org.jenkins-ci.plugins.icon-shim</groupId>
<artifactId>icon-set</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>1.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
0 ...plugins/promoted_builds/CopyListener.java → ...plugins/promoted_builds/CopyListener.java
View file
Open in desktop
File renamed without changes.
0 ...n/plugins/promoted_builds/FakeParent.java → ...n/plugins/promoted_builds/FakeParent.java
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...gins/promoted_builds/JobPropertyImpl.java → ...gins/promoted_builds/JobPropertyImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private JobPropertyImpl(StaplerRequest req, JSONObject json) throws Descriptor.F
p = (PromotionProcess) Items.load(this, getRootDirFor(name));
} catch (IOException e) {
// failed to load
p = new PromotionProcess(this,name);
p = new JobPropertyPromotionProcess(this,name);
}

// apply configuration
Expand Down Expand Up @@ -180,7 +180,7 @@ private void loadProcesses(File[] subdirs) throws IOException {
* @throws IOException Execution error
*/
public synchronized PromotionProcess addProcess(String name) throws IOException {
PromotionProcess p = new PromotionProcess(this, name);
JobPropertyPromotionProcess p = new JobPropertyPromotionProcess(this, name);
activeProcessNames.add(name);
safeAddToProcessesList(p);
buildActiveProcess();
Expand Down
Loading