Skip to content

Commit 7257179

Browse files
authored
Upgrade slf4j and logback (#137)
1 parent 1c2e040 commit 7257179

5 files changed

Lines changed: 11 additions & 16 deletions

File tree

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ junitVersion = 4.12
2424
junitJupiterVersion = 5.0.1
2525
junitVintageVersion = 4.12.1
2626
junitPlatformVersion = 1.0.1
27-
slf4jVersion = 1.7.30
27+
slf4jVersion = 1.7.36
2828
logstashVersion = 6.3
29-
logbackVersion = 1.2.3
29+
logbackVersion = 1.2.10
3030
configVersion = 1.4.0
3131
zstdVersion = 1.4.0-1

logback-classic/src/main/java/com/tersesystems/logback/classic/StartTime.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,20 @@
1414
import ch.qos.logback.core.Context;
1515
import ch.qos.logback.core.spi.ContextAware;
1616
import com.tersesystems.logback.core.ComponentContainer;
17-
1817
import java.time.Instant;
1918
import java.util.Iterator;
2019
import java.util.Optional;
21-
2220
import org.slf4j.Marker;
2321

24-
/**
25-
* This class pulls an Instant from a StartTimeSupplier.
26-
*/
22+
/** This class pulls an Instant from a StartTimeSupplier. */
2723
public final class StartTime {
2824

2925
/**
3026
* Returns a start time from the event, then marker, then finally if not found will use the
3127
* event's timestamp as the marker.
3228
*
3329
* @param context the logging context
34-
* @param event the logging event
30+
* @param event the logging event
3531
* @return an instant representing the start time.
3632
*/
3733
public static Instant from(Context context, ILoggingEvent event) {
@@ -58,6 +54,7 @@ public static Optional<Instant> fromOptional(Context context, ILoggingEvent even
5854

5955
/**
6056
* Looks for a StartTimeMarker in the marker and in all the children of the marker.
57+
*
6158
* @param context the logback context
6259
* @param m the logback marker
6360
* @return an optional start time.

logback-exception-mapping/src/main/java/com/tersesystems/logback/exceptionmapping/ExceptionMessageWithMappingsConverter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,5 @@ public void write(ExceptionProperty exceptionProperty) {
9393
sb.append("\"");
9494
}
9595
}
96-
}
97-
;
96+
};
9897
}

logback-honeycomb-playws_2.12/src/main/java/com/tersesystems/logback/honeycomb/playws/HoneycombPlayWSClient.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ public HoneycombPlayWSClient(
6262
@Override
6363
public CompletionStage<HoneycombResponse> post(HoneycombRequest<E> request) {
6464
return post(request, this.defaultEncodeFunction);
65-
}
66-
;
65+
};
6766

6867
@Override
6968
public <F> CompletionStage<HoneycombResponse> post(

logback-ringbuffer/src/main/java/com/tersesystems/logback/ringbuffer/RingBuffer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ interface ExitCondition {
185185
* <p><b>WARNING</b>: Explicit assumptions are made with regards to {@link Consumer#accept} make
186186
* sure you have read and understood these before using this method.
187187
*
188-
* @param c the consumer
188+
* @param c the consumer
189189
* @param limit the limit
190190
* @return the number of polled elements
191191
* @throws IllegalArgumentException c is {@code null}
@@ -206,7 +206,7 @@ interface ExitCondition {
206206
* <p><b>WARNING</b>: Explicit assumptions are made with regards to {@link Supplier#get} make sure
207207
* you have read and understood these before using this method.
208208
*
209-
* @param s the supplier
209+
* @param s the supplier
210210
* @param limit the limit
211211
* @return the number of offered elements
212212
* @throws IllegalArgumentException s is {@code null}
@@ -279,7 +279,7 @@ interface ExitCondition {
279279
* <p><b>WARNING</b>: Explicit assumptions are made with regards to {@link Consumer#accept} make
280280
* sure you have read and understood these before using this method.
281281
*
282-
* @param c the consumer
282+
* @param c the consumer
283283
* @param wait the wait strategy
284284
* @param exit the exit condition
285285
* @throws IllegalArgumentException c OR wait OR exit are {@code null}
@@ -310,7 +310,7 @@ interface ExitCondition {
310310
* <p><b>WARNING</b>: Explicit assumptions are made with regards to {@link Supplier#get} make sure
311311
* you have read and understood these before using this method.
312312
*
313-
* @param s the supplier
313+
* @param s the supplier
314314
* @param wait the wait strategy
315315
* @param exit the exit condition
316316
* @throws IllegalArgumentException s OR wait OR exit are {@code null}

0 commit comments

Comments
 (0)