Merge branch 'release/2.0.0'

CHANGELOG

@@ -1,3 +1,17 @@
+Java 2.0.0 (2024-01-12)
+-----------------------
+Add builder methods Subject to allow method chaining (#303)
+Add okhttp adapter with cookie jar and remove cookie jar from network configuration (#361)
+Remove deprecated APIs (#373)
+Update to Apache Http Client to v5 (#364)
+Upgrade okhttp dependency to version 4.12 (#365)
+Bump slf4j-simple and slf4j-api to 2.0.11
+Bump junit-jupiter-api to 5.10.1
+Bump jackson-databind to 2.16.1
+Bump commons-net to 3.10
+Bump commons-codec to 1.16
+Update copyright headers in source files (#375)
+
 Java 1.0.1 (2023-11-06)
 -----------------------
 Fix Issue with OkHttpClientAdapter (#366) (thanks to @eusorov for the contribution!)

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Snowplow Analytics Ltd.
+   Copyright 2014-present Snowplow Analytics Ltd.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -52,7 +52,7 @@ $ java -jar ./build/libs/simple-console-all-0.0.1.jar "http://<your-collector-do
 
 ## Copyright and license
 
-The Snowplow Java Tracker is copyright 2014-2020 Snowplow Analytics Ltd.
+The Snowplow Java Tracker is copyright 2014-present Snowplow Analytics Ltd.
 
 Licensed under the **[Apache License, Version 2.0][license]** (the "License");
 you may not use this software except in compliance with the License.

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2022 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-present Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -25,7 +25,7 @@ wrapper.gradleVersion = '6.5.0'
 
 group = 'com.snowplowanalytics'
 archivesBaseName = 'snowplow-java-tracker'
-version = '1.0.1'
+version = '2.0.0'
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
@@ -58,29 +58,28 @@ test {
 
 dependencies {
     // Apache Commons
-    api 'commons-codec:commons-codec:1.15'
-    api 'commons-net:commons-net:3.6'
+    api 'commons-net:commons-net:3.10.0'
+    api 'commons-codec:commons-codec:1.16.0'
 
     // Apache HTTP
-    apachehttpSupportApi 'org.apache.httpcomponents:httpclient:4.5.13'
-    apachehttpSupportApi 'org.apache.httpcomponents:httpasyncclient:4.1.5'
+    apachehttpSupportApi 'org.apache.httpcomponents.client5:httpclient5:5.3'
 
     // Square OK HTTP
-    okhttpSupportApi 'com.squareup.okhttp3:okhttp:4.9.3'
+    okhttpSupportApi 'com.squareup.okhttp3:okhttp:4.12.0'
 
     // SLF4J logging API
-    api 'org.slf4j:slf4j-api:1.7.36'
-    testImplementation 'org.slf4j:slf4j-simple:1.7.36'
+    api 'org.slf4j:slf4j-api:2.0.11'
+    testImplementation 'org.slf4j:slf4j-simple:2.0.11'
 
     // Jackson JSON processor
-    api 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
+    api 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
 
     // Testing libraries
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
     testCompileOnly 'junit:junit:4.13.2'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
 }
 
 task sourceJar(type: Jar, dependsOn: 'generateSources') {
@@ -95,7 +94,7 @@ task generateSources {
         srcFile.parentFile.mkdirs()
         srcFile.write(
                 """/*
- * Copyright (c) 2014-2022 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-present Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.

examples/benchmarking/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2022 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-present Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.

examples/benchmarking/src/jmh/java/com/snowplowanalytics/TrackerBenchmark.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2022 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-present Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.

examples/simple-console/build.gradle

@@ -16,9 +16,9 @@ test {
 }
 
 dependencies {
-    implementation 'com.snowplowanalytics:snowplow-java-tracker:1.+'
+    implementation 'com.snowplowanalytics:snowplow-java-tracker:2.+'
 
-    implementation ('com.snowplowanalytics:snowplow-java-tracker:1.+') {
+    implementation ('com.snowplowanalytics:snowplow-java-tracker:2.+') {
         capabilities {
             requireCapability 'com.snowplowanalytics:snowplow-java-tracker-okhttp-support'
         }

examples/simple-console/src/main/java/com/snowplowanalytics/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2022 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-present Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -86,7 +86,7 @@ public static void main(String[] args) throws InterruptedException {
             .quantity(2)
             .name("name")
             .category("category")
-            .currency("currency")
+            .currency("EUR")
             .customContext(context)
             .build();
 
@@ -100,7 +100,7 @@ public static void main(String[] args) throws InterruptedException {
             .city("city")
             .state("state")
             .country("country")
-            .currency("currency")
+            .currency("EUR")
             .items(item) // EcommerceTransactionItem events are added to a parent EcommerceTransaction here
             .customContext(context)
             .build();

examples/simple-console/src/test/java/com/snowplowanalytics/MainTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2022 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-present Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.

src/main/java/com/snowplowanalytics/snowplow/tracker/DevicePlatform.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2022 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-present Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.

src/main/java/com/snowplowanalytics/snowplow/tracker/Snowplow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2022 Snowplow Analytics Ltd. All rights reserved.
+ * Copyright (c) 2014-present Snowplow Analytics Ltd. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.