trautonen · Oct 16, 2014 · Oct 16, 2014 · Oct 26, 2014 · Oct 27, 2014 · Feb 6, 2015
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.0.1
+
+- #53: Improved error message for missing source encoding
+- #52: Ignore duplicate source files on Cobertura aggregate mode
+
+
 ## 3.0.0
 
 - #48: Removed support for URL based source loading due to Coveralls changes

diff --git a/LICENSE.MIT b/LICENSE.MIT
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 - 2014, Tapio Rautonen
+Copyright (c) 2013 - 2015, Tapio Rautonen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@ coveralls-maven-plugin
 
 [![Build Status](http://img.shields.io/travis/trautonen/coveralls-maven-plugin/master.svg)](https://travis-ci.org/trautonen/coveralls-maven-plugin)
 [![Coverage Status](http://img.shields.io/coveralls/trautonen/coveralls-maven-plugin/master.svg)](https://coveralls.io/r/trautonen/coveralls-maven-plugin?branch=master)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.eluder.coveralls/coveralls-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.eluder.coveralls/coveralls-maven-plugin/)
 
 Maven plugin for submitting Java code coverage reports to [Coveralls](https://coveralls.io/) web
 service.
@@ -15,8 +16,8 @@ service.
   [Saga](http://timurstrekalov.github.io/saga/) coverage tools
 * Multi-module report aggregation
 * Built-in support for [Travis CI](https://travis-ci.org/), [Circle](https://circleci.com/),
-  [Codeship](https://www.codeship.io/), [Jenkins](http://jenkins-ci.org/) and
-  [Bamboo](https://www.atlassian.com/software/bamboo/) continuous integration services
+  [Codeship](https://www.codeship.io/), [Jenkins](http://jenkins-ci.org/),
+  [Bamboo](https://www.atlassian.com/software/bamboo/) and [Shippable](https://www.shippable.com/) continuous integration services
 * Fully streaming implementation for fast report generation and small memory footprint
 * Provides clean interfaces to allow easy extending to different coverage tools
 * Convention over configuration for almost zero configuration usage
@@ -31,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.0.1</version>
+    <version>3.1.0</version>
     <configuration>
         <repoToken>yourcoverallsprojectrepositorytoken</repoToken>
     </configuration>
@@ -201,6 +202,7 @@ service environment will not override it.
 | `jacocoReports` | `List<File>` | List of additional JaCoCo report files. ${project.reporting.outputDirectory}/jacoco/jacoco.xml is used as default for every module. |
 | `coberturaReports` | `List<File>` | List of additional Cobertura report files. ${project.reporting.outputDirectory}/cobertura/coverage.xml is used as default for every module. |
 | `sagaReports` | `List<File>` | List of additional Saga report files. ${project.build.directory}/saga-coverage/total-coverage.xml is used as default for every module. |
+| `relativeReportDirs` | `List<String>` | List of additional relative report directories. Directories relative to ${project.reporting.outputDirectory} and ${project.build.directory} are scanned for reports. |
 | `coverallsFile` | `File` | **Default: ${project.build.directory}/coveralls.json**<br>File path to write and submit Coveralls data. |
 | `coverallsUrl` | `String` | **Default: https://coveralls.io/api/v1/jobs**<br>Url for the Coveralls API. |
 | `sourceDirectories` | `List<File>` | List of additional source directories. The plugin will scan the project's compiled source roots for defaults. |
@@ -215,6 +217,8 @@ service environment will not override it.
 | `pullRequest` | `String` | GitHub pull request identifier. If not provided the supported service environments are used. |
 | `timestamp` | `Date` | **Default: ${timestamp}**<br>Build timestamp. Must be in Maven supported 'yyyy-MM-dd HH:mm:ssa' format. |
 | `dryRun` | `boolean` | **Default: false**<br>Dry run Coveralls report without actually sending it. |
+| `scanForSources` | `boolean` | **Default: false**<br>Scan subdirectories for source files. |
+| `coveralls.basedir` | `File` | **Default: ${project.basedir}<br>Base directory of the project. |
 | `coveralls.skip` | `boolean` | **Default: false**<br>Skip the plugin execution. |
 
 

diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eluder</groupId>
     <artifactId>eluder-parent</artifactId>
-    <version>5</version>
+    <version>6</version>
   </parent>
 
   <groupId>org.eluder.coveralls</groupId>
   <artifactId>coveralls-maven-plugin</artifactId>
-  <version>3.0.1</version>
+  <version>3.1.0</version>
   <packaging>maven-plugin</packaging>
 
   <name>coveralls-maven-plugin</name>
@@ -24,6 +24,14 @@
     </developer>
   </developers>
 
+  <contributors>
+    <contributor>
+      <name>Marvin H Froeder</name>
+      <email>velo dot br at gmail dot com</email>
+      <url>about.me/velo</url>
+    </contributor>
+  </contributors>
+
   <licenses>
     <license>
       <name>The MIT License (MIT)</name>
@@ -242,6 +250,14 @@
             </instrumentation>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>${maven.checkstyle.version}</version>
+          <configuration>
+            <excludes>**/HelpMojo.java</excludes>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/CoverageParser.java b/src/main/java/org/eluder/coveralls/maven/plugin/CoverageParser.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/CoverallsReportMojo.java b/src/main/java/org/eluder/coveralls/maven/plugin/CoverallsReportMojo.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,14 +26,6 @@
  * %[license]
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -57,13 +49,22 @@
 import org.eluder.coveralls.maven.plugin.service.General;
 import org.eluder.coveralls.maven.plugin.service.Jenkins;
 import org.eluder.coveralls.maven.plugin.service.ServiceSetup;
+import org.eluder.coveralls.maven.plugin.service.Shippable;
 import org.eluder.coveralls.maven.plugin.service.Travis;
 import org.eluder.coveralls.maven.plugin.source.SourceCallback;
 import org.eluder.coveralls.maven.plugin.source.SourceLoader;
 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 java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
 @Mojo(name = "report", threadSafe = false, aggregator = true)
 public class CoverallsReportMojo extends AbstractMojo {
 
@@ -84,7 +85,13 @@ public class CoverallsReportMojo extends AbstractMojo {
      */
     @Parameter(property = "sagaReports")
     protected List<File> sagaReports;
-
+
+    /**
+     * Directories for relative per module specific report files.
+     */
+    @Parameter(property = "relativeReportDirs")
+    protected List<String> relativeReportDirs;
+
     /**
      * File path to write and submit Coveralls data.
      */
@@ -169,6 +176,18 @@ public class CoverallsReportMojo extends AbstractMojo {
     @Parameter(property = "dryRun", defaultValue = "false")
     protected boolean dryRun;
 
+    /**
+     * Scan subdirectories for source files.
+     */
+    @Parameter(property = "scanForSources", defaultValue = "false")
+    protected boolean scanForSources;
+
+    /**
+     * Base directory of the project.
+     */
+    @Parameter(property = "coveralls.basedir", defaultValue = "${project.basedir}")
+    protected File basedir;
+
     /**
      * Skip the plugin execution.
      */
@@ -180,7 +199,8 @@ public class CoverallsReportMojo extends AbstractMojo {
      */
     @Component
     protected MavenProject project;
-
+
+
     @Override
     public final void execute() throws MojoExecutionException, MojoFailureException {
         if (skip) {
@@ -228,6 +248,7 @@ protected List<CoverageParser> createCoverageParsers(final SourceLoader sourceLo
                 .withJaCoCoReports(jacocoReports)
                 .withCoberturaReports(coberturaReports)
                 .withSagaReports(sagaReports)
+                .withRelativeReportDirs(relativeReportDirs)
                 .createParsers();
     }
 
@@ -239,6 +260,7 @@ protected List<CoverageParser> createCoverageParsers(final SourceLoader sourceLo
     protected SourceLoader createSourceLoader(final Job job) {
         return new SourceLoaderFactory(job.getGit().getBaseDir(), project, sourceEncoding)
                 .withSourceDirectories(sourceDirectories)
+                .withScanForSources(scanForSources)
                 .createSourceLoader();
     }
 
@@ -255,6 +277,7 @@ protected Environment createEnvironment() {
     protected List<ServiceSetup> getServices() {
         Map<String, String> env = System.getenv();
         List<ServiceSetup> services = new ArrayList<ServiceSetup>();
+        services.add(new Shippable(env));
         services.add(new Travis(env));
         services.add(new Circle(env));
         services.add(new Jenkins(env));
@@ -268,7 +291,7 @@ protected List<ServiceSetup> getServices() {
      * @throws IOException if an I/O error occurs
      */
     protected Job createJob() throws IOException {
-        Git git = new GitRepository(project.getBasedir()).load();
+        Git git = new GitRepository(basedir).load();
         return new Job()
             .withRepoToken(repoToken)
             .withServiceName(serviceName)

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/Environment.java b/src/main/java/org/eluder/coveralls/maven/plugin/Environment.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/ProcessingException.java b/src/main/java/org/eluder/coveralls/maven/plugin/ProcessingException.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/domain/CoverallsResponse.java b/src/main/java/org/eluder/coveralls/maven/plugin/domain/CoverallsResponse.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/domain/Git.java b/src/main/java/org/eluder/coveralls/maven/plugin/domain/Git.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/domain/GitRepository.java b/src/main/java/org/eluder/coveralls/maven/plugin/domain/GitRepository.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/domain/Job.java b/src/main/java/org/eluder/coveralls/maven/plugin/domain/Job.java
@@ -11,7 +11,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/domain/JsonObject.java b/src/main/java/org/eluder/coveralls/maven/plugin/domain/JsonObject.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/domain/Source.java b/src/main/java/org/eluder/coveralls/maven/plugin/domain/Source.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/httpclient/CoverallsClient.java b/src/main/java/org/eluder/coveralls/maven/plugin/httpclient/CoverallsClient.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/json/JsonWriter.java b/src/main/java/org/eluder/coveralls/maven/plugin/json/JsonWriter.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/logging/CoverageTracingLogger.java b/src/main/java/org/eluder/coveralls/maven/plugin/logging/CoverageTracingLogger.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/logging/DryRunLogger.java b/src/main/java/org/eluder/coveralls/maven/plugin/logging/DryRunLogger.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/logging/JobLogger.java b/src/main/java/org/eluder/coveralls/maven/plugin/logging/JobLogger.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/logging/Logger.java b/src/main/java/org/eluder/coveralls/maven/plugin/logging/Logger.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/parser/AbstractXmlEventParser.java b/src/main/java/org/eluder/coveralls/maven/plugin/parser/AbstractXmlEventParser.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/parser/CoberturaParser.java b/src/main/java/org/eluder/coveralls/maven/plugin/parser/CoberturaParser.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/org/eluder/coveralls/maven/plugin/parser/JaCoCoParser.java b/src/main/java/org/eluder/coveralls/maven/plugin/parser/JaCoCoParser.java
@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2014 Tapio Rautonen
+ * Copyright (C) 2013 - 2015 Tapio Rautonen
  * %%
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal