From: Pamela Dragosh <pdragosh@research.att.com>
Date: Fri, 19 Jun 2020 11:03:27 +0000 (+0000)
Subject: Merge "Moving commons-lang dependency to parent"
X-Git-Tag: 3.2.0~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fparent.git;a=commitdiff_plain;h=e9bdba81173a5d2f217bf215dc7b81d72683ab72;hp=-c

Merge "Moving commons-lang dependency to parent"
---

e9bdba81173a5d2f217bf215dc7b81d72683ab72
diff --combined integration/pom.xml
index 2c28475e,8c56bd62..162dd312
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
    ============LICENSE_START=======================================================
     Copyright (C) 2018 Ericsson. All rights reserved.
     Modifications Copyright (C) 2018-2020 AT&T. All rights reserved.
 -   Modifications Copyright (C) 2019 Nordix Foundation.
 +   Modifications Copyright (C) 2019-2020 Nordix Foundation.
     Modifications Copyright (C) 2020 Bell Canada.
    ================================================================================
    Licensed under the Apache License, Version 2.0 (the "License");
@@@ -40,7 -40,7 +40,7 @@@
          <version.dmaap>1.1.11</version.dmaap>
          <version.powermock>2.0.4</version.powermock>
          <version.eclipselink>2.7.5</version.eclipselink>
 -        <version.jackson>2.10.0.pr3</version.jackson>
 +        <version.jackson>2.10.4</version.jackson>
          <version.drools>7.33.0.Final</version.drools>
          <version.jersey>2.30.1</version.jersey>
          <version.ccsdk>0.4.4</version.ccsdk>
@@@ -530,6 -530,20 +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>
@@@ -719,62 -733,7 +733,62 @@@
                      </execution>
                  </executions>
              </plugin>
 +            <plugin>
 +                <artifactId>maven-checkstyle-plugin</artifactId>
 +                <executions>
 +                    <execution>
 +                        <id>onap-license</id>
 +                        <goals>
 +                            <goal>check</goal>
 +                        </goals>
 +                        <phase>process-sources</phase>
 +                        <configuration>
 +                            <configLocation>onap-checkstyle/check-license.xml</configLocation>
 +                            <includeResources>false</includeResources>
 +                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
 +                            <includeTestResources>false</includeTestResources>
 +                            <sourceDirectories>
 +                                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
 +                            </sourceDirectories>
 +                            <consoleOutput>true</consoleOutput>
 +                            <failOnViolation>true</failOnViolation>
 +                            <violationSeverity>warning</violationSeverity>
 +                        </configuration>
 +                    </execution>
 +                    <execution>
 +                        <id>onap-java-style</id>
 +                        <goals>
 +                            <goal>check</goal>
 +                        </goals>
 +                        <phase>process-sources</phase>
 +                        <configuration>
 +                            <!-- Use Google Java Style Guide:
 +                              https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
 +                              with minor changes -->
 +                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
 +                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated
 +                                sources directory -->
 +                            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
 +                            <includeResources>true</includeResources>
 +                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
 +                            <includeTestResources>true</includeTestResources>
 +                            <excludes>
 +                            </excludes>
 +                            <consoleOutput>true</consoleOutput>
 +                            <failOnViolation>true</failOnViolation>
 +                            <violationSeverity>warning</violationSeverity>
 +                        </configuration>
 +                    </execution>
 +                </executions>
 +                <dependencies>
 +                    <dependency>
 +                        <groupId>org.onap.oparent</groupId>
 +                        <artifactId>checkstyle</artifactId>
 +                        <version>${oparent.version}</version>
 +                        <scope>compile</scope>
 +                    </dependency>
 +                </dependencies>
 +            </plugin>
          </plugins>
      </build>
 -
  </project>