aboutsummaryrefslogtreecommitdiffstats
path: root/ms
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2021-06-17 16:06:17 -0400
committerKAPIL SINGAL <ks220y@att.com>2021-06-23 15:31:02 +0000
commit108a13c20757f4a437aea22880f019e6e6043841 (patch)
tree2d1caf17cf4ffb48492c942867bab6252c6da580 /ms
parent1acaa2eeae7a185534e2d4bf99300bd8bab73abb (diff)
Minor Refactoring of sliboot pom
Updating docker-maven-plugin to 0.34.0 and removing docker image build goal (it was there twice) Issue-ID: CCSDK-3343 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I26401befaf235ddfe694c6206cbd547cbc56cc03
Diffstat (limited to 'ms')
-rw-r--r--ms/sliboot/pom.xml109
1 files changed, 53 insertions, 56 deletions
diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index 9f43ca1a..e93f70a3 100644
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -39,16 +39,16 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
@@ -125,22 +125,25 @@
<version>${ccsdk.sli.core.version}</version>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sliapi-model-swagger</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>yaml</type>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sliPluginUtils-provider</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
</dependency>
<dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
+ <groupId>org.onap.ccsdk.sli.plugins</groupId>
+ <artifactId>restapi-call-node-provider</artifactId>
+ <version>${ccsdk.sli.plugins.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.onap.ccsdk.sli.plugins</groupId>
+ <artifactId>properties-node-provider</artifactId>
+ <version>${ccsdk.sli.plugins.version}</version>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
@@ -148,29 +151,26 @@
<version>1.6.6</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sliapi-model-swagger</artifactId>
- <version>${ccsdk.sli.core.version}</version>
- <type>yaml</type>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sliPluginUtils-provider</artifactId>
- <version>${ccsdk.sli.core.version}</version>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
</dependency>
<dependency>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>restapi-call-node-provider</artifactId>
- <version>${ccsdk.sli.plugins.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>properties-node-provider</artifactId>
- <version>${ccsdk.sli.plugins.version}</version>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
<!-- this jersey jar is needed for rest api call node to function properly -->
<dependency>
@@ -204,7 +204,7 @@
<executions>
<execution>
- <id>get-sliapi-yaml</id>
+ <id>copy-sliapi-model-swagger</id>
<phase>initialize</phase>
<goals>
<goal>copy-dependencies</goal>
@@ -313,18 +313,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
</executions>
<configuration>
- <skipITs>true</skipITs>
+ <skipITs>true</skipITs>
</configuration>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
@@ -430,24 +430,24 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
</executions>
<configuration>
- <skipITs>false</skipITs>
- <environmentVariables>
- <SLIBOOT_PORT>${sliboot.port}</SLIBOOT_PORT>
- </environmentVariables>
+ <skipITs>false</skipITs>
+ <environmentVariables>
+ <SLIBOOT_PORT>${sliboot.port}</SLIBOOT_PORT>
+ </environmentVariables>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.28.0</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
<configuration>
<images>
@@ -455,7 +455,8 @@
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
@@ -474,7 +475,6 @@
<goal>build</goal>
</goals>
</execution>
-
<execution>
<id>start-it-instance</id>
<phase>pre-integration-test</phase>
@@ -548,15 +548,12 @@
</execution>
<execution>
<id>push-images</id>
- <phase>${docker.push.phase}</phase>
<goals>
- <goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</profile>