Update usecase-ui project pom file

Change-Id: I20cdd8fde068c611c34d72e6ce9df567d182d00b
Issue-ID: USECASEUI-259
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/pom.xml b/pom.xml
index 3d57db5..0dc483d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
@@ -28,15 +27,18 @@
     <artifactId>usecase-ui-server-parent</artifactId>
     <version>2.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>usecase-ui-server</name>
-    <description>project for usecase-ui server</description>
+    <name>usecase-ui-server-parent</name>
+    <description>parent project for usecase-ui server</description>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
-        <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
         <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+        <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+        <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
         <publicNexusPath>content/repositories/public/</publicNexusPath>
         <siteNexusPath>content/sites/site/${project.groupId}/${project.artifactId}/${project.version}/</siteNexusPath>
     </properties>
@@ -114,16 +116,12 @@
     </modules>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>1.3.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -141,17 +139,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.19.1</version>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -165,9 +152,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.8</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/server/pom.xml b/server/pom.xml
index f6c212f..6df084e 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -15,19 +15,17 @@
     limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.usecase-ui.server</groupId>
         <artifactId>usecase-ui-server-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.usecase-ui.server</groupId>
     <artifactId>usecase-ui-server</artifactId>
     <packaging>jar</packaging>
-    <name>usecase-ui-server/server</name>
-    <description>project for usecase-ui server</description>
+    <name>usecase-ui-server</name>
+    <description>source code for usecase-ui server</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -335,6 +333,11 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>1.3.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -349,6 +352,23 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.6</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.wagon</groupId>
+                        <artifactId>wagon-webdav-jackrabbit</artifactId>
+                        <version>2.10</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -363,6 +383,11 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

diff --git a/standalone/pom.xml b/standalone/pom.xml
index b07bb65..dea7447 100644 (file)
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -15,67 +15,78 @@
     limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.usecase-ui.server</groupId>
         <artifactId>usecase-ui-server-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>standalone</artifactId>
+    <artifactId>usecase-ui-server-standalone</artifactId>
     <packaging>pom</packaging>
     <name>usecase-ui-server-standalone</name>
+    <description>distribute binary files and docker image for usecase-ui server</description>
 
     <properties>
-        <packagename>usecase-ui-server</packagename>
-        <linux64id>linux64</linux64id>
-        <win64id>win64</win64id>
-        <linux64outputdir>target/assembly/${linux64}/</linux64outputdir>
-        <win64outputdir>target/assembly/${win64id}/</win64outputdir>
-        <version.output>target/version/</version.output>
         <usecaseui.version>2.0.1</usecaseui.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <linux64outputdir>target/assembly/linux64</linux64outputdir>
+        <dockeroutput>target/version/${usecaseui.version}</dockeroutput>
     </properties>
 
     <build>
         <finalName>usecse-ui-server</finalName>
         <plugins>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId> 
-              <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>1.3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.6</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.wagon</groupId>
+                        <artifactId>wagon-webdav-jackrabbit</artifactId>
+                        <version>2.10</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId> 
+                <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-resources-${linux64id}</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/${linux64outputdir}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/assembly/</directory>
-                                    <filtering>false</filtering>
-                                    <includes>
-                                        <include>**/*</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>**/*.bat</exclude>
-                                        <exclude>Dockerfile</exclude>
-                                    </excludes>
-                                </resource>
-                            </resources>
-                            <overwrite>true</overwrite>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-resources-${win64id}</id>
+                        <id>copy-resources-linux64</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${basedir}/${win64outputdir}</outputDirectory>
+                            <outputDirectory>${linux64outputdir}</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/assembly/</directory>
@@ -84,7 +95,6 @@
                                         <include>**/*</include>
                                     </includes>
                                     <excludes>
-                                        <exclude>**/*.sh</exclude>
                                         <exclude>Dockerfile</exclude>
                                     </excludes>
                                 </resource>
@@ -99,7 +109,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${version.output}</outputDirectory>
+                            <outputDirectory>${dockeroutput}</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/assembly/</directory>
@@ -120,7 +130,7 @@
                 <version>2.8</version>
                 <executions>
                     <execution>
-                        <id>copy-jar-${linux64id}</id>
+                        <id>copy-jar-linux64</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -138,25 +148,6 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-jar-${win64id}</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.onap.usecase-ui.server</groupId>
-                                    <artifactId>usecase-ui-server</artifactId>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${win64outputdir}</outputDirectory>
-                                    <destFileName>usecase-ui-server.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -172,7 +163,7 @@
                         </goals>
                         <configuration>
                             <tasks name="${project.artifactId}">
-                                <tar destfile="${version.output}/${packagename}-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip">
+                                <tar destfile="${dockeroutput}/usecase-ui-server-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip">
                                     <tarfileset dir="${linux64outputdir}" filemode="0644" dirmode="0755">
                                         <exclude name="**/*.sh"/>
                                     </tarfileset>
@@ -180,11 +171,7 @@
                                         <include name="**/*.sh"/>
                                     </tarfileset>
                                 </tar>
-                                <!--attachartifact file="${version.output}/${packagename}-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/-->
-                                <zip destfile="${version.output}/${packagename}-${project.version}-win64.zip" update="true">
-                                    <zipfileset dir="${win64outputdir}" includes="**"/>
-                                </zip>
-                                <!--attachartifact file="${version.output}/${packagename}-${project.version}-win64.zip" classifier="win64" type="zip"/-->
+                                <!--attachartifact file="${version.output}/usecase-ui-server-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/-->
                             </tasks>
                         </configuration>
                     </execution>
@@ -203,27 +190,12 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>${version.output}/${packagename}-${project.version}-linux64.tar.gz</file>
+                                    <file>${dockeroutput}/usecase-ui-server-${project.version}-linux64.tar.gz</file>
                                     <type>tar.gz</type>
                                 </artifact>
                             </artifacts>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>attach-artifacts-win64</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${version.output}/${packagename}-${project.version}-win64.zip</file>
-                                    <type>zip</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>
@@ -245,8 +217,8 @@
                                     <name>onap/usecase-ui-server</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/${version.output}</dockerFileDir>
-                                        <dockerFile>${basedir}/${version.output}/Dockerfile</dockerFile>
+                                        <dockerFileDir>${dockeroutput}</dockerFileDir>
+                                        <dockerFile>${dockeroutput}/Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${usecaseui.version}-SNAPSHOT-latest</tag>
                                             <tag>${usecaseui.version}-STAGING-latest</tag>

diff --git a/standalone/src/main/assembly/bin/find_kill_process.bat b/standalone/src/main/assembly/bin/find_kill_process.bat
deleted file mode 100644 (file)
index d93ab46..0000000
--- a/standalone/src/main/assembly/bin/find_kill_process.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-@REM
-@REM Copyright 2016-2017 ZTE Corporation.
-@REM
-@REM Licensed under the Apache License, Version 2.0 (the "License");
-@REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at
-@REM
-@REM     http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-@REM
-
-echo %1 | findstr %2 >NUL
-echo ERRORLEVEL=%ERRORLEVEL%
-IF ERRORLEVEL 1 goto findend
-for /f "tokens=1" %%a in (%1) do (  
-    echo kill %1
-    taskkill /F /pid %%a
-)
-:findend
\ No newline at end of file

diff --git a/standalone/src/main/assembly/bin/run.bat b/standalone/src/main/assembly/bin/run.bat
deleted file mode 100644 (file)
index 1f3353c..0000000
--- a/standalone/src/main/assembly/bin/run.bat
+++ /dev/null
@@ -1,41 +0,0 @@
-@REM
-@REM Copyright 2016-2017 ZTE Corporation.
-@REM
-@REM Licensed under the Apache License, Version 2.0 (the "License");
-@REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at
-@REM
-@REM     http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-@REM
-
-@echo off
-title usecase-ui-server
-
-set RUNHOME=%~dp0
-echo ### RUNHOME: %RUNHOME%
-echo ### Starting usecase-ui-server
-set main_path=%RUNHOME%..\
-cd /d %main_path%
-set JAVA="%JAVA_HOME%\bin\java.exe"
-rem set port=9500
-set jvm_opts=-Xms50m -Xmx128m
-rem set jvm_opts=%jvm_opts% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=%port%,server=y,suspend=n
-set class_path=%main_path%;%main_path%usecase-ui-server.jar
-echo ### jvm_opts: %jvm_opts%
-echo ### class_path: %class_path%
-
-%JAVA% -classpath %class_path% %jvm_opts% -jar %main_path%usecase-ui-server.jar
-
-IF ERRORLEVEL 1 goto showerror
-exit
-:showerror
-echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check!
-echo After checking, press any key to close
-pause
-exit

diff --git a/standalone/src/main/assembly/bin/stop.bat b/standalone/src/main/assembly/bin/stop.bat
deleted file mode 100644 (file)
index b7555ea..0000000
--- a/standalone/src/main/assembly/bin/stop.bat
+++ /dev/null
@@ -1,34 +0,0 @@
-@REM
-@REM Copyright 2016-2017 ZTE Corporation.
-@REM
-@REM Licensed under the Apache License, Version 2.0 (the "License");
-@REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at
-@REM
-@REM     http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-@REM
-
-@echo off
-title stopping usecase-ui-server
-
-set HOME=%~dp0
-set Main_Class="usecase-ui-server"
-
-echo ================== esr-service info =============================================
-echo HOME=$HOME
-echo Main_Class=%Main_Class%
-echo ===============================================================================
-
-echo ### Stopping usecase-ui-server
-cd /d %HOME%
-
-for /f "delims=" %%i in ('"%JAVA_HOME%\bin\jcmd"') do (
-  call find_kill_process "%%i" %Main_Class%
-)
-exit