Skip to content

Commit d3c67f9

Browse files
mcwebamcweba
authored
Merge pull request #19 from swisspost/develop
PR for release
2 parents 0674e62 + 91f4c02 commit d3c67f9

File tree

3 files changed

+62
-10
lines changed

3 files changed

+62
-10
lines changed

‎.github/workflows/maven.yml

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828

2929
- name: Install, unit test, integration test
3030
run: mvn install -Dmaven.javadoc.skip=true -B -V
31+
32+
- name: Upload coverage reports to Codecov
33+
uses: codecov/codecov-action@v3
3134

3235
- name: Release to maven central
3336
if: github.ref_name == 'master' && github.event_name != 'pull_request' && github.repository == 'swisspost/vertx-cluster-watchdog'

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ vertx-cluster-watchdog
22
======================
33

44
[![Build Status](https://travis-ci.com/swisspush/vertx-cluster-watchdog.svg?branch=master)](https://travis-ci.com/swisspush/vertx-cluster-watchdog)
5-
[![codecov](https://codecov.io/gh/swisspush/vertx-cluster-watchdog/branch/master/graph/badge.svg)](https://codecov.io/gh/swisspush/vertx-cluster-watchdog)
5+
[![codecov](https://codecov.io/gh/swisspost/vertx-cluster-watchdog/branch/master/graph/badge.svg?token=nbrYxHDMmJ)](https://codecov.io/gh/swisspost/vertx-cluster-watchdog)
66

77
Checks if all your hazelcast cluster members are receiveing published messages over the bus.
88

‎pom.xml

+58-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.swisspush</groupId>
44
<artifactId>cluster-watchdog</artifactId>
5-
<version>3.0.2-SNAPSHOT</version>
5+
<version>3.1.0-SNAPSHOT</version>
66
<name>cluster-watchdog</name>
77
<packaging>jar</packaging>
88
<description>
@@ -54,19 +54,19 @@
5454
<dependency>
5555
<groupId>commons-io</groupId>
5656
<artifactId>commons-io</artifactId>
57-
<version>2.4</version>
57+
<version>${commons-io.version}</version>
5858
<scope>compile</scope>
5959
</dependency>
6060
<dependency>
6161
<groupId>commons-lang</groupId>
6262
<artifactId>commons-lang</artifactId>
63-
<version>2.4</version>
63+
<version>${commons-lang.version}</version>
6464
<scope>compile</scope>
6565
</dependency>
6666
<dependency>
6767
<groupId>org.apache.commons</groupId>
6868
<artifactId>commons-collections4</artifactId>
69-
<version>4.1</version>
69+
<version>${commons-collections4.version}</version>
7070
<scope>compile</scope>
7171
</dependency>
7272
<dependency>
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>junit</groupId>
8585
<artifactId>junit</artifactId>
86-
<version>4.13.2</version>
86+
<version>${junit.version}</version>
8787
<scope>test</scope>
8888
</dependency>
8989
<dependency>
@@ -98,12 +98,12 @@
9898
<plugins>
9999
<plugin>
100100
<artifactId>maven-surefire-plugin</artifactId>
101-
<version>3.0.0-M5</version>
101+
<version>3.0.0</version>
102102
</plugin>
103103
<plugin>
104104
<groupId>org.jacoco</groupId>
105105
<artifactId>jacoco-maven-plugin</artifactId>
106-
<version>0.8.7</version>
106+
<version>0.8.9</version>
107107
</plugin>
108108
<plugin>
109109
<groupId>org.apache.maven.plugins</groupId>
@@ -157,6 +157,51 @@
157157
</plugins>
158158
</pluginManagement>
159159
<plugins>
160+
<plugin>
161+
<artifactId>maven-surefire-plugin</artifactId>
162+
<configuration>
163+
<!-- Sets the VM argument line used when unit tests are run. -->
164+
<argLine>${surefireArgLine}</argLine>
165+
</configuration>
166+
</plugin>
167+
<plugin>
168+
<groupId>org.jacoco</groupId>
169+
<artifactId>jacoco-maven-plugin</artifactId>
170+
<executions>
171+
<execution>
172+
<id>pre-unit-test</id>
173+
<goals>
174+
<goal>prepare-agent</goal>
175+
</goals>
176+
<configuration>
177+
<!-- Sets the path to the file which contains the execution data. -->
178+
<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
179+
<!--
180+
Sets the name of the property containing the settings
181+
for JaCoCo runtime agent.
182+
-->
183+
<propertyName>surefireArgLine</propertyName>
184+
</configuration>
185+
</execution>
186+
<!--
187+
Ensures that the code coverage report for unit tests is created after
188+
unit tests have been run.
189+
-->
190+
<execution>
191+
<id>post-unit-test</id>
192+
<phase>test</phase>
193+
<goals>
194+
<goal>report</goal>
195+
</goals>
196+
<configuration>
197+
<!-- Sets the path to the file which contains the execution data. -->
198+
<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
199+
<!-- Sets the output directory for the code coverage report. -->
200+
<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
201+
</configuration>
202+
</execution>
203+
</executions>
204+
</plugin>
160205
<plugin>
161206
<groupId>external.atlassian.jgitflow</groupId>
162207
<artifactId>jgitflow-maven-plugin</artifactId>
@@ -352,8 +397,12 @@
352397
</profile>
353398
</profiles>
354399
<properties>
355-
<vertx.version>4.2.1</vertx.version>
356-
<slf4j.version>1.7.36</slf4j.version>
400+
<vertx.version>4.5.1</vertx.version>
401+
<slf4j.version>2.0.10</slf4j.version>
402+
<commons-lang.version>2.6</commons-lang.version>
403+
<commons-io.version>2.15.1</commons-io.version>
404+
<commons-collections4.version>4.4</commons-collections4.version>
405+
<junit.version>4.13.2</junit.version>
357406
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
358407
<sonatypeOssDistMgmtSnapshotsUrl>
359408
https://oss.sonatype.org/content/repositories/snapshots/

0 commit comments

Comments
 (0)