diff --git a/pom.xml b/pom.xml index 28a13f43..ca95dc75 100644 --- a/pom.xml +++ b/pom.xml @@ -95,13 +95,14 @@ org.hamcrest hamcrest-core - 1.2 + 1.3 test + org.jenkins-ci.plugins dashboard-view - 2.2 + 2.9.4 true @@ -109,6 +110,31 @@ parameterized-trigger 2.17 + + + org.jenkins-ci.plugins.m2release + m2release + 0.14.0 + + + org.apache.maven + maven-artifact + 3.0.3 + test + + + org.apache.maven + maven-model + 3.0.3 + test + + + org.apache.maven + maven-settings + 3.0.3 + test + org.seleniumhq.selenium diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java index 07a6aee3..b999962d 100644 --- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java +++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java @@ -72,6 +72,7 @@ import javax.servlet.ServletException; +import org.jvnet.hudson.plugins.m2release.M2ReleaseAction; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -931,5 +932,28 @@ public boolean hasPermission(final Permission p) { } return display; - } + } + + /** + * Check for M2ReleaseAction, if present, then provide an icon on top + * + * @return boolean - whether the first job is a m2release job + */ + public boolean isM2Release() { + if (Jenkins.getInstance().getPlugin("m2release") == null) { + return false; + } + final String firstJobName = ((DownstreamProjectGridBuilder) gridBuilder).getFirstJob(); + final AbstractProject project = Jenkins.getInstance().getItem(firstJobName, this.getOwnerItemGroup(), + AbstractProject.class); + if (project != null) { + // If a M2ReleaseAction is found + final List actions = project.getActions(M2ReleaseAction.class); + if (actions != null && !actions.isEmpty()) { + return true; + } + } + return false; + } + } diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly index 4806e19a..77e78016 100644 --- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly +++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly @@ -240,6 +240,14 @@
Run
+ +
+
+ M2Release in a Pipeline +
+
Release
+
+
diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css index 7dcd5c7e..1d326fc4 100644 --- a/src/main/webapp/css/main.css +++ b/src/main/webapp/css/main.css @@ -61,7 +61,7 @@ height: 48px; margin-left: auto; margin-right: auto; - width: 340px; + width: 392px; } .icon-container { diff --git a/src/main/webapp/js/build-pipeline.js b/src/main/webapp/js/build-pipeline.js index dca5d729..34b27d04 100644 --- a/src/main/webapp/js/build-pipeline.js +++ b/src/main/webapp/js/build-pipeline.js @@ -102,7 +102,7 @@ BuildPipeline.prototype = { type: 'iframe', title: title, titlePosition: 'outside', - href: '/' + href, + href: href, transitionIn : 'elastic', transitionOut : 'elastic', width: '90%',