From 57e9272d241280a2283386096bd0b5745b707345 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Tue, 21 Aug 2018 23:23:03 -0700 Subject: [PATCH] Revert "resolving logback-classic 1.13" Temporary revert to fix failing bundles. This reverts commit 76b6ff1ce84d4c2ab4518dd5f154083b91680245. Change-Id: Ibce5eee91ad8f1bec9b458a52a7f5d25ada85da9 Signed-off-by: Patrick Brady Issue-ID: APPC-1018 Signed-off-by: Patrick Brady --- .../appc-chef-adapter-bundle/pom.xml | 14 +------------- .../appc-iaas-adapter-bundle/pom.xml | 20 -------------------- .../appc-netconf-adapter-bundle/pom.xml | 12 ------------ .../appc-rest-adapter-bundle/pom.xml | 12 ------------ .../appc-rest-healthcheck-adapter-bundle/pom.xml | 12 ------------ .../appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml | 11 ----------- appc-config/appc-config-adaptor/provider/pom.xml | 12 +----------- appc-config/appc-config-audit/provider/pom.xml | 11 ----------- appc-config/appc-config-generator/provider/pom.xml | 12 +----------- appc-config/appc-data-services/provider/pom.xml | 11 ----------- appc-config/appc-encryption-tool/provider/pom.xml | 11 ----------- appc-config/appc-flow-controller/provider/pom.xml | 11 ----------- appc-core/appc-common-bundle/pom.xml | 13 +------------ .../appc-event-listener-bundle/pom.xml | 14 +------------- appc-inbound/appc-design-services/provider/pom.xml | 12 +----------- appc-inbound/appc-interfaces-service/bundle/pom.xml | 12 +----------- .../appc-lifecycle-management-core/pom.xml | 11 ----------- appc-outbound/appc-aai-client/provider/pom.xml | 14 ++------------ .../appc-network-inventory-client/provider/pom.xml | 11 ----------- pom.xml | 2 +- 20 files changed, 10 insertions(+), 228 deletions(-) diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index 41b3de6e7..bc9846674 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -93,14 +93,8 @@ com.att.cdp cdp-pal-common - ${cdp.pal.version} compile - - - ch.qos.logback - logback-classic - - + ${cdp.pal.version} @@ -108,12 +102,6 @@ cdp-pal-openstack compile ${cdp.pal.version} - - - com.att.cdp - cdp-pal-common - - diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml index 91cdd2663..331773fc6 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml @@ -48,31 +48,11 @@ - - - com.att.cdp - cdp-pal-common - compile - ${cdp.pal.version} - - - ch.qos.logback - logback-classic - - - - com.att.cdp cdp-pal-openstack compile ${cdp.pal.version} - - - com.att.cdp - cdp-pal-common - - diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml index a61659cb6..f87d7d139 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml @@ -57,12 +57,6 @@ cdp-pal-common compile ${cdp.pal.version} - - - ch.qos.logback - logback-classic - - @@ -70,12 +64,6 @@ cdp-pal-openstack compile ${cdp.pal.version} - - - com.att.cdp - cdp-pal-common - - diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml index 8c666b669..b67b3bd5c 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml @@ -66,12 +66,6 @@ cdp-pal-common compile ${cdp.pal.version} - - - ch.qos.logback - logback-classic - - @@ -79,12 +73,6 @@ cdp-pal-openstack compile ${cdp.pal.version} - - - com.att.cdp - cdp-pal-common - - diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml index 054f7fbf6..8361f466b 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml @@ -72,24 +72,12 @@ com.att.cdp cdp-pal-common compile - - - ch.qos.logback - logback-classic - - com.att.cdp cdp-pal-openstack compile - - - com.att.cdp - cdp-pal-common - - diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml index c65856655..4d00b5763 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml @@ -58,20 +58,9 @@ provided 2.0.0 - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - junit diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml index 859b24a30..a5c90e48a 100644 --- a/appc-config/appc-config-adaptor/provider/pom.xml +++ b/appc-config/appc-config-adaptor/provider/pom.xml @@ -70,20 +70,10 @@ mockito-core test - - ch.qos.logback - logback-classic - ${logback.version} - + com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml index e9c6b9016..59baa05fe 100644 --- a/appc-config/appc-config-audit/provider/pom.xml +++ b/appc-config/appc-config-audit/provider/pom.xml @@ -73,20 +73,9 @@ commons-io commons-io - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - org.apache.commons diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index fd5eacdc1..271873581 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -94,20 +94,10 @@ commons-collections 3.2.2 - - ch.qos.logback - logback-classic - ${logback.version} - + com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml index b38313326..92468db81 100644 --- a/appc-config/appc-data-services/provider/pom.xml +++ b/appc-config/appc-data-services/provider/pom.xml @@ -62,21 +62,10 @@ commons-io commons-io - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml index 3ce00bee2..1959093a0 100644 --- a/appc-config/appc-encryption-tool/provider/pom.xml +++ b/appc-config/appc-encryption-tool/provider/pom.xml @@ -65,20 +65,9 @@ org.apache.commons commons-lang3 - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - commons-configuration diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml index 4a6da1f79..f3cd09b89 100644 --- a/appc-config/appc-flow-controller/provider/pom.xml +++ b/appc-config/appc-flow-controller/provider/pom.xml @@ -68,20 +68,9 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - org.onap.ccsdk.sli.adaptors diff --git a/appc-core/appc-common-bundle/pom.xml b/appc-core/appc-common-bundle/pom.xml index 07300f53f..0f72a1620 100644 --- a/appc-core/appc-common-bundle/pom.xml +++ b/appc-core/appc-common-bundle/pom.xml @@ -30,20 +30,9 @@ - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - org.slf4j @@ -168,4 +157,4 @@ - + \ No newline at end of file diff --git a/appc-event-listener/appc-event-listener-bundle/pom.xml b/appc-event-listener/appc-event-listener-bundle/pom.xml index 1cec77bbe..929d7cfa8 100644 --- a/appc-event-listener/appc-event-listener-bundle/pom.xml +++ b/appc-event-listener/appc-event-listener-bundle/pom.xml @@ -41,21 +41,10 @@ ${project.version} --> - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - - + org.onap.appc appc-common @@ -130,7 +119,6 @@ org.mockito mockito-core - test diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml index 2adfd30f2..7197c0633 100755 --- a/appc-inbound/appc-design-services/provider/pom.xml +++ b/appc-inbound/appc-design-services/provider/pom.xml @@ -114,20 +114,10 @@ sal-binding-broker-impl test - - ch.qos.logback - logback-classic - ${logback.version} - + com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - org.onap.ccsdk.sli.adaptors diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml index 403595f86..f9d21e13e 100644 --- a/appc-inbound/appc-interfaces-service/bundle/pom.xml +++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml @@ -110,20 +110,10 @@ sal-binding-broker-impl test - - ch.qos.logback - logback-classic - ${logback.version} - + com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - com.sun.jersey diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml index e9bf49ae3..c76269293 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml +++ b/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml @@ -70,20 +70,9 @@ state-machine-lib ${project.version} - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - diff --git a/appc-outbound/appc-aai-client/provider/pom.xml b/appc-outbound/appc-aai-client/provider/pom.xml index 16645dc8d..836e298ea 100755 --- a/appc-outbound/appc-aai-client/provider/pom.xml +++ b/appc-outbound/appc-aai-client/provider/pom.xml @@ -60,24 +60,14 @@ commons-io 2.5 - + org.apache.commons commons-lang3 - - ch.qos.logback - logback-classic - ${logback.version} - + com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml index b91cbe6d7..e2edfbac2 100755 --- a/appc-outbound/appc-network-inventory-client/provider/pom.xml +++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml @@ -48,20 +48,9 @@ commons-io commons-io - - ch.qos.logback - logback-classic - ${logback.version} - com.att.eelf eelf-core - - - ch.qos.logback - logback-classic - - com.sun.jersey diff --git a/pom.xml b/pom.xml index 74b0b4b2d..ee2185d99 100644 --- a/pom.xml +++ b/pom.xml @@ -377,7 +377,7 @@ limitations under the License. ch.qos.logback logback-core - ${logback.version} + ${logback.version} compile -- 2.16.6