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>

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 41b3de6..bc98466 100644 (file)
--- 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 91cdd26..331773f 100644 (file)
--- 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 a61659c..f87d7d1 100644 (file)
--- 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 8c666b6..b67b3bd 100644 (file)
--- 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 054f7fb..8361f46 100644 (file)
--- 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 c658566..4d00b57 100644 (file)
--- 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 @@
             <scope>provided</scope>
             <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 859b24a..a5c90e4 100644 (file)
--- 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 e9c6b90..59baa05 100644 (file)
--- a/appc-config/appc-config-audit/provider/pom.xml
+++ b/appc-config/appc-config-audit/provider/pom.xml
@@ -73,20 +73,9 @@
             <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>
             <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 fd5eacd..2718735 100644 (file)
--- 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 b383133..92468db 100644 (file)
--- 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 3ce00be..1959093 100644 (file)
--- a/appc-config/appc-encryption-tool/provider/pom.xml
+++ b/appc-config/appc-encryption-tool/provider/pom.xml
@@ -65,20 +65,9 @@
             <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>
             <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 4a6da1f..f3cd09b 100644 (file)
--- a/appc-config/appc-flow-controller/provider/pom.xml
+++ b/appc-config/appc-flow-controller/provider/pom.xml
@@ -68,20 +68,9 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <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 07300f5..0f72a16 100644 (file)
--- a/appc-core/appc-common-bundle/pom.xml
+++ b/appc-core/appc-common-bundle/pom.xml
@@ -30,20 +30,9 @@
   \r
   <dependencies>\r
     <!--  logging  -->\r
-    <dependency>\r
-         <groupId>ch.qos.logback</groupId>\r
-         <artifactId>logback-classic</artifactId>\r
-        <version>${logback.version}</version>\r
-    </dependency>\r
     <dependency>\r
       <groupId>com.att.eelf</groupId>\r
       <artifactId>eelf-core</artifactId>\r
-      <exclusions>\r
-           <exclusion>\r
-               <groupId>ch.qos.logback</groupId>\r
-               <artifactId>logback-classic</artifactId>\r
-           </exclusion>\r
-      </exclusions>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.slf4j</groupId>\r
@@ -168,4 +157,4 @@
           </plugin>\r
     </plugins>  \r
   </build>\r
-</project>\r
+</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 1cec77b..929d7cf 100644 (file)
--- 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 2adfd30..7197c06 100755 (executable)
--- 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 403595f..f9d21e1 100644 (file)
--- 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 e9bf49a..c762692 100644 (file)
--- a/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml
+++ b/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml
@@ -70,20 +70,9 @@
             <artifactId>state-machine-lib</artifactId>
             <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 16645dc..836e298 100755 (executable)
--- 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>\r
                        <version>2.5</version>\r
                </dependency>\r
-                <dependency>\r
+        <dependency>\r
                        <groupId>org.apache.commons</groupId>\r
                        <artifactId>commons-lang3</artifactId>\r
                </dependency>\r
-                <dependency>\r
-                        <groupId>ch.qos.logback</groupId>\r
-                        <artifactId>logback-classic</artifactId>\r
-                       <version>${logback.version}</version>\r
-                </dependency>\r
+\r
                <dependency>\r
                        <groupId>com.att.eelf</groupId>\r
                        <artifactId>eelf-core</artifactId>\r
-                        <exclusions>\r
-                            <exclusion>\r
-                                 <groupId>ch.qos.logback</groupId>\r
-                                 <artifactId>logback-classic</artifactId>\r
-                            </exclusion>\r
-                        </exclusions>\r
                </dependency>\r
 \r
                <dependency>\r

diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml
index b91cbe6..e2edfba 100755 (executable)
--- a/appc-outbound/appc-network-inventory-client/provider/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml
@@ -48,20 +48,9 @@
             <groupId>commons-io</groupId>\r
             <artifactId>commons-io</artifactId>\r
         </dependency>\r
-        <dependency>\r
-         <groupId>ch.qos.logback</groupId>\r
-         <artifactId>logback-classic</artifactId>\r
-        <version>${logback.version}</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>com.att.eelf</groupId>\r
             <artifactId>eelf-core</artifactId>\r
-            <exclusions>\r
-                 <exclusion>\r
-                      <groupId>ch.qos.logback</groupId>\r
-                      <artifactId>logback-classic</artifactId>\r
-                 </exclusion>\r
-            </exclusions>\r
         </dependency>\r
         <dependency>\r
             <groupId>com.sun.jersey</groupId>\r

diff --git a/pom.xml b/pom.xml
index 74b0b4b..ee2185d 100644 (file)
--- 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>