Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,30 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: 8.4
uses: gradle/actions/setup-gradle@v3

- name: Run tests and generate reports
run: ./gradlew testAndReport

- name: Run Sonar analysis
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: ./gradlew sonar -x test --no-watch-fs

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: report
path: build/reports/**
Expand All @@ -41,19 +44,21 @@ jobs:
runs-on: ubuntu-latest
needs: [test]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: 8.4
uses: gradle/actions/setup-gradle@v3

- name: Run build with Gradle Wrapper
run: ./gradlew build -x test

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jar
path: build/libs/**
Expand Down
8 changes: 0 additions & 8 deletions Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Library providing basic generic functionality required by any HTTP web service.

```
// https://mvnrepository.com/artifact/ee.bitweb/spring-core
implementation group: 'ee.bitweb', name: 'spring-core', version: '3.1.0'
implementation group: 'ee.bitweb', name: 'spring-core', version: '3.2.0'
```

Review available versions in [Maven Central](https://mvnrepository.com/artifact/ee.bitweb/spring-core).
Expand Down
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
}

group 'ee.bitweb'
version '3.1.0'
version '3.2.0'
java {
sourceCompatibility = '17'
}
Expand Down Expand Up @@ -79,6 +79,9 @@ dependencies {
// https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor
compileOnly group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '4.12.0'

// https://mvnrepository.com/artifact/de.siegmar/logback-gelf
compileOnly group: 'de.siegmar', name: 'logback-gelf', version: '6.0.1'

// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}"

Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
systemProp.org.gradle.internal.publish.checksums.insecure=true
org.gradle.welcome=never
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package ee.bitweb.core.logging;

import ch.qos.logback.classic.spi.ILoggingEvent;
import de.siegmar.logbackgelf.GelfTcpAppender;
import ee.bitweb.core.exception.CoreException;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class SilencedGelfTcpAppender extends GelfTcpAppender {

@Override
protected void append(final ILoggingEvent event) {
final byte[] binMessage = getEncoder().encode(event);

try {
appendMessage(binMessage);
} catch (CoreException ignored) {
// Catching and ignoring CoreException which will be thrown if application can't connect to Graylog, because we don't want the application
// to stop.
}
}

@Override
protected void appendMessage(final byte[] messageToSend) {
try {
super.appendMessage(messageToSend);
} catch (CoreException e) {
throw new CoreException("Error sending GELF message", e);
}
}

@Override
public void addError(String msg, Throwable ex) {
throw new CoreException(msg, ex);
}
}