Skip to content
Permalink
Browse files

Merge pull request #18 from mixalturek/master

[JENKINS-23575] Post-Build-Step "Publish Cppcheck results" not available in job generator project
  • Loading branch information
mixalturek committed Jul 19, 2014
2 parents bbae9df + b166231 commit b70bb5abc9ddccbea3ad19459f647f31fd6e77fa
@@ -7,3 +7,4 @@ work
/.classpath
/.settings
/Makefile
.idea
17 pom.xml
@@ -36,8 +36,8 @@
<scm>
<connection>scm:git:git://github.com/jenkinsci/cppcheck-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/cppcheck-plugin.git</developerConnection>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -49,17 +49,11 @@
<java2html.version>5.0</java2html.version>
<junit.version>4.8.2</junit.version>
<mockito.version>1.8.5</mockito.version>
<ivy.plugin.version>1.19</ivy.plugin.version>
<dashboard.view.version>2.0</dashboard.view.version>
</properties>

<dependencies>

<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -99,13 +93,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ivy</artifactId>
<version>${ivy.plugin.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>dashboard-view</artifactId>
@@ -34,7 +34,7 @@
* @param cppecheckConfig
* @param result
* @param checkNewError
* @return
* @return number of errors
*/
public static int getNumberErrors(CppcheckConfig cppecheckConfig, CppcheckResult result, boolean checkNewError) {

@@ -6,8 +6,6 @@
import hudson.FilePath;
import hudson.Launcher;
import hudson.XmlFile;
import hudson.matrix.MatrixProject;
import hudson.maven.MavenModuleSet;
import hudson.model.*;
import hudson.remoting.VirtualChannel;
import hudson.tasks.BuildStepDescriptor;
@@ -217,15 +215,7 @@ public CppcheckDescriptor() {
}

public boolean isApplicable(Class<? extends AbstractProject> jobType) {
boolean isIvyProject = false;
if (Hudson.getInstance().getPlugin("ivy") != null) {
isIvyProject = hudson.ivy.AbstractIvyProject.class.isAssignableFrom(jobType);
}

return FreeStyleProject.class.isAssignableFrom(jobType)
|| MavenModuleSet.class.isAssignableFrom(jobType)
|| MatrixProject.class.isAssignableFrom(jobType)
|| isIvyProject;
return true;
}

@Override

0 comments on commit b70bb5a

Please sign in to comment.
You can’t perform that action at this time.