Merge branch 'release/0.12.1'

snowplow · May 11, 2022 · 35dcfa9 · 35dcfa9
2 parents b3c6b11 + 54f061e
commit 35dcfa9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,16 @@
+Java 0.12.1 (2022-05-11)
+-----------------------
+Bump junit to 4.13.2 (#330)
+Bump mockwebserver to 4.9.3 (#329)
+Bump junit-jupiter-api to 5.8.2 (#328)
+Bump guava to 31.1-jre (#327)
+Bump jackson-databind to 2.13.2.2 (#326)
+Bump slf4j-simple to 1.7.36 (#325)
+Bump slf4j-api to 1.7.36 (#324)
+Bump okhttp to 4.9.3 (#323)
+Bump httpasyncclient to 4.1.5 (#322)
+Bump commons-codec to 1.15 (#321)
+
 Java 0.12.0 (2022-03-24)
 -----------------------
 Choose HTTP response codes not to retry (#316)

diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ wrapper.gradleVersion = '6.5.0'
 
 group = 'com.snowplowanalytics'
 archivesBaseName = 'snowplow-java-tracker'
-version = '0.12.0'
+version = '0.12.1'
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
@@ -58,32 +58,32 @@ test {
 
 dependencies {
     // Apache Commons
-    api 'commons-codec:commons-codec:1.14'
+    api 'commons-codec:commons-codec:1.15'
     api 'commons-net:commons-net:3.6'
 
     // Apache HTTP
     apachehttpSupportApi 'org.apache.httpcomponents:httpclient:4.5.13'
-    apachehttpSupportApi 'org.apache.httpcomponents:httpasyncclient:4.1.4'
+    apachehttpSupportApi 'org.apache.httpcomponents:httpasyncclient:4.1.5'
 
     // Square OK HTTP
-    okhttpSupportApi 'com.squareup.okhttp3:okhttp:4.2.2'
+    okhttpSupportApi 'com.squareup.okhttp3:okhttp:4.9.3'
 
     // SLF4J logging API
-    api 'org.slf4j:slf4j-api:1.7.30'
-    testImplementation 'org.slf4j:slf4j-simple:1.7.30'
+    api 'org.slf4j:slf4j-api:1.7.36'
+    testImplementation 'org.slf4j:slf4j-simple:1.7.36'
 
     // Jackson JSON processor
-    api 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
+    api 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
 
     // Preconditions
-    api 'com.google.guava:guava:31.0-jre'
+    api 'com.google.guava:guava:31.1-jre'
 
     // Testing libraries
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testCompileOnly 'junit:junit:4.13.2'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.2'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3'
 }
 
 task sourceJar(type: Jar, dependsOn: 'generateSources') {

diff --git a/examples/simple-console/build.gradle b/examples/simple-console/build.gradle
@@ -24,10 +24,10 @@ dependencies {
         }
     }
 
-    implementation 'org.slf4j:slf4j-simple:1.7.30'
+    implementation 'org.slf4j:slf4j-simple:1.7.36'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
-    testCompileOnly 'junit:junit:4.13'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testCompileOnly 'junit:junit:4.13.2'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
 

diff --git a/src/test/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java b/src/test/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java
@@ -580,7 +580,7 @@ public void testTrackTimingWithSubject() throws InterruptedException {
     @Test
     public void testGetTrackerVersion() {
         Tracker tracker = new Tracker.TrackerBuilder(mockEmitter, "namespace", "an-app-id").build();
-        assertEquals("java-0.12.0", tracker.getTrackerVersion());
+        assertEquals("java-0.12.1", tracker.getTrackerVersion());
     }
 
     @Test