<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>1.13.5-SNAPSHOT</version>
</parent>
<dependencies>
+ <dependency>
+ <groupId>org.openecomp.sdc</groupId>
+ <artifactId>onboarding-fe</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<groupId>org.functionaljava</groupId>
<artifactId>functionaljava</artifactId>
<version>${functionaljava.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.onap.sdc.common</groupId>
<artifactId>onap-configuration-management-api</artifactId>
<version>${project.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.openecomp.sdc</groupId>
<artifactId>common-app-api</artifactId>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <scope>compile</scope>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <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>
-
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-bom.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<!-- http client -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
<exclusions>
<exclusion>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>${httpclient.version}</version>
+ <version>${httpmime.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging}</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<!-- http client END -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- JSON and YAML Parsing -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<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>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-aaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- System metrics -->
<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>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<version>${jetty.version}</version>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<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>
<groupId>org.eclipse.jetty</groupId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
<scope>compile</scope>
</dependency>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <properties>
- <docker.username>docker</docker.username>
- <docker.password>docker</docker.password>
- </properties>
<build>
<plugins>
<plugin>
<configuration>
<verbose>${verbose}</verbose>
<apiVersion>${docker.api.version}</apiVersion>
- <registry>nexus3.onap.org:10001</registry>
+ <registry>${docker.registry}</registry>
<authConfig>
<pull>
<username>${docker.username}</username>
<!-- Build frontend image -->
<image>
- <name>onap/sdc-frontend</name>
+ <name>${docker.namespace}/sdc-frontend</name>
<alias>sdc-frontend</alias>
<build>
<cleanup>try</cleanup>
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/sdc-frontend</image>
+ <image>${docker.namespace}/sdc-frontend</image>
</configuration>
</execution>
<goal>push</goal>
</goals>
<configuration>
- <image>onap/sdc-frontend</image>
+ <image>${docker.namespace}/sdc-frontend</image>
</configuration>
</execution>
</executions>