.travis.yml

@@ -29,7 +29,7 @@ after_success:
 notifications:
   webhooks:
     urls:
-      - $GITTER_URL
-    on_success: change  # options: [always|never|change] default: always
+      - https://webhooks.gitter.im/e/6d8b14c5b83c43490417
+    on_success: always  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: never     # options: [always|never|change] default: always

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.1.0
+
+- #88: Support for AppVeyor CI
+
+
 ## 4.0.0
 
 - #85: Merge coverages from multiple reports to single source file
@@ -8,6 +13,11 @@
 - #77: Support for custom build timestamp format
 
 
+## 3.2.1
+
+- #87: Downgraded jgit version to support Java 6
+
+
 ## 3.2.0
 
 - #82: Improved error message for duplicate classes in different modules

LICENSE.MIT

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 - 2015, Tapio Rautonen
+Copyright (c) 2013 - 2016, 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

README.md

@@ -38,7 +38,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>4.1.0</version>
+    <version>4.2.0</version>
     <configuration>
         <repoToken>yourcoverallsprojectrepositorytoken</repoToken>
     </configuration>
@@ -104,7 +104,7 @@ Set up the JaCoCo Maven plugin in the build section of the project pom.xml:
 <plugin>
     <groupId>org.jacoco</groupId>
     <artifactId>jacoco-maven-plugin</artifactId>
-    <version>0.7.5.201505241946</version>
+    <version>0.7.6.201602180812</version>
     <executions>
         <execution>
             <id>prepare-agent</id>

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eluder</groupId>
     <artifactId>eluder-parent</artifactId>
-    <version>7</version>
+    <version>8</version>
   </parent>
 
   <groupId>org.eluder.coveralls</groupId>
   <artifactId>coveralls-maven-plugin</artifactId>
-  <version>4.1.0</version>
+  <version>4.2.0</version>
   <packaging>maven-plugin</packaging>
 
   <name>coveralls-maven-plugin</name>
@@ -24,14 +24,6 @@
     </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>
@@ -48,9 +40,9 @@
 
   <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>
+    <httpclient.version>4.5.2</httpclient.version>
+    <jackson.version>2.7.4</jackson.version>
+    <jgit.version>4.3.1.201605051710-r</jgit.version>
     <maven.version>3.0</maven.version>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
     <timestamp>${maven.build.timestamp}</timestamp>
@@ -113,6 +105,16 @@
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -125,6 +127,12 @@
       <version>3.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock</artifactId>
+      <version>1.58</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <dependencyManagement>

sample/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eluder</groupId>
     <artifactId>eluder-parent</artifactId>
-    <version>7</version>
+    <version>8</version>
     <relativePath></relativePath>
   </parent>
 
@@ -16,10 +16,14 @@
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <prerequisites>
+    <maven>3.1.0</maven>
+  </prerequisites>
+
   <properties>
-    <maven.jacoco.version>0.7.5.201505241946</maven.jacoco.version>
+    <maven.jacoco.version>0.7.6.201602180812</maven.jacoco.version>
     <maven.cobertura.version>2.7</maven.cobertura.version>
-    <maven.jasmine.version>2.0</maven.jasmine.version>
+    <maven.jasmine.version>2.1</maven.jasmine.version>
     <maven.saga.version>1.5.5</maven.saga.version>
   </properties>
 
@@ -28,12 +32,20 @@
     <module>module2</module>
   </modules>
 
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.eluder.coveralls</groupId>
         <artifactId>coveralls-maven-plugin</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>4.1.0</version>
         <configuration>
           <sourceDirectories>
             <sourceDirectory>module1/src/main/resources</sourceDirectory>

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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
@@ -33,11 +33,13 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
 import org.eluder.coveralls.maven.plugin.domain.CoverallsResponse;
 import org.eluder.coveralls.maven.plugin.domain.Git;
 import org.eluder.coveralls.maven.plugin.domain.GitRepository;
 import org.eluder.coveralls.maven.plugin.domain.Job;
 import org.eluder.coveralls.maven.plugin.httpclient.CoverallsClient;
+import org.eluder.coveralls.maven.plugin.httpclient.CoverallsProxyClient;
 import org.eluder.coveralls.maven.plugin.json.JsonWriter;
 import org.eluder.coveralls.maven.plugin.logging.CoverageTracingLogger;
 import org.eluder.coveralls.maven.plugin.logging.DryRunLogger;
@@ -208,7 +210,14 @@ public class CoverallsReportMojo extends AbstractMojo {
      */
     @Parameter(property = "coveralls.skip", defaultValue = "false")
     protected boolean skip;
-
+
+
+    /**
+     * Maven settings.
+     */
+    @Parameter(defaultValue = "${settings}", readonly = true, required = true)
+    protected Settings settings;
+
     /**
      * Maven project for runtime value resolution.
      */
@@ -337,7 +346,7 @@ protected JsonWriter createJsonWriter(final Job job) throws IOException {
      * @return http client that submits the coveralls data
      */
     protected CoverallsClient createCoverallsClient() {
-        return new CoverallsClient(coverallsUrl);
+        return new CoverallsProxyClient(coverallsUrl, settings.getActiveProxy());
     }
 
     /**
@@ -355,7 +364,16 @@ protected SourceCallback createSourceCallbackChain(final JsonWriter writer, fina
         chain = new UniqueSourceCallback(chain);
         return chain;
     }
-
+
+    /**
+     * Writes coverage data to JSON file.
+     *
+     * @param writer JSON writer that writes the coveralls data
+     * @param sourceCallback the source callback handler
+     * @param parsers list of coverage parsers
+     * @throws ProcessingException if process to to create JSON file fails
+     * @throws IOException if an I/O error occurs
+     */
     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() + "...");

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

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

@@ -11,7 +11,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

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

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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

src/main/java/org/eluder/coveralls/maven/plugin/httpclient/CoverallsClient.java

@@ -4,7 +4,7 @@
  * #[license]
  * coveralls-maven-plugin
  * %%
- * Copyright (C) 2013 - 2015 Tapio Rautonen
+ * Copyright (C) 2013 - 2016 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
@@ -32,12 +32,10 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.impl.client.HttpClientBuilder;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.eluder.coveralls.maven.plugin.ProcessingException;
@@ -62,15 +60,12 @@ public class CoverallsClient {
     private static final String FILE_NAME = "coveralls.json";
     private static final ContentType MIME_TYPE = ContentType.create("application/octet-stream", "utf-8");
 
-    private static final int DEFAULT_CONNECTION_TIMEOUT = 10000;
-    private static final int DEFAULT_SOCKET_TIMEOUT = 60000;
-
     private final String coverallsUrl;
     private final HttpClient httpClient;
     private final ObjectMapper objectMapper;
 
     public CoverallsClient(final String coverallsUrl) {
-        this(coverallsUrl, createDefaultClient(), new ObjectMapper());
+        this(coverallsUrl, new HttpClientFactory(coverallsUrl).create(), new ObjectMapper());
     }
 
     public CoverallsClient(final String coverallsUrl, final HttpClient httpClient, final ObjectMapper objectMapper) {
@@ -93,10 +88,13 @@ public CoverallsResponse submit(final File file) throws ProcessingException, IOE
     private CoverallsResponse parseResponse(final HttpResponse response) throws ProcessingException, IOException {
         HttpEntity entity = response.getEntity();
         ContentType contentType = ContentType.getOrDefault(entity);
+        if (contentType.getCharset() == null) {
+            throw new ProcessingException(getResponseErrorMessage(response, "Response doesn't contain Content-Type header"));
+        }
         InputStreamReader reader = null;
         try {
             if (response.getStatusLine().getStatusCode() >= HttpStatus.SC_INTERNAL_SERVER_ERROR) {
-                throw new IOException("Coveralls API interal error");
+                throw new IOException("Coveralls API internal error");
             }
             reader = new InputStreamReader(entity.getContent(), contentType.getCharset());
             CoverallsResponse cr = objectMapper.readValue(reader, CoverallsResponse.class);
@@ -125,14 +123,4 @@ private String getResponseErrorMessage(final HttpResponse response, final String
         }
         return errorMessage;
     }
-
-    private static HttpClient createDefaultClient() {
-        RequestConfig requestConfig = RequestConfig.custom()
-                .setConnectTimeout(DEFAULT_CONNECTION_TIMEOUT)
-                .setSocketTimeout(DEFAULT_SOCKET_TIMEOUT)
-                .build();
-        return HttpClientBuilder.create()
-                .setDefaultRequestConfig(requestConfig)
-                .build();
-    }
 }