diff options
18 files changed, 778 insertions, 824 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml index 83a8215851..866371d7d9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml @@ -1,16 +1,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <name>onap-configuration-management-api</name> - <artifactId>onap-configuration-management-api</artifactId> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>onap-common-configuration-management</artifactId> - <groupId>org.onap.sdc.common</groupId> - <version>1.3.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> + <name>onap-configuration-management-api</name> + <artifactId>onap-configuration-management-api</artifactId> + + <parent> + <artifactId>onap-common-configuration-management</artifactId> + <groupId>org.onap.sdc.common</groupId> + <version>1.3.0-SNAPSHOT</version> + </parent> </project> diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index 40693df779..78c378713a 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -1,113 +1,111 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <name>onap-configuration-management-core</name> - <artifactId>onap-configuration-management-core</artifactId> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>onap-common-configuration-management</artifactId> - <groupId>org.onap.sdc.common</groupId> - <version>1.3.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> + <name>onap-configuration-management-core</name> + <artifactId>onap-configuration-management-core</artifactId> - <dependencies> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.5.4</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-configuration2</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>${commons.beanutils.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> - </dependency> - <dependency> - <groupId>com.github.adejanovski</groupId> - <artifactId>cassandra-jdbc-wrapper</artifactId> - <version>3.1.0</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-dbcp2</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-pool2</artifactId> - <version>2.4.2</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> - </dependency> - <dependency> - <groupId>net.sf.corn</groupId> - <artifactId>corn-cps</artifactId> - <version>1.1.7</version> - <exclusions> - <exclusion> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.virtlink.commons</groupId> - <artifactId>commons-configuration2-jackson</artifactId> - <version>0.6.1</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.7</version> - </dependency> - <dependency> - <groupId>org.onap.sdc.common</groupId> - <artifactId>onap-configuration-management-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet-api.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>2.8.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - <version>${junit.version}</version> - </dependency> + <parent> + <artifactId>onap-common-configuration-management</artifactId> + <groupId>org.onap.sdc.common</groupId> + <version>1.3.0-SNAPSHOT</version> + </parent> - </dependencies> + <dependencies> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging}</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons.beanutils.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons.lang3.version}</version> + </dependency> + <dependency> + <groupId>com.github.adejanovski</groupId> + <artifactId>cassandra-jdbc-wrapper</artifactId> + <version>3.1.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-dbcp2</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-pool2</artifactId> + <version>2.4.2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> + <dependency> + <groupId>net.sf.corn</groupId> + <artifactId>corn-cps</artifactId> + <version>1.1.7</version> + <exclusions> + <exclusion> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.virtlink.commons</groupId> + <artifactId>commons-configuration2-jackson</artifactId> + <version>0.6.1</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.7</version> + </dependency> + <dependency> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.8.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + <version>${junit.version}</version> + </dependency> + </dependencies> </project> diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml index 700513ea5d..77e645eef2 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml @@ -1,49 +1,48 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <name>onap-configuration-management-test</name> - <artifactId>onap-configuration-management-test</artifactId> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>onap-common-configuration-management</artifactId> - <groupId>org.onap.sdc.common</groupId> - <version>1.3.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> + <name>onap-configuration-management-test</name> + <artifactId>onap-configuration-management-test</artifactId> - <dependencies> - <dependency> - <groupId>org.onap.sdc.common</groupId> - <artifactId>onap-configuration-management-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <parent> + <artifactId>onap-common-configuration-management</artifactId> + <groupId>org.onap.sdc.common</groupId> + <version>1.3.0-SNAPSHOT</version> + </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${mvn.surefire.version}</version> - <configuration> - <skipTests>true</skipTests> - <systemPropertyVariables> - <config.location>${project.basedir}/src/test/resources</config.location> - <node.config.location>${user.home}/TestResources</node.config.location> - </systemPropertyVariables> - <includes> - <include>**/TestCMSuite.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${mvn.surefire.version}</version> + <configuration> + <skipTests>true</skipTests> + <systemPropertyVariables> + <config.location>${project.basedir}/src/test/resources</config.location> + <node.config.location>${user.home}/TestResources</node.config.location> + </systemPropertyVariables> + <includes> + <include>**/TestCMSuite.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml index 6e8c4d11e3..941adb8c83 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml @@ -1,121 +1,113 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <name>onap-sdc-artifact-generator-core</name> - <artifactId>onap-sdc-artifact-generator-core</artifactId> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>onap-common-lib</artifactId> - <groupId>org.onap.sdc.common</groupId> - <version>1.3.0-SNAPSHOT</version> - <relativePath>../../</relativePath> - </parent> + <name>onap-sdc-artifact-generator-core</name> + <artifactId>onap-sdc-artifact-generator-core</artifactId> - <dependencies> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>${aspectj.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${logback.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-logging-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-logging-core</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.onap.sdc.common</groupId> - <artifactId>onap-sdc-artifact-generator-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <version>${testng.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>${org.reflections.version}</version> - </dependency> - </dependencies> - <build> - <pluginManagement> - <plugins> + <parent> + <artifactId>onap-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> + <version>1.3.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>aspectj-maven-plugin</artifactId> - <version>1.8</version> - <!-- new configuration is here --> - <configuration> - <complianceLevel>1.8</complianceLevel> - <source>1.8</source> - <target>1.8</target> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - </goals> - <phase>test-compile</phase> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> + <dependencies> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>org.openecomp.sdc</groupId> + <artifactId>openecomp-sdc-logging-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.openecomp.sdc</groupId> + <artifactId>openecomp-sdc-logging-core</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>${org.reflections.version}</version> + </dependency> + </dependencies> + <build> + <pluginManagement> + <plugins> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>aspectj-maven-plugin</artifactId> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>aspectj-maven-plugin</artifactId> + <version>1.8</version> + <!-- new configuration is here --> + <configuration> + <complianceLevel>1.8</complianceLevel> + <source>1.8</source> + <target>1.8</target> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + </goals> + <phase>test-compile</phase> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjtools</artifactId> + <version>${aspectj.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>aspectj-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml index 1b33108237..7ac9596931 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml @@ -1,61 +1,60 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <artifactId>onap-sdc-artifact-generator-test</artifactId> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>onap-common-lib</artifactId> - <groupId>org.onap.sdc.common</groupId> - <version>1.3.0-SNAPSHOT</version> - <relativePath>../../</relativePath> - </parent> + <artifactId>onap-sdc-artifact-generator-test</artifactId> - <build> - <plugins> - <!-- any other plugins --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${mvn.shade.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <excludes> - <exclude>com.google.guava:*</exclude> - </excludes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <parent> + <artifactId>onap-common-lib</artifactId> + <groupId>org.onap.sdc.common</groupId> + <version>1.3.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>${mvn.shade.version}</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <excludes> + <exclude>com.google.guava:*</exclude> + </excludes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - <dependency> - <groupId>org.onap.sdc.common</groupId> - <artifactId>onap-sdc-artifact-generator-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.sdc.common</groupId> - <artifactId>onap-sdc-artifact-generator-core</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-sdc-artifact-generator-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> diff --git a/common/pom.xml b/common/pom.xml index bac8f3a83e..29344ec3af 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,384 +1,251 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <groupId>org.onap.sdc.common</groupId> - <name>onap-common-lib</name> - <artifactId>onap-common-lib</artifactId> - <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.openecomp.sdc</groupId> - <artifactId>sdc-onboarding</artifactId> - <version>1.3.0-SNAPSHOT</version> - <relativePath>../onboarding</relativePath> - </parent> + <groupId>org.onap.sdc.common</groupId> + <name>onap-common-lib</name> + <artifactId>onap-common-lib</artifactId> + <packaging>pom</packaging> - <properties> - <aspectj.version>1.8.7</aspectj.version> - </properties> + <parent> + <groupId>org.openecomp.sdc</groupId> + <artifactId>sdc-onboarding</artifactId> + <version>1.3.0-SNAPSHOT</version> + <relativePath>../onboarding/pom.xml</relativePath> + </parent> - <modules> - <module>onap-sdc-artifact-generator-lib</module> - <module>onap-common-configuration-management</module> - <module>onap-tosca-datatype</module> - </modules> + <modules> + <module>onap-sdc-artifact-generator-lib</module> + <module>onap-common-configuration-management</module> + <module>onap-tosca-datatype</module> + </modules> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-api.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - </dependency> - - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> - </dependency> - <dependency> - <groupId>com.datastax.cassandra</groupId> - <artifactId>cassandra-driver-core</artifactId> - <version>${datastax.cassandra.version}</version> - </dependency> - <dependency> - <groupId>com.datastax.cassandra</groupId> - <artifactId>cassandra-driver-mapping</artifactId> - <version>${datastax.cassandra.version}</version> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>${ws.rs.version}</version> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${testng.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>${aspectj.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet-api.version}</version> - <scope>provided</scope> - </dependency> - <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils --> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>${commons.beanutils.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.beust/jcommander --> - <dependency> - <groupId>com.beust</groupId> - <artifactId>jcommander</artifactId> - <version>${jcommander.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/commons-digester/commons-digester --> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>${commons.digester.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/org.beanshell/bsh --> - <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>${bsh.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.google.code.findbugs/annotations --> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - <version>3.0.1u2</version> - </dependency> - <!-- https://mvnrepository.com/artifact/cglib/cglib-nodep --> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>${cglib.nodep.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <plugins> - - <!-- ================================================== --> - <!-- Set the JDK compiler version. --> - <!-- ================================================== --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${mvn.compiler.version}</version> - <inherited>true</inherited> - <executions> - <execution> - <id>default-compile</id> - <configuration> - <skipMain>${skipMainSourceCompile}</skipMain> - </configuration> - </execution> - <execution> - <id>default-testCompile</id> - <configuration> - <skip>${skipTestSourceCompile}</skip> - </configuration> - </execution> - </executions> - <configuration> - <source>${java.source}</source> - <target>${java.target}</target> - </configuration> - </plugin> - <plugin> - <groupId>org.openecomp.sdc.onboarding</groupId> - <artifactId>artifact-copy-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <goals> - <goal>init-artifact-helper</goal> - <goal>calibrate-artifact-helper</goal> - </goals> - </execution> - </executions> - <configuration> - <groupId>org.openecomp.sdc</groupId> - <artifactId>build-data-installer</artifactId> - <version>${project.version}</version> - <artifactHelper> - <project> - ${project} - </project> - <session>${session}</session> - <unicornRoot>org.openecomp.sdc:sdc-onboarding/target/build-data</unicornRoot> - </artifactHelper> - </configuration> - </plugin> - <plugin> - <groupId>org.openecomp.sdc.onboarding</groupId> - <artifactId>compile-helper-plugin</artifactId> - <version>${project.version}</version> - <dependencies> - <dependency> - <groupId>org.openecomp.sdc.onboarding</groupId> - <artifactId>pmd-helper-plugin</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <goals> - <goal>init-helper</goal> - <goal>pre-compile-helper</goal> - <goal>post-compile-helper</goal> - <goal>pre-test-compile-helper</goal> - <goal>post-test-run-helper</goal> - </goals> - </execution> - </executions> - <configuration> - <excludePackaging>pom</excludePackaging> - <excludeDependencies>test,runtime</excludeDependencies> - <generatedSourceLocation>${project.build.directory}/generated-sources</generatedSourceLocation> - <buildState> - <project> - ${project} - </project> - <compileStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/compileState.dat</compileStateFilePath> - </buildState> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>${maven.pmd.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>build-tools</artifactId> - <version>${build.tools.version}</version> - </dependency> - <dependency> - <groupId>net.sourceforge.pmd</groupId> - <artifactId>pmd-core</artifactId> - <version>${pmd.core.version}</version> - </dependency> - <dependency> - <groupId>net.sourceforge.pmd</groupId> - <artifactId>pmd-java</artifactId> - <version>${pmd.java.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>${skipPMD}</skip> - <showPmdLog>false</showPmdLog> - <analysisCache>false</analysisCache> - <analysisCacheLocation>${project.build.directory}/pmd/pmd.cache</analysisCacheLocation> - <failOnViolation>false</failOnViolation> - <printFailingErrors>false</printFailingErrors> - <format>csv</format> - <targetDirectory>${project.build.directory}/pmd</targetDirectory> - <includeTests>true</includeTests> - <linkXRef>false</linkXRef> - <aggregate>false</aggregate> - <rulesets> - <ruleset>/category/java/bestpractices.xml</ruleset> - <ruleset>/category/java/codestyle.xml</ruleset> - <ruleset>/category/java/design.xml</ruleset> - <ruleset>/category/java/errorprone.xml</ruleset> - <ruleset>/category/java/multithreading.xml</ruleset> - <ruleset>/category/java/performance.xml</ruleset> - <ruleset>/category/java/security.xml</ruleset> - </rulesets> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - <phase>integration-test</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.openecomp.sdc.onboarding</groupId> - <artifactId>pmd-helper-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <goals> - <goal>init-pmd-helper</goal> - <goal>post-verify-helper</goal> - </goals> - </execution> - </executions> - <configuration> - <excludePackaging>pom</excludePackaging> - <pmdTargetLocation>${project.build.directory}/pmd/pmd.xml</pmdTargetLocation> - <pmdFailureReportLocation>${project.build.directory}/pmd.txt</pmdFailureReportLocation> - <pmdReportFile>${project.build.directory}/pmd/pmd.csv</pmdReportFile> - <persistingModuleCoordinates>org.openecomp.sdc:build-data-installer</persistingModuleCoordinates> - <pmdCurrentStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/pmdState.dat</pmdCurrentStateFilePath> - <pmdStateFile>${project.build.outputDirectory}/pmd.dat</pmdStateFile> - <compiledFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst</compiledFilesList> - <compiledTestFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst</compiledTestFilesList> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${mvn.jar.version}</version> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - </archive> - <excludes> - <exclude>${emptyJAR}</exclude> - </excludes> - </configuration> - </plugin> - <!-- blackduck maven plugin --> - - <!--<plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> - <version>1.0.4</version> <inherited>false</inherited> <configuration> <target>${project.basedir}</target> - </configuration> <executions> <execution> <id>create-bdio-file</id> <phase>package</phase> - <goals> <goal>createHubOutput</goal> </goals> </execution> </executions> - </plugin> --> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>${mvn.license.version}</version> - <configuration> - <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> - <processStartTag>============LICENSE_START=======================================================</processStartTag> - <processEndTag>============LICENSE_END=========================================================</processEndTag> - <sectionDelimiter>================================================================================</sectionDelimiter> - <licenseName>apache_v2</licenseName> - <inceptionYear>2017</inceptionYear> - <organizationName>AT&T Intellectual Property. All rights - reserved.</organizationName> - <projectName>SDC</projectName> - <canUpdateCopyright>true</canUpdateCopyright> - <canUpdateDescription>true</canUpdateDescription> - <canUpdateLicense>true</canUpdateLicense> - <emptyLineAfterHeader>true</emptyLineAfterHeader> - <verbose>false</verbose> - <includes> - <include>**/*.java</include> - <include>**/*.js</include> - <include>**/*.ts</include> - </includes> - <roots> - <root>src</root> - <root>app</root> - <root>server-mock</root> - <root>typings</root> - </roots> - </configuration> - <executions> - <execution> - <id>first</id> - <goals> - <goal>update-file-header</goal> - </goals> - <!--phase>process-sources</phase --> - </execution> - </executions> - </plugin> - - - </plugins> - - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${mvn.compiler.version}</version> + <inherited>true</inherited> + <executions> + <execution> + <id>default-compile</id> + <configuration> + <skipMain>${skipMainSourceCompile}</skipMain> + </configuration> + </execution> + <execution> + <id>default-testCompile</id> + <configuration> + <skip>${skipTestSourceCompile}</skip> + </configuration> + </execution> + </executions> + <configuration> + <source>${java.source}</source> + <target>${java.target}</target> + </configuration> + </plugin> + <plugin> + <groupId>org.openecomp.sdc.onboarding</groupId> + <artifactId>artifact-copy-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <goals> + <goal>init-artifact-helper</goal> + <goal>calibrate-artifact-helper</goal> + </goals> + </execution> + </executions> + <configuration> + <groupId>org.openecomp.sdc</groupId> + <artifactId>build-data-installer</artifactId> + <version>${project.version}</version> + <artifactHelper> + <project>${project}</project> + <session>${session}</session> + <unicornRoot>org.openecomp.sdc:sdc-onboarding/target/build-data</unicornRoot> + </artifactHelper> + </configuration> + </plugin> + <plugin> + <groupId>org.openecomp.sdc.onboarding</groupId> + <artifactId>compile-helper-plugin</artifactId> + <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.openecomp.sdc.onboarding</groupId> + <artifactId>pmd-helper-plugin</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <goals> + <goal>init-helper</goal> + <goal>pre-compile-helper</goal> + <goal>post-compile-helper</goal> + <goal>pre-test-compile-helper</goal> + <goal>post-test-run-helper</goal> + </goals> + </execution> + </executions> + <configuration> + <excludePackaging>pom</excludePackaging> + <excludeDependencies>test,runtime</excludeDependencies> + <generatedSourceLocation>${project.build.directory}/generated-sources</generatedSourceLocation> + <buildState> + <project>${project}</project> + <compileStateFilePath> + org.openecomp.sdc:sdc-onboarding/target/build-data/compileState.dat + </compileStateFilePath> + </buildState> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>${maven.pmd.plugin.version}</version> + <dependencies> + <dependency> + <groupId>org.openecomp.sdc</groupId> + <artifactId>build-tools</artifactId> + <version>${build.tools.version}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.pmd</groupId> + <artifactId>pmd-core</artifactId> + <version>${pmd.core.version}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.pmd</groupId> + <artifactId>pmd-java</artifactId> + <version>${pmd.java.version}</version> + </dependency> + </dependencies> + <configuration> + <skip>${skipPMD}</skip> + <showPmdLog>false</showPmdLog> + <analysisCache>false</analysisCache> + <analysisCacheLocation>${project.build.directory}/pmd/pmd.cache</analysisCacheLocation> + <failOnViolation>false</failOnViolation> + <printFailingErrors>false</printFailingErrors> + <format>csv</format> + <targetDirectory>${project.build.directory}/pmd</targetDirectory> + <includeTests>true</includeTests> + <linkXRef>false</linkXRef> + <aggregate>false</aggregate> + <rulesets> + <ruleset>/category/java/bestpractices.xml</ruleset> + <ruleset>/category/java/codestyle.xml</ruleset> + <ruleset>/category/java/design.xml</ruleset> + <ruleset>/category/java/errorprone.xml</ruleset> + <ruleset>/category/java/multithreading.xml</ruleset> + <ruleset>/category/java/performance.xml</ruleset> + <ruleset>/category/java/security.xml</ruleset> + </rulesets> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.openecomp.sdc.onboarding</groupId> + <artifactId>pmd-helper-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <goals> + <goal>init-pmd-helper</goal> + <goal>post-verify-helper</goal> + </goals> + </execution> + </executions> + <configuration> + <excludePackaging>pom</excludePackaging> + <pmdTargetLocation>${project.build.directory}/pmd/pmd.xml</pmdTargetLocation> + <pmdFailureReportLocation>${project.build.directory}/pmd.txt</pmdFailureReportLocation> + <pmdReportFile>${project.build.directory}/pmd/pmd.csv</pmdReportFile> + <persistingModuleCoordinates>org.openecomp.sdc:build-data-installer</persistingModuleCoordinates> + <pmdCurrentStateFilePath> + org.openecomp.sdc:sdc-onboarding/target/build-data/pmdState.dat + </pmdCurrentStateFilePath> + <pmdStateFile>${project.build.outputDirectory}/pmd.dat</pmdStateFile> + <compiledFilesList> + ${project.build.directory}/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst + </compiledFilesList> + <compiledTestFilesList> + ${project.build.directory}/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst + </compiledTestFilesList> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${mvn.jar.version}</version> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + <excludes> + <exclude>${emptyJAR}</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>${mvn.license.version}</version> + <configuration> + <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> + <processStartTag>============LICENSE_START======================================================= + </processStartTag> + <processEndTag>============LICENSE_END========================================================= + </processEndTag> + <sectionDelimiter>================================================================================ + </sectionDelimiter> + <licenseName>apache_v2</licenseName> + <inceptionYear>2017</inceptionYear> + <organizationName>AT&T Intellectual Property. All rights + reserved. + </organizationName> + <projectName>SDC</projectName> + <canUpdateCopyright>true</canUpdateCopyright> + <canUpdateDescription>true</canUpdateDescription> + <canUpdateLicense>true</canUpdateLicense> + <emptyLineAfterHeader>true</emptyLineAfterHeader> + <verbose>false</verbose> + <includes> + <include>**/*.java</include> + <include>**/*.js</include> + <include>**/*.ts</include> + </includes> + <roots> + <root>src</root> + <root>app</root> + <root>server-mock</root> + <root>typings</root> + </roots> + </configuration> + <executions> + <execution> + <id>first</id> + <goals> + <goal>update-file-header</goal> + </goals> + <!--phase>process-sources</phase--> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/onboarding/pom.xml b/onboarding/pom.xml index d19c6e3a69..794f28ad9f 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -1,6 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <artifactId>sdc-onboarding</artifactId> @@ -48,6 +49,7 @@ <!-- Onboarding 3rd party versions --> <aspectj.version>1.8.9</aspectj.version> + <aspectjrt.version>${aspectj.version}</aspectjrt.version> <bsh.version>2.0b5</bsh.version> <cglib.nodep.version>3.2.4</cglib.nodep.version> <!--old : 2.1_3. new 3.2.4 --> <classmate.version>1.3.3</classmate.version> @@ -67,8 +69,8 @@ <gson.version>2.3.1</gson.version> <fop.version>2.2</fop.version> <freemarker.version>2.3.26-incubating</freemarker.version> - <hibernate.validator.version>5.3.3.Final - </hibernate.validator.version> <!--5.3.1.Final changed to 5.3.3.Final to include jboss-logging 3.3.0.Final for 1702 --> + <!--5.3.1.Final changed to 5.3.3.Final to include jboss-logging 3.3.0.Final for 1702 --> + <hibernate.validator.version>5.3.3.Final</hibernate.validator.version> <http.client.version>4.5.3</http.client.version> <http.core.version>4.4.1</http.core.version> <httpasyncclient.version>4.1.2</httpasyncclient.version> @@ -82,15 +84,15 @@ <javax.inject.version>1</javax.inject.version> <javax.servlet.version>2.5</javax.servlet.version> <jackson.version>2.8.1</jackson.version> - <jackson.annotations.version>2.7.4</jackson.annotations.version> - <jackson.dataformat.version>2.7.4</jackson.dataformat.version> + <jackson.annotations.version>${jackson.version}</jackson.annotations.version> + <jackson.dataformat.version>${jackson.version}</jackson.dataformat.version> <jackson.mapper.version>1.9.13</jackson.mapper.version> <jcommander.version>1.58</jcommander.version> <jetty.servlets.version>9.0.6.v20130930</jetty.servlets.version> <jersey.core.version>1.19.1</jersey.core.version> <jersey.multipart.version>1.18.1</jersey.multipart.version> <junit.version>4.12</junit.version> - <logback.version>1.1.2</logback.version> + <logback.version>1.2.3</logback.version> <mockito.all.version>1.10.19</mockito.all.version> <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version> <!-- orignal 1.9.2 --> <org.everit.json.schema.version>1.5.1 @@ -130,16 +132,164 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + <version>${jcommander.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpasyncclient</artifactId> + <version>${httpasyncclient.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.impl.version}</version> + </dependency> + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + <version>${bsh.version}</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>${commons.digester.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml</groupId> + <artifactId>classmate</artifactId> + <version>${classmate.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${groovy.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.janino</groupId> + <artifactId>janino</artifactId> + <version>${janino.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson.annotations.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>${aspectjrt.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons.beanutils.version}</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + <version>3.0.1u2</version> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>${cglib.nodep.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>${logback.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons.codec.version}</version> + </dependency> + <dependency> + <groupId>com.datastax.cassandra</groupId> + <artifactId>cassandra-driver-core</artifactId> + <version>${datastax.cassandra.version}</version> + </dependency> + <dependency> + <groupId>com.datastax.cassandra</groupId> + <artifactId>cassandra-driver-mapping</artifactId> + <version>${datastax.cassandra.version}</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${ws.rs.version}</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons.lang3.version}</version> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <scope>test</scope> <version>${testng.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - <version>1.3</version> - <scope>compile</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito.all.version}</version> + <scope>test</scope> </dependency> </dependencies> </dependencyManagement> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..278f2ac6ec --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml @@ -0,0 +1,13 @@ +<configuration> + + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> + </encoder> + </appender> + + <root level="warn"> + <appender-ref ref="STDOUT" /> + </root> + +</configuration>
\ No newline at end of file diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml index c1932e31e8..c1932e31e8 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml index 87f0482b80..28d81cbed7 100644 --- a/openecomp-be/lib/openecomp-common-lib/pom.xml +++ b/openecomp-be/lib/openecomp-common-lib/pom.xml @@ -1,5 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.sdc.core</groupId> @@ -27,28 +28,34 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.1-m05</version> + <scope>provided</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> <groupId>com.amdocs.zusammen</groupId> <artifactId>zusammen-datatypes</artifactId> <version>${zusammen.version}</version> diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml index 751b3a9be0..092338fb2d 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml @@ -2,14 +2,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-item-permissions-lib</artifactId> <version>1.3.0-SNAPSHOT</version> - <relativePath>..</relativePath> </parent> <artifactId>openecomp-item-permissions-core</artifactId> @@ -19,7 +18,11 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -50,14 +53,12 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>${mockito.all.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope> - <version>${testng.version}</version> </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml index 4eb91f40ec..9ae7232901 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml @@ -2,9 +2,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-action-api</artifactId> <parent> @@ -38,7 +38,11 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>${jackson.annotations.version}</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml index 03ce9d1243..03ce9d1243 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml index 31672ca4d9..31672ca4d9 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml index b30857620a..a960e67898 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml @@ -26,11 +26,6 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <!-- - Use latest version for proper testing of context propagation. - Will not affect the application because the scope is "provided". - --> - <version>1.2.3</version> <scope>provided</scope> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml index d39c5c5cb7..b93d9566c7 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml @@ -37,7 +37,6 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.3.1</version> </dependency> <dependency> <groupId>com.googlecode.json-simple</groupId> @@ -56,17 +55,20 @@ <version>${http.core.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <scope>provided</scope> + </dependency> <dependency> - <groupId>com.datastax.cassandra</groupId> - <artifactId>cassandra-driver-core</artifactId> - <version>3.4.0</version> - <scope>test</scope> + <groupId>com.datastax.cassandra</groupId> + <artifactId>cassandra-driver-core</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - <version>${junit.version}</version> </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.xml index 03ce9d1243..03ce9d1243 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.xml diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index 492d0e0a28..e93576a803 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>openecomp-sdc</name> - <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc</artifactId> <packaging>pom</packaging> @@ -13,23 +12,15 @@ <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-onboarding</artifactId> <version>1.3.0-SNAPSHOT</version> - <relativePath>../onboarding</relativePath> + <relativePath>../onboarding/pom.xml</relativePath> </parent> <dependencies> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson.version}</version> - </dependency> - - <!-- Feature Toggle support libraries--> - <dependency> <groupId>org.togglz</groupId> <artifactId>togglz-core</artifactId> <version>${togglz.version}</version> </dependency> - <dependency> <groupId>org.togglz</groupId> <artifactId>togglz-testing</artifactId> @@ -120,7 +111,8 @@ <generatedSourceLocation>${project.build.directory}/generated-sources</generatedSourceLocation> <buildState> <project>${project}</project> - <compileStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/compileState.dat</compileStateFilePath> + <compileStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/compileState.dat + </compileStateFilePath> </buildState> </configuration> </plugin> @@ -194,10 +186,15 @@ <pmdFailureReportLocation>${project.build.directory}/pmd.txt</pmdFailureReportLocation> <pmdReportFile>${project.build.directory}/pmd/pmd.csv</pmdReportFile> <persistingModuleCoordinates>org.openecomp.sdc:build-data-installer</persistingModuleCoordinates> - <pmdCurrentStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/pmdState.dat</pmdCurrentStateFilePath> + <pmdCurrentStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/pmdState.dat + </pmdCurrentStateFilePath> <pmdStateFile>${project.build.outputDirectory}/pmd.dat</pmdStateFile> - <compiledFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst</compiledFilesList> - <compiledTestFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst</compiledTestFilesList> + <compiledFilesList> + ${project.build.directory}/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst + </compiledFilesList> + <compiledTestFilesList> + ${project.build.directory}/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst + </compiledTestFilesList> </configuration> </plugin> <plugin> @@ -219,9 +216,12 @@ <version>${mvn.license.version}</version> <configuration> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> - <processStartTag>============LICENSE_START=======================================================</processStartTag> - <processEndTag>============LICENSE_END=========================================================</processEndTag> - <sectionDelimiter>================================================================================</sectionDelimiter> + <processStartTag>============LICENSE_START======================================================= + </processStartTag> + <processEndTag>============LICENSE_END========================================================= + </processEndTag> + <sectionDelimiter>================================================================================ + </sectionDelimiter> <licenseName>apache_v2</licenseName> <inceptionYear>2017</inceptionYear> <organizationName>AT&T Intellectual Property. All rights reserved.</organizationName> @@ -288,72 +288,6 @@ </plugins> </build> - <!--Added to resolve blackduck operational risks for indirect dependencies referred --> - <dependencyManagement> - <dependencies> - <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils --> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>${commons.beanutils.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.beust/jcommander --> - <dependency> - <groupId>com.beust</groupId> - <artifactId>jcommander</artifactId> - <version>${jcommander.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient --> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpasyncclient</artifactId> - <version>${httpasyncclient.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl --> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb.impl.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/org.beanshell/bsh --> - <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>${bsh.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/commons-digester/commons-digester --> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>${commons.digester.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.fasterxml/classmate --> - <dependency> - <groupId>com.fasterxml</groupId> - <artifactId>classmate</artifactId> - <version>${classmate.version}</version> - </dependency> - <!--1702 --> - <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${groovy.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.janino</groupId> - <artifactId>janino</artifactId> - <version>${janino.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - </dependencyManagement> - <modules> <module>/api</module> <module>/lib</module> @@ -362,13 +296,6 @@ <module>/backend</module> </modules> <profiles> - <!--<profile>--> - <!--<id>docker-staging</id>--> - <!--<properties>--> - <!--<docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>--> - <!--<docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>--> - <!--</properties>--> - <!--</profile>--> <profile> <id>docker</id> |