summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2018-08-21 23:23:03 -0700
committerPatrick Brady <pb071s@att.com>2018-08-21 23:23:43 -0700
commit57e9272d241280a2283386096bd0b5745b707345 (patch)
treea637fcfa0f0c2629d1a1bc179a063e7b13969e76
parentf4a05f8520aa2f265e46541a03be1183c6493e1c (diff)
Revert "resolving logback-classic 1.13"
Temporary revert to fix failing bundles. This reverts commit 76b6ff1ce84d4c2ab4518dd5f154083b91680245. Change-Id: Ibce5eee91ad8f1bec9b458a52a7f5d25ada85da9 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1018 Signed-off-by: Patrick Brady <pb071s@att.com>
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml14
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml20
-rw-r--r--appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml12
-rw-r--r--appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml12
-rw-r--r--appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml12
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml11
-rw-r--r--appc-config/appc-config-adaptor/provider/pom.xml12
-rw-r--r--appc-config/appc-config-audit/provider/pom.xml11
-rw-r--r--appc-config/appc-config-generator/provider/pom.xml12
-rw-r--r--appc-config/appc-data-services/provider/pom.xml11
-rw-r--r--appc-config/appc-encryption-tool/provider/pom.xml11
-rw-r--r--appc-config/appc-flow-controller/provider/pom.xml11
-rw-r--r--appc-core/appc-common-bundle/pom.xml13
-rw-r--r--appc-event-listener/appc-event-listener-bundle/pom.xml14
-rwxr-xr-xappc-inbound/appc-design-services/provider/pom.xml12
-rw-r--r--appc-inbound/appc-interfaces-service/bundle/pom.xml12
-rw-r--r--appc-lifecycle-management/appc-lifecycle-management-core/pom.xml11
-rwxr-xr-xappc-outbound/appc-aai-client/provider/pom.xml14
-rwxr-xr-xappc-outbound/appc-network-inventory-client/provider/pom.xml11
-rw-r--r--pom.xml2
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 @@
<dependency>
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-common</artifactId>
- <version>${cdp.pal.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
+ <version>${cdp.pal.version}</version>
</dependency>
<dependency>
@@ -108,12 +102,6 @@
<artifactId>cdp-pal-openstack</artifactId>
<scope>compile</scope>
<version>${cdp.pal.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.att.cdp</groupId>
- <artifactId>cdp-pal-common</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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 @@
</exclusions>
</dependency>
-
- <dependency>
- <groupId>com.att.cdp</groupId>
- <artifactId>cdp-pal-common</artifactId>
- <scope>compile</scope>
- <version>${cdp.pal.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-openstack</artifactId>
<scope>compile</scope>
<version>${cdp.pal.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.att.cdp</groupId>
- <artifactId>cdp-pal-common</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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 @@
<artifactId>cdp-pal-common</artifactId>
<scope>compile</scope>
<version>${cdp.pal.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -70,12 +64,6 @@
<artifactId>cdp-pal-openstack</artifactId>
<scope>compile</scope>
<version>${cdp.pal.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.att.cdp</groupId>
- <artifactId>cdp-pal-common</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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 @@
<artifactId>cdp-pal-common</artifactId>
<scope>compile</scope>
<version>${cdp.pal.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -79,12 +73,6 @@
<artifactId>cdp-pal-openstack</artifactId>
<scope>compile</scope>
<version>${cdp.pal.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.att.cdp</groupId>
- <artifactId>cdp-pal-common</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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 @@
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-common</artifactId>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-openstack</artifactId>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.att.cdp</groupId>
- <artifactId>cdp-pal-common</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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
@@ -59,19 +59,8 @@
<version>2.0.0</version>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
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 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
+
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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
@@ -74,19 +74,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
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 @@
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
+
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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
@@ -66,19 +66,8 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
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
@@ -69,19 +69,8 @@
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
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
@@ -31,19 +31,8 @@
<dependencies>
<!-- logging -->
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -168,4 +157,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project> \ 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 @@
<version>${project.version}</version>
</dependency>
-->
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-common</artifactId>
@@ -130,7 +119,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
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 @@
<artifactId>sal-binding-broker-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
+
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
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 @@
<artifactId>sal-binding-broker-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
+
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
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
@@ -71,19 +71,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
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 @@
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
+
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
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
@@ -49,19 +49,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
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.
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
+ <version>${logback.version}</version>
<scope>compile</scope>
</dependency>
<dependency>