From 2bd6d9f994e73bcef462d69825b27a993500f878 Mon Sep 17 00:00:00 2001 From: Sandeep Mattepu Date: Thu, 30 Sep 2021 15:11:37 +0200 Subject: [PATCH 1/4] Remove logback dependency Let the users of Java-OCA-OCPP choose which logging to use. --- ocpp-common/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ocpp-common/pom.xml b/ocpp-common/pom.xml index 6bbcde7e4..7fb832fe2 100644 --- a/ocpp-common/pom.xml +++ b/ocpp-common/pom.xml @@ -63,11 +63,6 @@ slf4j-api 1.7.25 - - ch.qos.logback - logback-classic - 1.2.3 - From 6c31218b58e7807fd1e1a6fe2df56e48d2eb2243 Mon Sep 17 00:00:00 2001 From: Sandeep Yadav Mattepu Date: Thu, 30 Sep 2021 15:31:20 +0200 Subject: [PATCH 2/4] Update the versions --- OCPP-J/pom.xml | 4 ++-- ocpp-common/pom.xml | 2 +- ocpp-v1_6-test/pom.xml | 6 +++--- ocpp-v1_6/pom.xml | 6 +++--- ocpp-v2_0-test/pom.xml | 6 +++--- ocpp-v2_0/pom.xml | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/OCPP-J/pom.xml b/OCPP-J/pom.xml index ea0dff9b5..3b1716b8e 100644 --- a/OCPP-J/pom.xml +++ b/OCPP-J/pom.xml @@ -6,7 +6,7 @@ eu.chargetime.ocpp OCPP-J - 1.0.1 + 1.0.2 jar Java-OCA-OCPP OCPP-J @@ -50,7 +50,7 @@ eu.chargetime.ocpp common - 1.0 + 1.0.1 com.google.code.gson diff --git a/ocpp-common/pom.xml b/ocpp-common/pom.xml index 7fb832fe2..008cdbca2 100644 --- a/ocpp-common/pom.xml +++ b/ocpp-common/pom.xml @@ -6,7 +6,7 @@ eu.chargetime.ocpp common - 1.0 + 1.0.1 Java-OCA-OCPP common Implementation of Open Charge-Point Protocol common library. diff --git a/ocpp-v1_6-test/pom.xml b/ocpp-v1_6-test/pom.xml index 465e9bc9b..38137f4e1 100644 --- a/ocpp-v1_6-test/pom.xml +++ b/ocpp-v1_6-test/pom.xml @@ -6,7 +6,7 @@ eu.chargetime.ocpp v1_6-test - 1.0.1 + 1.0.2 Java-OCA-OCPP v1.6 - Integration test Integration test of OCA OCPP version 1.6 @@ -49,12 +49,12 @@ eu.chargetime.ocpp common - 1.0 + 1.0.1 eu.chargetime.ocpp v1_6 - 1.0.1 + 1.0.2 junit diff --git a/ocpp-v1_6/pom.xml b/ocpp-v1_6/pom.xml index 69960c45f..dbb1ec711 100644 --- a/ocpp-v1_6/pom.xml +++ b/ocpp-v1_6/pom.xml @@ -6,7 +6,7 @@ eu.chargetime.ocpp v1_6 - 1.0.1 + 1.0.2 jar Java-OCA-OCPP v1.6 @@ -50,12 +50,12 @@ eu.chargetime.ocpp common - 1.0 + 1.0.1 eu.chargetime.ocpp OCPP-J - 1.0.1 + 1.0.2 org.java-websocket diff --git a/ocpp-v2_0-test/pom.xml b/ocpp-v2_0-test/pom.xml index 0d2a84aff..9c613b670 100644 --- a/ocpp-v2_0-test/pom.xml +++ b/ocpp-v2_0-test/pom.xml @@ -6,7 +6,7 @@ eu.chargetime.ocpp v2_0-test - 1.0.1 + 1.0.2 jar Java-OCA-OCPP v2.0 - Integration test @@ -50,12 +50,12 @@ eu.chargetime.ocpp common - 1.0 + 1.0.1 eu.chargetime.ocpp v2_0 - 1.0.1 + 1.0.2 junit diff --git a/ocpp-v2_0/pom.xml b/ocpp-v2_0/pom.xml index 25b6323c7..c5f2ec545 100644 --- a/ocpp-v2_0/pom.xml +++ b/ocpp-v2_0/pom.xml @@ -6,7 +6,7 @@ eu.chargetime.ocpp v2_0 - 1.0.1 + 1.0.2 jar Java-OCA-OCPP v2.0 @@ -50,12 +50,12 @@ eu.chargetime.ocpp common - 1.0 + 1.0.1 eu.chargetime.ocpp OCPP-J - 1.0.1 + 1.0.2 org.java-websocket From 51e16f403c92ddaaabf65bce30ca2314ea3e6495 Mon Sep 17 00:00:00 2001 From: Sandeep Mattepu Date: Mon, 4 Oct 2021 22:26:37 +0200 Subject: [PATCH 3/4] Make the scope of logback dependency to test --- ocpp-common/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ocpp-common/pom.xml b/ocpp-common/pom.xml index 008cdbca2..01bfaee62 100644 --- a/ocpp-common/pom.xml +++ b/ocpp-common/pom.xml @@ -63,6 +63,12 @@ slf4j-api 1.7.25 + + ch.qos.logback + logback-classic + 1.2.3 + test + From 3e7484bec5ec7f8965f9b50fd4bdb7cf767e2708 Mon Sep 17 00:00:00 2001 From: Sandeep Yadav Mattepu Date: Mon, 4 Oct 2021 22:44:44 +0200 Subject: [PATCH 4/4] Add logback-classic to OCPP-J and ocpp-v1_6 with scope as test --- OCPP-J/pom.xml | 6 ++++++ ocpp-v1_6/pom.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/OCPP-J/pom.xml b/OCPP-J/pom.xml index 3b1716b8e..f3d0e848a 100644 --- a/OCPP-J/pom.xml +++ b/OCPP-J/pom.xml @@ -81,6 +81,12 @@ 1.3 test + + ch.qos.logback + logback-classic + 1.2.3 + test + diff --git a/ocpp-v1_6/pom.xml b/ocpp-v1_6/pom.xml index dbb1ec711..950dd1c94 100644 --- a/ocpp-v1_6/pom.xml +++ b/ocpp-v1_6/pom.xml @@ -80,6 +80,12 @@ 1.3 test + + ch.qos.logback + logback-classic + 1.2.3 + test +