Merge branch 'master' of github.com:peterlvilim/EkstaziJenkinsPlugin

peterlvilim · Dec 13, 2014 · 527f967 · 527f967
2 parents 0a0c42e + bc42412
commit 527f967
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -18,8 +18,11 @@ Support for enabling Ekstazi in Jenkins Maven projects
 mvn test
 ```
 Code coverage
+
+The project uses JaCoCo as the code coverage tool to generate coverage reports. These coverage reports can then be analyzed by SonarQube. Assuming the developer has a sonar server up and running, the following sequence of commands can be used to generate and analyze code coverage for the project:
 ```
-<add>
+mvn clean test
+mvn sonar:sonar
 ```
 
 ##To Install

diff --git a/src/main/java/com/pluralsight/ekstazi/RunListenerImpl.java b/src/main/java/com/pluralsight/ekstazi/RunListenerImpl.java
@@ -68,26 +68,21 @@ private void badgeApply(AbstractBuild build, TaskListener listener, final FilePa
                     Callable<String, IOException> task = new Callable<String, IOException>() {
                         static final long serialVersionUID = 12L;
                         public String call() throws IOException {
+                            String ekstaziResult = "false";
                             try{
                                 MavenFinder mavenFinder = new MavenFinder(buildWorkspace);
                                 ArrayList<FilePath> pomFiles = mavenFinder.find();
                                 for(int i = 0; i < pomFiles.size(); i++) {
-                                    // We don't want to pick up the extraneous pom.xml files from our target/ or test/resources/ directory
-                                    if (!pomFiles.get(i).toURI().toString().contains("/target/") && !pomFiles.get(i).toURI().toString().contains("/test/resources/")) {
-                                        final FilePath remoteFile = pomFiles.get(i);
+                                        FilePath remoteFile = pomFiles.get(i);
                                         EkstaziMavenManager ekstaziManager = new EkstaziMavenManager(remoteFile, ekstaziVersion);
-                                        boolean ekstaziEnabledInner = ekstaziManager.isEnabled();
-                                        if(ekstaziEnabledInner == true) {
-                                            return "true";
-                                        } else {
-                                            return "false";
+                                        if(ekstaziManager.isEnabled() == true) {
+                                            ekstaziResult = "true";
                                         }
-                                    }
                                 }
                             } catch (InterruptedException | EkstaziException e) {
                                 return "false";
                             }
-                            return("false");
+                            return(ekstaziResult);
                         }
                     };
                     String ekstaziEnabledString = buildWorkspace.getChannel().call(task);