add https support to simulato

[sdc.git] / utils / webseal-simulator / pom.xml

diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index 18e5b32..c0e9fe6 100644 (file)
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -5,13 +5,10 @@
        <groupId>org.openecomp.sdc</groupId>
        <artifactId>webseal-simulator</artifactId>
        <packaging>war</packaging>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>0.1.0-SNAPSHOT</version>
 
        <properties>
                <jetty-version>9.2.10.v20150310</jetty-version>
-               <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
-               <docker.latest.tag>${project.version}-latest</docker.latest.tag>
-               <!--maven-->
                <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
                <nexus.proxy>https://nexus.onap.org</nexus.proxy>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -83,7 +80,7 @@
 
        </dependencies>
        <build>
-               <finalName>WSSimulator</finalName>
+               <finalName>WSSimulator-${project.version}</finalName>
                <plugins>
                        <!-- ================================================== -->
                        <!-- Set the JDK compiler version. -->
@@ -99,20 +96,6 @@
                                </configuration>
                        </plugin>
 
-                       <plugin>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty-version}</version>
-                               <configuration>
-                                       <contextPath>/</contextPath>
-                                       <webApp>
-                                               <contextPath>/</contextPath>
-                                               <webInfIncludeJarPattern>.*/.*jersey-[^/]\.jar$</webInfIncludeJarPattern>
-                                       </webApp>
-                                       <war>WSSimulator.war</war>
-                               </configuration>
-                       </plugin>
-
                </plugins>
        </build>
        
@@ -123,11 +106,6 @@
                        <name>Release Repository</name>
                        <url>${nexus.proxy}/content/repositories/releases/</url>
                </repository>
-               <repository>
-                       <id>ecomp-staging</id>
-                       <name>Staging Repository</name>
-                       <url>${nexus.proxy}/content/repositories/staging/</url>
-               </repository>
                <repository>
                        <id>ecomp-snapshots</id>
                        <name>Snapshots Repository</name>
@@ -142,14 +120,6 @@
        </repositories>
        
        <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>
                        <activation>
@@ -204,7 +174,7 @@
                                                                                <resource>
                                                                                        <directory>${project.basedir}/target</directory>
                                                                                        <includes>
-                                                                                               <include>WSSimulator.war</include>
+                                                                                               <include>WSSimulator*.war</include>
                                                                                        </includes>
                                                                                </resource>
                                                                        </resources>
@@ -236,7 +206,7 @@
                                        <plugin>
                                                <groupId>io.fabric8</groupId>
                                                <artifactId>docker-maven-plugin</artifactId>
-                                               <version>0.23.0</version>
+                                               <version>0.24.0</version>
 
                                                <configuration>
                                                        <verbose>true</verbose>
@@ -256,11 +226,10 @@
                                                                        <alias>sdc-simulator</alias>
                                                                        <build>
                                                                                <cleanup>try</cleanup>
-                                                                               <dockerFileDir>${basedir}\sdc-simulator</dockerFileDir>
+                                                                               <dockerFileDir>${basedir}/sdc-simulator</dockerFileDir>
                                                                                <tags>
                                                                                        <tag>${docker.tag}</tag>
                                                                                        <tag>${docker.latest.tag}</tag>
-                                                                                       <tag>1.1-STAGING-latest</tag>
                                                                                </tags>
                                                                        </build>
                                                                </image>
@@ -273,12 +242,7 @@
                                                                <goals>
                                                                        <goal>remove</goal>
                                                                </goals>
-                                                               <configuration>
-                                                               <removeAll>true</removeAll>
-                                                               <image>openecomp/sdc-simulator</image>
-                                                               </configuration>
                                                        </execution>
-
                                                        <execution>
                                                                <id>generate-images</id>
                                                                <phase>install</phase>
@@ -286,17 +250,12 @@
                                                                        <goal>build</goal>
                                                                </goals>
                                                        </execution>
-
                                                        <execution>
                                 <id>push-images</id>
                                 <phase>deploy</phase>
                                 <goals>
-                                                                       <goal>build</goal>
                                                                        <goal>push</goal>
                                 </goals>
-                                <configuration>
-                                <image>openecomp/sdc-simulator</image>
-                                </configuration>
                                                        </execution>
                                                </executions>
                                        </plugin>