Skip to content

Commit

Permalink
Merge pull request #35 from Netflix/dependency-updates
Browse files Browse the repository at this point in the history
Dependency version updates
  • Loading branch information
rgallardo-netflix committed Jan 22, 2024
2 parents a14a664 + b6608f8 commit 963e029
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Expand Up @@ -26,13 +26,13 @@ repositories {
}

dependencies {
implementation 'com.netflix.servo:servo-core:0.4.49'
implementation 'com.netflix.archaius:archaius-core:0.7.8'
implementation 'org.slf4j:slf4j-api:1.7.3'
implementation 'log4j:log4j:1.2.17'
implementation 'com.netflix.servo:servo-core:0.13.2'
implementation 'com.netflix.archaius:archaius-core:0.7.10'
implementation 'org.slf4j:slf4j-api:1.7.36'
implementation 'ch.qos.reload4j:reload4j:1.2.25'
implementation 'commons-collections:commons-collections:3.2.2'
implementation 'commons-configuration:commons-configuration:1.8'
implementation 'commons-configuration:commons-configuration:1.10'

testImplementation 'junit:junit:4.13.1'
testImplementation 'org.slf4j:slf4j-log4j12:1.7.3'
testImplementation 'org.slf4j:slf4j-reload4j:1.7.36'
}
7 changes: 7 additions & 0 deletions src/test/java/com/netflix/blitz4j/TestBlitz4j.java
Expand Up @@ -22,6 +22,7 @@

import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -38,6 +39,12 @@ public class TestBlitz4j {
private static final String consoleSummarizeEvent = "stdout_summarizeEvent";
private static final String consoleEventsProcessed = "stdout_putInBuffer";

@BeforeClass
public static void setUp() {
// Starting with servo 0.13.x the default registry is a NoOp, but we rely on having a real one because we use collected metrics to validate behavior
System.setProperty("com.netflix.servo.DefaultMonitorRegistry.registryClass", "com.netflix.servo.jmx.JmxMonitorRegistry");
}

@After
public void tearDown() throws Exception {
props.clear();
Expand Down

0 comments on commit 963e029

Please sign in to comment.