From: lizi
Date: Fri, 13 Oct 2017 04:52:13 +0000 (+0800)
Subject: Add staging version.
X-Git-Tag: v1.0.0~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cb12c129a25a3aac6a3896f3c0c8f6d34df7c082;hp=17767843a7874a4d2748ad1c097369432b5524c2;p=aai%2Fesr-server.git
Add staging version.
Change-Id: I0e600737789de31e4d7743cad2577f6a757a0ca3
Issue-ID: AAI-432
Signed-off-by: lizi
---
diff --git a/esr-mgr/dependency-reduced-pom.xml b/esr-mgr/dependency-reduced-pom.xml
index 4407846..481d79b 100644
--- a/esr-mgr/dependency-reduced-pom.xml
+++ b/esr-mgr/dependency-reduced-pom.xml
@@ -100,6 +100,67 @@
+
+
+ swagger
+
+
+
+ com.github.kongchen
+ swagger-maven-plugin
+ 3.1.1
+
+
+ compile
+
+ generate
+
+
+
+
+
+ io.swagger
+ swagger-hibernate-validations
+ 1.5.6
+
+
+
+
+
+ false
+ org.onap.aai.esr.resource
+ /api/aai-esr-server/v1/
+
+ API Descriptions for External System Management
+ v1
+ This page shows all the APIs available in the ESR server module.
+ http://www.github.com/kongchen/swagger-maven-plugin
+
+ li.zi30@zte.com.cn
+ Zi Li
+
+
+ http://www.apache.org/licenses/LICENSE-2.0.html
+ Apache 2.0
+
+
+
+ ${basedir}/src/main/resources
+
+
+
+
+
+
+
+
+ io.swagger
+ swagger-jersey2-jaxrs
+ 1.5.0
+
+
+
+
junit
diff --git a/standalone/pom.xml b/standalone/pom.xml
index f9d5e58..2736e71 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -35,12 +35,8 @@
target/assembly/${linux64id}
target/assembly/${win64id}
target/version
- onap/aai/esr-server
- yyyyMMdd-HHmm
-
- true
- true
- true
+ ${project.version}
+ yyMMdd-HHmmss
@@ -190,11 +186,37 @@
+
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+
+
+
-
-
-
- docker
-
-
-
- com.spotify
- docker-maven-plugin
- 0.4.11
- false
-
-
-
- onap/aai/esr-server
-
- try
- ${basedir}/target/version/
- ${basedir}/target/version/Dockerfile
-
-
-
-
-
-
- build-image
- package
-
- build
-
-
- ${skip.docker.build}
-
-
-
- tag-image-timestamped-version
- deploy
-
- tag
-
-
- ${docker.image.name}
- ${docker.push.registry}/${docker.image.name}:${project.version}-${maven.build.timestamp}
- ${skip.docker.push}
- ${skip.docker.tag}
-
-
-
- tag-image-project-version
- deploy
-
- tag
-
-
- ${docker.image.name}
- ${docker.push.registry}/${docker.image.name}:${project.version}
- ${skip.docker.push}
- ${skip.docker.tag}
-
-
-
- tag-image-latest-version
- deploy
-
- tag
-
-
- ${docker.image.name}
- ${docker.push.registry}/${docker.image.name}:latest
- ${skip.docker.push}
- ${skip.docker.tag}
-
-
-
-
-
-
-
-
-
+
+
org.onap.aai.esr-server
diff --git a/standalone/src/main/assembly/conf/extsys.yml b/standalone/src/main/assembly/conf/extsys.yml
index dc67e25..af28302 100644
--- 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