Merge "Revert "AAF Version change for log4j""

diff --combined integration/pom.xml
index 88eacdb,2c28475..162dd31
--- 1/integration/pom.xml
--- 2/integration/pom.xml
+++ b/integration/pom.xml
@@@ -281,6 -281,11 +281,11 @@@
                  <artifactId>slf4j-api</artifactId>
                  <version>1.7.25</version>
              </dependency>
+             <dependency>
+                 <groupId>log4j</groupId>
+                 <artifactId>log4j</artifactId>
+                 <version>1.2.17</version>
+             </dependency>
              <dependency>
                  <groupId>ch.qos.logback</groupId>
                  <artifactId>logback-core</artifactId>
@@@ -310,7 -315,7 +315,7 @@@
              <dependency>
                  <groupId>org.onap.aaf.authz</groupId>
                  <artifactId>aaf-cadi-aaf</artifactId>
-                 <version>2.1.17</version>
+                 <version>2.1.2</version>
              </dependency>
  
              <!-- Client library for Cambria event routing API -->
@@@ -525,20 -530,6 +530,20 @@@
                  <artifactId>netty-handler-proxy</artifactId>
                  <version>${version.netty}</version>
              </dependency>
 +
 +            <!-- Commons Lang -->
 +            <dependency>
 +                <groupId>org.apache.commons</groupId>
 +                <artifactId>commons-lang3</artifactId>
 +                <version>3.10</version>
 +            </dependency>
 +
 +            <!-- Commons IO -->
 +            <dependency>
 +                <groupId>commons-io</groupId>
 +                <artifactId>commons-io</artifactId>
 +                <version>2.7</version>
 +            </dependency>
          </dependencies>
  
      </dependencyManagement>