summaryrefslogtreecommitdiffstats
path: root/dcaedt_be/pom.xml
diff options
context:
space:
mode:
authorAreli, Fuss (af732p) <af732p@intl.att.com>2018-05-17 19:53:13 +0300
committerAreli, Fuss (af732p) <af732p@att.com>2018-05-17 19:56:01 +0300
commitd54cab94fbcd1d396382146c527f2b6141746613 (patch)
tree51f12018e36546950a133d136cc661a23954e47b /dcaedt_be/pom.xml
parente59dd9554fa32e702d23d8ee1531953758fa9a8d (diff)
pom fix
Change-Id: If3bbd9f8bf578a60a6a2bbd32125217e6ecb3941 Issue-ID: SDC-1339 Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>
Diffstat (limited to 'dcaedt_be/pom.xml')
-rw-r--r--dcaedt_be/pom.xml190
1 files changed, 103 insertions, 87 deletions
diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml
index 2bd614a..61b4482 100644
--- a/dcaedt_be/pom.xml
+++ b/dcaedt_be/pom.xml
@@ -12,6 +12,11 @@
<artifactId>dcae_dt_be_main</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
+
+ <properties>
+ <docker.staging.tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</docker.staging.tag>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -96,7 +101,6 @@
<version>6.9.10</version>
<scope>test</scope>
</dependency>
- <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
@@ -114,6 +118,12 @@
<version>2.6.1</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>4.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
@@ -141,105 +151,113 @@
</dependency>
</dependencies>
</profile>
+ <!--<profile>-->
+ <!--<id>server</id>-->
+ <!--<activation>-->
+ <!--<activeByDefault>true</activeByDefault>-->
+ <!--</activation>-->
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>javax.servlet</groupId>-->
+ <!--<artifactId>javax.servlet-api</artifactId>-->
+ <!--<version>4.0.0</version>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <!--</profile>-->
+
<profile>
- <id>server</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.0</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>docker</id>
+ <id>docker</id>
<build>
- <plugins>
- <plugin>
+ <plugins>
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
- <execution>
- <id>copy-dcae-be-war</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.parent.basedir}/docker/docker_be/target</outputDirectory>
- <resources>
- <resource>
- <directory>${project.basedir}/target</directory>
- <includes>
- <include>dcae.war</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
+ <execution>
+ <id>copy-dcae-be-war</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.basedir}/docker/docker_be/target</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/target</directory>
+ <includes>
+ <include>dcae.war</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.23.0</version>
<configuration>
- <verbose>true</verbose>
- <apiVersion>1.23</apiVersion>
- <images>
- <!-- Build backend image -->
- <image>
- <name>onap/dcae-be</name>
- <alias>dcae-be</alias>
- <build>
- <cleanup>try</cleanup>
- <dockerFileDir>${project.parent.basedir}/docker/docker_be</dockerFileDir>
- <tags>
- <tag>${docker.tag}</tag>
- <tag>${docker.latest.tag}</tag>
- <tag>${docker.staging.tag}</tag>
- </tags>
- </build>
- </image>
- </images>
+ <verbose>true</verbose>
+ <apiVersion>1.23</apiVersion>
+ <registry>nexus3.onap.org:10001</registry>
+ <authConfig>
+ <pull>
+ <username>docker</username>
+ <password>docker</password>
+ </pull>
+ </authConfig>
+ <images>
+ <!-- Build backend image -->
+ <image>
+ <name>onap/dcae-be</name>
+ <alias>dcae-be</alias>
+ <build>
+ <cleanup>try</cleanup>
+ <dockerFileDir>${project.parent.basedir}/docker/docker_be</dockerFileDir>
+ <tags>
+ <tag>${docker.tag}</tag>
+ <tag>${docker.latest.tag}</tag>
+ <tag>${docker.staging.tag}</tag>
+ </tags>
+ </build>
+ </image>
+ </images>
</configuration>
<executions>
- <execution>
- <id>clean-images</id>
- <phase>pre-clean</phase>
- <goals>
- <goal>remove</goal>
- </goals>
- <configuration>
- <removeAll>true</removeAll>
- <image>onap/dcae-be</image>
- </configuration>
- </execution>
- <execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>push-images</id>
- <phase>deploy</phase>
- <goals>
- <goal>push</goal>
- </goals>
- <configuration>
- <image>onap/dcae-be</image>
- </configuration>
- </execution>
+ <execution>
+ <id>clean-images</id>
+ <phase>pre-clean</phase>
+ <goals>
+ <goal>remove</goal>
+ </goals>
+ <configuration>
+ <removeAll>true</removeAll>
+ <image>onap/dcae-be</image>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-images</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>push-images</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <image>onap/dcae-be</image>
+ </configuration>
+ </execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
- </profile>
+ </profile>
</profiles>
<build>
@@ -261,8 +279,6 @@
</resource>
</webResources>
</configuration>
- <!-- <executions><execution><goals><goal>repackage</goal></goals></execution></executions><configuration><jvmArguments> -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8096
- </jvmArguments></configuration> -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>