<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">
+ 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>catalog-be</artifactId>
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<properties>
<java-hamcrest.version>2.0.0.0</java-hamcrest.version>
<swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
<swagger-ui.version>3.25.0</swagger-ui.version>
- <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+ <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
<replacer.plugin.version>1.5.3</replacer.plugin.version>
+ <ui.version>${project.version}</ui.version>
+ <io.github.hakky54.version>7.4.11</io.github.hakky54.version>
</properties>
<dependencies>
<groupId>org.openecomp.sdc</groupId>
<artifactId>togglz-rest-services</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>${jsoup.version}</version>
</dependency>
<!--JSON and YAML Parsing-->
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.github.classgraph</groupId>
+ <artifactId>classgraph</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
</dependency>
<!-- Swagger Dependencies End -->
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate.validator.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>common-app-api</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<artifactId>common-be</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.be</groupId>
- <artifactId>common-be</artifactId>
+ <artifactId>common-be-tests-utils</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.be</groupId>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ <version>${micrometer.version}</version>
+ </dependency>
+
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<artifactId>commons-jci-core</artifactId>
<version>${commons-jci-core.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Gson -->
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ <version>${jakarta.el.version}</version>
</dependency>
<!-- http client -->
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
</dependency>
<!-- http client END -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<scope>compile</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-groovy</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.json</groupId>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<scope>compile</scope>
</dependency>
-
<!-- CAMBRIA CLIENT for U-EB -->
<dependency>
<groupId>com.att.nsa</groupId>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20131018</version>
- <scope>compile</scope>
+ <version>${org.json.version}</version>
</dependency>
<!-- CASSANDRA -->
<artifactId>cassandra-driver-core</artifactId>
<version>${cassandra.driver.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.jnr</groupId>
+ <artifactId>jnr-posix</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<dependency>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
- <version>2.2.0.0</version>
+ <version>${org.owasp.esapi.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis-ext</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
</exclusion>
</exclusions>
</dependency>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<artifactId>jetty-proxy</artifactId>
<version>${jetty.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<artifactId>apache-log4j-extras</artifactId>
<groupId>log4j</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.att.aft</groupId>
<artifactId>dme2</artifactId>
<version>3.1.200-oss</version>
- </dependency>
-
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- CADI -->
- <dependency>
- <groupId>org.onap.aaf.authz</groupId>
- <artifactId>aaf-cadi-aaf</artifactId>
- <version>${cadi.version}</version>
<exclusions>
<exclusion>
- <groupId>com.datastax.cassandra</groupId>
- <artifactId>cassandra-driver-core</artifactId>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<version>${jersey-bom.version}</version>
<type>pom</type>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<version>${mockitoJupiter.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.junit-pioneer</groupId>
+ <artifactId>junit-pioneer</artifactId>
+ <version>2.0.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<artifactId>commons-collections4</artifactId>
<version>${commons.collections.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
<dependency>
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>security-util-lib</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>com.googlecode.jmapper-framework</groupId>
+ <artifactId>jmapper-core</artifactId>
+ <version>${jMapper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.github.hakky54</groupId>
+ <artifactId>sslcontext-kickstart-for-jetty</artifactId>
+ <version>${io.github.hakky54.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.github.hakky54</groupId>
+ <artifactId>sslcontext-kickstart</artifactId>
+ <version>${io.github.hakky54.version}</version>
+ </dependency>
+
</dependencies>
<build>
</packagingExcludes>
<archive>
<manifestEntries>
- <SDC-Version>${project.version}</SDC-Version>
+ <SDC-Version>${ui.version}</SDC-Version>
</manifestEntries>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.9.2</version>
+ <version>${aspectj.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.9.2</version>
+ <version>${aspectj.version}</version>
</dependency>
</dependencies>
<executions>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${mvn.assembly.version}</version>
<executions>
<execution>
<id>normatives</id>
</goals>
<configuration>
<contextId>sdce-2-sdce-5</contextId>
- <outputPath>${project.build.directory}/generated/swagger</outputPath>
- <outputFileName>swagger-sdce-2-sdce-5</outputFileName>
- <outputFormat>JSON</outputFormat>
+ <outputPath>${project.build.directory}/generated/openapi</outputPath>
+ <outputFileName>openapi-sdce-2-sdce-5</outputFileName>
+ <outputFormat>JSONANDYAML</outputFormat>
<configurationFilePath>
${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml
</configurationFilePath>
</goals>
<configuration>
<contextId>sdce-4</contextId>
- <outputPath>${project.build.directory}/generated/swagger</outputPath>
- <outputFileName>swagger-sdce-4</outputFileName>
- <outputFormat>JSON</outputFormat>
+ <outputPath>${project.build.directory}/generated/openapi</outputPath>
+ <outputFileName>openapi-sdce-4</outputFileName>
+ <outputFormat>JSONANDYAML</outputFormat>
<configurationFilePath>
${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml
</configurationFilePath>
</goals>
<configuration>
<contextId>sdce-6</contextId>
- <outputPath>${project.build.directory}/generated/swagger</outputPath>
- <outputFileName>swagger-sdce-6</outputFileName>
- <outputFormat>JSON</outputFormat>
+ <outputPath>${project.build.directory}/generated/openapi</outputPath>
+ <outputFileName>openapi-sdce-6</outputFileName>
+ <outputFormat>JSONANDYAML</outputFormat>
<configurationFilePath>
${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml
</configurationFilePath>
</goals>
<configuration>
<contextId>sdce-7</contextId>
- <outputPath>${project.build.directory}/generated/swagger</outputPath>
- <outputFileName>swagger-sdce-7</outputFileName>
- <outputFormat>JSON</outputFormat>
+ <outputPath>${project.build.directory}/generated/openapi</outputPath>
+ <outputFileName>openapi-sdce-7</outputFileName>
+ <outputFormat>JSONANDYAML</outputFormat>
<configurationFilePath>
${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml
</configurationFilePath>
</outputDirectory>
<resources>
<resource>
- <directory>${project.parent.basedir}/catalog-be/target
- </directory>
+ <directory>${project.build.directory}</directory>
<includes>
<include>normatives.tar.gz</include>
</includes>
<configuration>
<verbose>${verbose}</verbose>
<apiVersion>${docker.api.version}</apiVersion>
- <registry>nexus3.onap.org:10001</registry>
+ <registry>${docker.registry}</registry>
<authConfig>
<pull>
- <username>docker</username>
- <password>docker</password>
+ <username>${docker.username}</username>
+ <password>${docker.password}</password>
</pull>
</authConfig>
<images>
<!-- Build backend image -->
<image>
- <name>onap/sdc-backend</name>
+ <name>${docker.namespace}/sdc-backend</name>
<alias>sdc-backend</alias>
<build>
<cleanup>try</cleanup>
</image>
<!-- Build backend-init image -->
<image>
- <name>onap/sdc-backend-init</name>
+ <name>${docker.namespace}/sdc-backend-init</name>
<alias>sdc-backend-init</alias>
<build>
<cleanup>try</cleanup>
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/sdc-backend,onap/sdc-backend-init</image>
+ <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image>
</configuration>
</execution>
<goal>push</goal>
</goals>
<configuration>
- <image>onap/sdc-backend,onap/sdc-backend-init</image>
+ <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image>
</configuration>
</execution>
</executions>