Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR for release #10

Merged
merged 13 commits into from
Jan 17, 2024
5 changes: 4 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ jobs:

- name: Install, unit test, integration test
run: mvn install -Dmaven.javadoc.skip=true -B -V

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3

- name: Release to maven central
if: github.ref_name == 'master' && github.event_name != 'pull_request' && github.repository == 'swisspost/vertx-log-transformer'
run: |
curl -s get.sdkman.io | bash
curl -s https://get.sdkman.io | bash
source "$HOME/.sdkman/bin/sdkman-init.sh"
sdk install groovy 3.0.8

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# vertx-log-transformer

[![Build Status](https://travis-ci.com/swisspush/vertx-log-transformer.svg?branch=master)](https://travis-ci.com/swisspush/vertx-log-transformer)
[![codecov](https://codecov.io/gh/swisspush/vertx-log-transformer/branch/master/graph/badge.svg)](https://codecov.io/gh/swisspush/vertx-log-transformer)
[![codecov](https://codecov.io/gh/swisspost/vertx-log-transformer/branch/master/graph/badge.svg?token=Eh7mKoDPls)](https://codecov.io/gh/swisspost/vertx-log-transformer)

Transforms log content received over the Vert.x [EventBus](http://vertx.io/docs/apidocs/io/vertx/core/eventbus/EventBus.html) and writes the transformed logs to the configured destination.

Expand Down
59 changes: 52 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.swisspush</groupId>
<artifactId>log-transformer</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<name>log-transformer</name>
<description>
A verticle that transforms log statements
Expand Down Expand Up @@ -74,12 +74,12 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<version>0.8.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -133,6 +133,51 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>pre-unit-test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
<!--
Sets the name of the property containing the settings
for JaCoCo runtime agent.
-->
<propertyName>surefireArgLine</propertyName>
</configuration>
</execution>
<!--
Ensures that the code coverage report for unit tests is created after
unit tests have been run.
-->
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-maven-plugin</artifactId>
Expand Down Expand Up @@ -297,10 +342,10 @@
</profile>
</profiles>
<properties>
<vertx.version>4.2.1</vertx.version>
<guava.version>31.0.1-jre</guava.version>
<slf4j.version>1.7.36</slf4j.version>
<mockito.version>4.4.0</mockito.version>
<vertx.version>4.5.1</vertx.version>
<guava.version>33.0.0-jre</guava.version>
<slf4j.version>2.0.10</slf4j.version>
<mockito.version>5.8.0</mockito.version>
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
<sonatypeOssDistMgmtSnapshotsUrl>
https://oss.sonatype.org/content/repositories/snapshots/
Expand Down