Skip to content
This repository was archived by the owner on Jul 3, 2020. It is now read-only.

Commit d9117c9

Browse files
authored
Merge pull request #233 from dacrome/update-dependencies-and-plugins
Update dependencies and plugins and fix Codacy coverage reporter
2 parents ddb5ae7 + 38a41e5 commit d9117c9

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

circle.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ machine:
44

55
dependencies:
66
override:
7+
- curl -L https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/2.0.1/codacy-coverage-reporter-2.0.1-assembly.jar -o codacy-coverage-reporter.jar
78
- mvn -U dependency:resolve dependency:resolve-plugins
8-
- curl http://www.jpm4j.org/install/script > jpmInstall.sh
9-
- sudo sh jpmInstall.sh
10-
- sudo jpm install com.codacy:codacy-coverage-reporter:assembly
119

1210
test:
1311
pre:
@@ -18,7 +16,7 @@ test:
1816
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
1917
- find . -type f -regex ".*/target/.*-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
2018
- cp -r target/coverage-reports/jacoco/ $CIRCLE_ARTIFACTS
21-
- test -z $CODACY_PROJECT_TOKEN || codacy-coverage-reporter -l Java -r target/coverage-reports/jacoco/jacoco.xml --projectToken $CODACY_PROJECT_TOKEN
19+
- test -z $CODACY_PROJECT_TOKEN || java -cp codacy-coverage-reporter.jar com.codacy.CodacyCoverageReporter -l Java -r target/coverage-reports/jacoco/jacoco.xml
2220
- test -z $COVERALLS_REPO_TOKEN || mvn coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN
2321

2422
deployment:

pom.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<sonar.core.codeCoveragePlugin>cobertura</sonar.core.codeCoveragePlugin>
7272
<!-- force sonar to reuse reports generated during build cycle -->
7373
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
74-
<mockserver.version>3.10.4</mockserver.version>
74+
<mockserver.version>3.11</mockserver.version>
7575
</properties>
7676

7777
<dependencies>
@@ -85,20 +85,20 @@
8585
<dependency>
8686
<groupId>joda-time</groupId>
8787
<artifactId>joda-time</artifactId>
88-
<version>2.9.6</version>
88+
<version>2.9.9</version>
8989
</dependency>
9090

9191
<dependency>
9292
<groupId>org.glassfish.jersey.connectors</groupId>
9393
<artifactId>jersey-apache-connector</artifactId>
94-
<version>2.24</version>
94+
<version>2.25.1</version>
9595
</dependency>
9696

9797
<!-- JSON -->
9898
<dependency>
9999
<groupId>com.fasterxml.jackson.core</groupId>
100100
<artifactId>jackson-databind</artifactId>
101-
<version>2.8.5</version>
101+
<version>2.9.1</version>
102102
</dependency>
103103

104104
<dependency>
@@ -117,14 +117,14 @@
117117
<dependency>
118118
<groupId>org.spockframework</groupId>
119119
<artifactId>spock-core</artifactId>
120-
<version>1.1-groovy-2.4-rc-3</version>
120+
<version>1.1-groovy-2.4</version>
121121
<scope>test</scope>
122122
</dependency>
123123

124124
<dependency>
125125
<groupId>cglib</groupId>
126126
<artifactId>cglib-nodep</artifactId>
127-
<version>3.2.4</version>
127+
<version>3.2.5</version>
128128
<scope>test</scope>
129129
</dependency>
130130

@@ -153,7 +153,7 @@
153153
<dependency>
154154
<groupId>com.jcabi</groupId>
155155
<artifactId>jcabi-matchers</artifactId>
156-
<version>1.3</version>
156+
<version>1.4</version>
157157
<scope>test</scope>
158158
</dependency>
159159

@@ -213,7 +213,7 @@
213213
<plugin>
214214
<groupId>com.mycila</groupId>
215215
<artifactId>license-maven-plugin</artifactId>
216-
<version>2.11</version>
216+
<version>3.0</version>
217217
<configuration>
218218
<header>LICENSE</header>
219219
<excludes>
@@ -239,7 +239,7 @@
239239
<plugin>
240240
<groupId>org.apache.maven.plugins</groupId>
241241
<artifactId>maven-compiler-plugin</artifactId>
242-
<version>3.5.1</version>
242+
<version>3.6.2</version>
243243
<extensions>true</extensions>
244244
<configuration>
245245
<compilerId>groovy-eclipse-compiler</compilerId>
@@ -278,7 +278,7 @@
278278
<plugin>
279279
<groupId>org.apache.maven.plugins</groupId>
280280
<artifactId>maven-surefire-plugin</artifactId>
281-
<version>2.19.1</version>
281+
<version>2.20</version>
282282
<configuration>
283283
<parallel>classes</parallel>
284284
<threadCount>3</threadCount>
@@ -293,7 +293,7 @@
293293
<plugin>
294294
<groupId>org.codehaus.mojo</groupId>
295295
<artifactId>build-helper-maven-plugin</artifactId>
296-
<version>1.11</version>
296+
<version>3.0.0</version>
297297
<executions>
298298
<execution>
299299
<id>add-test-source</id>
@@ -313,7 +313,7 @@
313313
<plugin>
314314
<groupId>org.jacoco</groupId>
315315
<artifactId>jacoco-maven-plugin</artifactId>
316-
<version>0.7.7.201606060606</version>
316+
<version>0.7.9</version>
317317
<configuration>
318318
<dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
319319
<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
@@ -338,7 +338,7 @@
338338
<plugin>
339339
<groupId>org.eluder.coveralls</groupId>
340340
<artifactId>coveralls-maven-plugin</artifactId>
341-
<version>4.2.0</version>
341+
<version>4.3.0</version>
342342
<configuration>
343343
<jacocoReports>
344344
<entry>${project.build.directory}/coverage-reports/jacoco/jacoco.xml</entry>
@@ -391,7 +391,7 @@
391391

392392
<plugin>
393393
<artifactId>maven-shade-plugin</artifactId>
394-
<version>2.4.3</version>
394+
<version>3.1.0</version>
395395
<executions>
396396
<execution>
397397
<phase>package</phase>

0 commit comments

Comments
 (0)