Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: trautonen/coveralls-maven-plugin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.2.0
Choose a base ref
...
head repository: trautonen/coveralls-maven-plugin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.3.0
Choose a head ref
  • 10 commits
  • 8 files changed
  • 3 contributors

Commits on May 29, 2016

  1. Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    Copy the full SHA
    f62c7d0 View commit details
  2. Copy the full SHA
    9908144 View commit details

Commits on Aug 30, 2016

  1. Added support for Wercker

    Steffen Hildebrandt committed Aug 30, 2016
    Copy the full SHA
    91b71d9 View commit details

Commits on Sep 3, 2016

  1. Copy the full SHA
    14c9b04 View commit details
  2. Merge pull request #99 from SHildebrandt/master

    Added support for Wercker
    trautonen authored Sep 3, 2016
    Copy the full SHA
    0c780b0 View commit details

Commits on Sep 4, 2016

  1. Fixed Wercker environment variables

    Steffen Hildebrandt committed Sep 4, 2016
    Copy the full SHA
    e764098 View commit details

Commits on Sep 5, 2016

  1. Merge pull request #100 from SHildebrandt/master

    Fixed Wercker environment variables
    trautonen authored Sep 5, 2016
    Copy the full SHA
    a07d85b View commit details

Commits on Sep 24, 2016

  1. 1
    Copy the full SHA
    73f830f View commit details
  2. Copy the full SHA
    01fbfe4 View commit details
  3. Updated to version 4.3.0.

    trautonen committed Sep 24, 2016
    Copy the full SHA
    b2ad543 View commit details
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 4.2.0

- #95, #96: Improved error message for misbehaving Coveralls API
- #92: Support for HTTP proxies in settings.xml
- #91: Support for epoch formatted timestamps


## 4.1.0

- #88: Support for AppVeyor CI
28 changes: 27 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.2.0</version>
<version>4.3.0</version>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
@@ -322,13 +322,39 @@ See [migration](MIGRATION.md) documentation for more information.
scanning source loader.
- Pasi Niemi (@psiniemi) for coverage merging from different reports to single source file.
### Continuous integration
Travis CI builds the plugin with Oracle JDK 7. All successfully built snapshots are deployed to
Sonatype OSS repository. Cobertura is used to gather coverage metrics and the report is submitted
to Coveralls with this plugin.
### Using test versions
Add the following repository configurations to your `pom.xml` to enable snapshot versions of this
plugin to be used.
```xml
<repositories>
<repository>
<id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype-nexus-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</pluginRepository>
</pluginRepositories>
```

### License

The project coveralls-maven-plugin is licensed under the MIT license.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@

<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.2.0</version>
<version>4.3.0</version>
<packaging>maven-plugin</packaging>

<name>coveralls-maven-plugin</name>
@@ -41,8 +41,8 @@
<properties>
<java.version>1.7</java.version>
<httpclient.version>4.5.2</httpclient.version>
<jackson.version>2.7.4</jackson.version>
<jgit.version>4.3.1.201605051710-r</jgit.version>
<jackson.version>2.8.3</jackson.version>
<jgit.version>4.5.0.201609210915-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>
@@ -130,7 +130,7 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<version>1.58</version>
<version>2.1.12</version>
<scope>test</scope>
</dependency>
</dependencies>
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@
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.service.Wercker;
import org.eluder.coveralls.maven.plugin.source.SourceCallback;
import org.eluder.coveralls.maven.plugin.source.SourceLoader;
import org.eluder.coveralls.maven.plugin.source.UniqueSourceCallback;
@@ -307,6 +308,7 @@ protected List<ServiceSetup> getServices() {
services.add(new Jenkins(env));
services.add(new Bamboo(env));
services.add(new Appveyor(env));
services.add(new Wercker(env));
services.add(new General(env));
return services;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package org.eluder.coveralls.maven.plugin.service;

import java.util.Map;

/*
* #[license]
* coveralls-maven-plugin
* %%
* 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
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
* %[license]
*/

/**
* Service implementation for Wercker CI.
* <p>
* http://wercker.com/
*/
public class Wercker extends AbstractServiceSetup {

public static final String WERCKER_NAME = "wercker";
public static final String WERCKER = "WERCKER";
public static final String WERCKER_BUILD_ID = "WERCKER_BUILD_ID";
public static final String WERCKER_BUILD_URL = "WERCKER_BUILD_URL";
public static final String WERCKER_BRANCH = "WERCKER_GIT_BRANCH";

public Wercker(final Map<String, String> env) {
super(env);
}

@Override
public boolean isSelected() {
return "true".equalsIgnoreCase(getProperty(WERCKER));
}

@Override
public String getName() {
return WERCKER_NAME;
}

@Override
public String getJobId() {
return getProperty(WERCKER_BUILD_ID);
}

@Override
public String getBuildUrl() {
return getProperty(WERCKER_BUILD_URL);
}

@Override
public String getBranch() {
return getProperty(WERCKER_BRANCH);
}
}
Original file line number Diff line number Diff line change
@@ -118,4 +118,4 @@ public void testNonProxiedHostRequest() throws Exception {

Assert.assertEquals("Hello World!", body);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
package org.eluder.coveralls.maven.plugin.service;

/*
* #[license]
* coveralls-maven-plugin
* %%
* 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
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
* %[license]
*/

import org.junit.Test;

import java.util.HashMap;
import java.util.Map;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

public class WerckerTest {

private Map<String, String> env() {
Map<String, String> env = new HashMap<String, String>();
env.put("WERCKER", "true");
env.put("WERCKER_BUILD_URL", "https://app.wercker.com/build/123456789");
env.put("WERCKER_BUILD_ID", "123456789");
env.put("WERCKER_GIT_BRANCH", "master");
return env;
}

@Test
public void testIsSelectedForNothing() {
assertFalse(new Wercker(new HashMap<String, String>()).isSelected());
}

@Test
public void testIsSelectedForWercker() {
assertTrue(new Wercker(env()).isSelected());
}

@Test
public void testGetName() {
assertEquals("wercker", new Wercker(env()).getName());
}

@Test
public void testGetJobId() {
assertEquals("123456789", new Wercker(env()).getJobId());
}

@Test
public void testGetBuildUrl() {
assertEquals("https://app.wercker.com/build/123456789", new Wercker(env()).getBuildUrl());
}

@Test
public void testGetBranch() {
assertEquals("master", new Wercker(env()).getBranch());
}
}
Original file line number Diff line number Diff line change
@@ -60,4 +60,4 @@ public void testMatchesAgainstText() throws Exception {
assertFalse(Wildcards.matches("abc", "cba"));
}

}
}