Add staging version.

Change-Id: I0e600737789de31e4d7743cad2577f6a757a0ca3
Issue-ID: AAI-432
Signed-off-by: lizi <li.zi30@zte.com.cn>

diff --git a/esr-mgr/dependency-reduced-pom.xml b/esr-mgr/dependency-reduced-pom.xml
index 4407846..481d79b 100644 (file)
--- a/esr-mgr/dependency-reduced-pom.xml
+++ b/esr-mgr/dependency-reduced-pom.xml
@@ -100,6 +100,67 @@
       </plugin>\r
     </plugins>\r
   </build>\r
+  <profiles>\r
+    <profile>\r
+      <id>swagger</id>\r
+      <build>\r
+        <plugins>\r
+          <plugin>\r
+            <groupId>com.github.kongchen</groupId>\r
+            <artifactId>swagger-maven-plugin</artifactId>\r
+            <version>3.1.1</version>\r
+            <executions>\r
+              <execution>\r
+                <phase>compile</phase>\r
+                <goals>\r
+                  <goal>generate</goal>\r
+                </goals>\r
+              </execution>\r
+            </executions>\r
+            <dependencies>\r
+              <dependency>\r
+                <groupId>io.swagger</groupId>\r
+                <artifactId>swagger-hibernate-validations</artifactId>\r
+                <version>1.5.6</version>\r
+              </dependency>\r
+            </dependencies>\r
+            <configuration>\r
+              <apiSources>\r
+                <apiSource>\r
+                  <springmvc>false</springmvc>\r
+                  <locations>org.onap.aai.esr.resource</locations>\r
+                  <basePath>/api/aai-esr-server/v1/</basePath>\r
+                  <info>\r
+                    <title>API Descriptions for External System Management</title>\r
+                    <version>v1</version>\r
+                    <description>This page shows all the APIs available in the ESR server module.</description>\r
+                    <termsOfService>http://www.github.com/kongchen/swagger-maven-plugin</termsOfService>\r
+                    <contact>\r
+                      <email>li.zi30@zte.com.cn</email>\r
+                      <name>Zi Li</name>\r
+                    </contact>\r
+                    <license>\r
+                      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>\r
+                      <name>Apache 2.0</name>\r
+                    </license>\r
+                  </info>\r
+                  <securityDefinitions />\r
+                  <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>\r
+                </apiSource>\r
+              </apiSources>\r
+            </configuration>\r
+          </plugin>\r
+        </plugins>\r
+      </build>\r
+      <dependencies>\r
+        <dependency>\r
+          <groupId>io.swagger</groupId>\r
+          <artifactId>swagger-jersey2-jaxrs</artifactId>\r
+          <version>1.5.0</version>\r
+        </dependency>\r
+      </dependencies>\r
+    </profile>\r
+  </profiles>\r
   <dependencies>\r
     <dependency>\r
       <groupId>junit</groupId>\r

diff --git a/standalone/pom.xml b/standalone/pom.xml
index f9d5e58..2736e71 100644 (file)
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -35,12 +35,8 @@
         <linux64outputdir>target/assembly/${linux64id}</linux64outputdir>
         <win64outputdir>target/assembly/${win64id}</win64outputdir>
         <version.output>target/version</version.output>
-        <docker.image.name>onap/aai/esr-server</docker.image.name>
-        <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
-        <docker.push.registry></docker.push.registry>
-        <skip.docker.build>true</skip.docker.build>
-        <skip.docker.tag>true</skip.docker.tag>
-        <skip.docker.push>true</skip.docker.push>
+               <aai.esr.server.project.version>${project.version}</aai.esr.server.project.version>
+               <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
        </properties>
     <build>
         <plugins>
@@ -190,11 +186,37 @@
                         </configuration>
                     </execution>
                 </executions>
+            </plugin>
+                       <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                println project.properties['aai.esr.server.project.version'];
+                                def versionArray;
+                                if ( project.properties['aai.esr.server.project.version'] != null ) {
+                                    versionArray = project.properties['aai.esr.server.project.version'].split('-');
+                                }
+
+                                project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+
+                                println 'New Tag for docker:' +
+                                project.properties['project.docker.latesttag.version'];
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
        
-       <!--<profiles>
+       <profiles>
         <profile>
             <id>docker</id>
             <build>
@@ -213,7 +235,9 @@
                                         <dockerFileDir>${basedir}/target/version/</dockerFileDir>
                                         <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${project.version}-STAGING-latest</tag>
+                                            <tag>${project.version}</tag>
+                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.docker.latesttag.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -241,86 +265,8 @@
                 </plugins>
             </build>
         </profile>
-    </profiles> -->
-       <profiles>
-        <profile>
-            <id>docker</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.4.11</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <imageName>onap/aai/esr-server</imageName>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/version/</dockerFileDir>
-                                        <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                                       <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>tag-image-timestamped-version</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>tag</goal>
-                        </goals>
-                        <configuration>
-                            <image>${docker.image.name}</image>
-                            <newName>${docker.push.registry}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName>
-                            <pushImage>${skip.docker.push}</pushImage>
-                            <skipDockerTag>${skip.docker.tag}</skipDockerTag>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>tag-image-project-version</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>tag</goal>
-                        </goals>
-                        <configuration>
-                            <image>${docker.image.name}</image>
-                            <newName>${docker.push.registry}/${docker.image.name}:${project.version}</newName>
-                            <pushImage>${skip.docker.push}</pushImage>
-                            <skipDockerTag>${skip.docker.tag}</skipDockerTag>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>tag-image-latest-version</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>tag</goal>
-                        </goals>
-                        <configuration>
-                            <image>${docker.image.name}</image>
-                            <newName>${docker.push.registry}/${docker.image.name}:latest</newName>
-                            <pushImage>${skip.docker.push}</pushImage>
-                            <skipDockerTag>${skip.docker.tag}</skipDockerTag>
-                        </configuration>
-                    </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-       
+    </profiles> 
+
     <dependencies>
         <dependency>
             <groupId>org.onap.aai.esr-server</groupId>

diff --git a/standalone/src/main/assembly/conf/extsys.yml b/standalone/src/main/assembly/conf/extsys.yml
index dc67e25..af28302 100644 (file)
--- a/standalone/src/main/assembly/conf/extsys.yml
+++ b/standalone/src/main/assembly/conf/extsys.yml
@@ -18,7 +18,7 @@ template: Hello, %s!
 
 #defaultName: ${DW_DEFAULT_NAME:-Stranger}
 # the micro service ip
-serviceIp: 
+serviceIp: 127.0.0.1
 msbDiscoveryIp: 10.74.148.80
 msbDiscoveryPort: 10081
 msbServerAddr: http://10.74.148.80:80