CHANGELOG.md

@@ -1,10 +1,17 @@
 # Changelog
 
+## 3.2.0
+
+- #82: Improved error message for duplicate classes in different modules
+- #76: Property to allow Coveralls service fail without build failure
+- #74: Handle transitive logging dependencies better
+
+
 ## 3.1.0
 
-- #63: Directory scanning source loader
-- #65, #66, #68: Support for Shippable CI
 - #67: Configurable project basedir
+- #65, #66, #68: Support for Shippable CI
+- #63: Directory scanning source loader
 
 
 ## 3.0.1

README.md

@@ -32,7 +32,7 @@ Set up the Coveralls maven plugin in the build section of the project pom.xml:
 <plugin>
     <groupId>org.eluder.coveralls</groupId>
     <artifactId>coveralls-maven-plugin</artifactId>
-    <version>3.2.0</version>
+    <version>4.0.0</version>
     <configuration>
         <repoToken>yourcoverallsprojectrepositorytoken</repoToken>
     </configuration>

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.eluder.coveralls</groupId>
   <artifactId>coveralls-maven-plugin</artifactId>
-  <version>3.2.0</version>
+  <version>4.0.0</version>
   <packaging>maven-plugin</packaging>
 
   <name>coveralls-maven-plugin</name>
@@ -47,11 +47,12 @@
   </scm>
 
   <properties>
+    <java.version>1.7</java.version>
     <httpclient.version>4.5</httpclient.version>
     <jackson.version>2.6.1</jackson.version>
     <jgit.version>4.0.1.201506240215-r</jgit.version>
     <maven.version>3.0</maven.version>
-    <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssa</maven.build.timestamp.format>
+    <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
     <timestamp>${maven.build.timestamp}</timestamp>
   </properties>
 

sample/README.md

@@ -11,7 +11,7 @@ mvn -Pcobertura clean cobertura:cobertura
 ### JaCoCo
 
 ```
-mvn -Pjacoco clean test jacoco:report
+mvn -Pjacoco clean verify jacoco:report
 ```
 
 

sample/module2/src/test/java/org/eluder/coverage/sample/PartialCoverageIT.java

@@ -0,0 +1,12 @@
+package org.eluder.coverage.sample;
+
+import org.junit.Test;
+
+public class PartialCoverageIT {
+
+    @Test
+    public void testSum() {
+        new PartialCoverage().partial(false);
+    }
+
+}

sample/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eluder</groupId>
     <artifactId>eluder-parent</artifactId>
-    <version>6</version>
+    <version>7</version>
     <relativePath></relativePath>
   </parent>
 
@@ -17,10 +17,12 @@
   <packaging>pom</packaging>
 
   <properties>
-    <maven.jacoco.version>0.7.2.201409121644</maven.jacoco.version>
-    <maven.cobertura.version>2.6</maven.cobertura.version>
+    <maven.jacoco.version>0.7.5.201505241946</maven.jacoco.version>
+    <maven.cobertura.version>2.7</maven.cobertura.version>
+    <maven.jasmine.version>2.0</maven.jasmine.version>
+    <maven.saga.version>1.5.4</maven.saga.version>
   </properties>
-  
+
   <modules>
     <module>module1</module>
     <module>module2</module>
@@ -38,6 +40,12 @@
           </sourceDirectories>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
@@ -74,10 +82,29 @@
             <version>${maven.jacoco.version}</version>
             <executions>
               <execution>
+                <id>default-prepare-agent</id>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>default-prepare-agent-integration</id>
+                <goals>
+                  <goal>prepare-agent-integration</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>default-report</id>
                 <goals>
                   <goal>report</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>default-report-integration</id>
+                <goals>
+                  <goal>report-integration</goal>
+                </goals>
+              </execution>
             </executions>
           </plugin>
         </plugins>
@@ -90,7 +117,7 @@
           <plugin>
             <groupId>com.github.searls</groupId>
             <artifactId>jasmine-maven-plugin</artifactId>
-            <version>1.3.1.5</version>
+            <version>${maven.jasmine.version}</version>
             <executions>
               <execution>
                 <goals>
@@ -102,12 +129,13 @@
               <jsSrcDir>${project.basedir}/src/main/resources/</jsSrcDir>
               <jsTestSrcDir>${project.basedir}/src/test/specs</jsTestSrcDir>
               <keepServerAlive>true</keepServerAlive>
+              <webDriverClassName>org.openqa.selenium.htmlunit.HtmlUnitDriver</webDriverClassName>
             </configuration>
           </plugin>
           <plugin>
             <groupId>com.github.timurstrekalov</groupId>
             <artifactId>saga-maven-plugin</artifactId>
-            <version>1.5.3</version>
+            <version>${maven.saga.version}</version>
             <executions>
               <execution>
                 <goals>
@@ -120,6 +148,8 @@
               <outputDir>${project.build.directory}/saga-coverage</outputDir>
               <noInstrumentPatterns>
                 <pattern>.*/spec/.*</pattern>
+                <pattern>.*/classpath/.*</pattern>
+                <pattern>.*/webjars/.*</pattern>
               </noInstrumentPatterns>
             </configuration>
           </plugin>

src/main/java/org/eluder/coveralls/maven/plugin/CoverallsReportMojo.java

@@ -56,6 +56,7 @@
 import org.eluder.coveralls.maven.plugin.source.UniqueSourceCallback;
 import org.eluder.coveralls.maven.plugin.util.CoverageParsersFactory;
 import org.eluder.coveralls.maven.plugin.util.SourceLoaderFactory;
+import org.eluder.coveralls.maven.plugin.util.TimestampParser;
 
 import java.io.File;
 import java.io.IOException;
@@ -163,12 +164,19 @@ public class CoverallsReportMojo extends AbstractMojo {
      */
     @Parameter(property = "pullRequest")
     protected String pullRequest;
-
+
+    /**
+     * Build timestamp format. Must be in format supported by SimpleDateFormat.
+     */
+    @Parameter(property = "timestampFormat", defaultValue = "${maven.build.timestamp.format}")
+    protected String timestampFormat;
+
     /**
-     * Build timestamp. Must be in 'yyyy-MM-dd HH:mm:ssa' format.
+     * Build timestamp. Must be in format defined by 'timestampFormat' if it's available or in
+     * default timestamp format yyyy-MM-dd'T'HH:mm:ss'Z'.
      */
-    @Parameter(property = "timestamp", defaultValue = "${timestamp}")
-    protected Date timestamp;
+    @Parameter(property = "timestamp", defaultValue = "${maven.build.timestamp}")
+    protected String timestamp;
 
     /**
      * Dry run Coveralls report without actually sending it.
@@ -222,13 +230,13 @@ public final void execute() throws MojoExecutionException, MojoFailureException
             List<CoverageParser> parsers = createCoverageParsers(sourceLoader);
             JsonWriter writer = createJsonWriter(job);
             CoverallsClient client = createCoverallsClient();
-            List<Logger> reporters = new ArrayList<Logger>();
+            List<Logger> reporters = new ArrayList<>();
             reporters.add(new JobLogger(job));
             SourceCallback sourceCallback = createSourceCallbackChain(writer, reporters);
             reporters.add(new DryRunLogger(job.isDryRun(), writer.getCoverallsFile()));
 
             report(reporters, Position.BEFORE);
-            writeCoveralls(writer, sourceLoader, sourceCallback, parsers);
+            writeCoveralls(writer, sourceCallback, parsers);
             report(reporters, Position.AFTER);
 
             if (!job.isDryRun()) {
@@ -282,7 +290,7 @@ protected Environment createEnvironment() {
      */
     protected List<ServiceSetup> getServices() {
         Map<String, String> env = System.getenv();
-        List<ServiceSetup> services = new ArrayList<ServiceSetup>();
+        List<ServiceSetup> services = new ArrayList<>();
         services.add(new Shippable(env));
         services.add(new Travis(env));
         services.add(new Circle(env));
@@ -294,21 +302,23 @@ protected List<ServiceSetup> getServices() {
 
     /**
      * @return job that describes the coveralls report
+     * @throws ProcessingException if processing of timestamp fails
      * @throws IOException if an I/O error occurs
      */
-    protected Job createJob() throws IOException {
+    protected Job createJob() throws ProcessingException, IOException {
         Git git = new GitRepository(basedir).load();
+        Date time = new TimestampParser(timestampFormat).parse(timestamp);
         return new Job()
             .withRepoToken(repoToken)
             .withServiceName(serviceName)
             .withServiceJobId(serviceJobId)
             .withServiceBuildNumber(serviceBuildNumber)
             .withServiceBuildUrl(serviceBuildUrl)
             .withServiceEnvironment(serviceEnvironment)
-            .withTimestamp(timestamp)
             .withDryRun(dryRun)
             .withBranch(branch)
             .withPullRequest(pullRequest)
+            .withTimestamp(time)
             .withGit(git);
     }
 
@@ -344,16 +354,16 @@ protected SourceCallback createSourceCallbackChain(final JsonWriter writer, fina
         return chain;
     }
 
-    protected void writeCoveralls(final JsonWriter writer, final SourceLoader sourceLoader, final SourceCallback sourceCallback, final List<CoverageParser> parsers) throws ProcessingException, IOException {
+    protected void writeCoveralls(final JsonWriter writer, final SourceCallback sourceCallback, final List<CoverageParser> parsers) throws ProcessingException, IOException {
         try {
             getLog().info("Writing Coveralls data to " + writer.getCoverallsFile().getAbsolutePath() + "...");
             long now = System.currentTimeMillis();
-            writer.writeStart();
+            sourceCallback.onBegin();
             for (CoverageParser parser : parsers) {
                 getLog().info("Processing coverage report from " + parser.getCoverageFile().getAbsolutePath());
                 parser.parse(sourceCallback);
             }
-            writer.writeEnd();
+            sourceCallback.onComplete();
             long duration = System.currentTimeMillis() - now;
             getLog().info("Successfully wrote Coveralls data in " + duration + "ms");
         } finally {

src/main/java/org/eluder/coveralls/maven/plugin/domain/GitRepository.java

@@ -26,11 +26,6 @@
  * %[license]
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
@@ -39,6 +34,11 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 public class GitRepository {
 
     private final File sourceDirectory;
@@ -48,14 +48,11 @@ public GitRepository(final File sourceDirectory) {
     }
 
     public Git load() throws IOException {
-        Repository repository = new RepositoryBuilder().findGitDir(this.sourceDirectory).build();
-        try {
+        try (Repository repository = new RepositoryBuilder().findGitDir(this.sourceDirectory).build()) {
             Git.Head head = getHead(repository);
             String branch = getBranch(repository);
             List<Git.Remote> remotes = getRemotes(repository);
             return new Git(repository.getWorkTree(), head, branch, remotes);
-        } finally {
-            repository.close();
         }
     }
 
@@ -79,7 +76,7 @@ private String getBranch(final Repository repository) throws IOException {
 
     private List<Git.Remote> getRemotes(final Repository repository) {
         Config config = repository.getConfig();
-        List<Git.Remote> remotes = new ArrayList<Git.Remote>();
+        List<Git.Remote> remotes = new ArrayList<>();
         for (String remote : config.getSubsections("remote")) {
             String url = config.getString("remote", remote, "url");
             remotes.add(new Git.Remote(remote, url));