From: lizi00164331
Date: Tue, 5 Sep 2017 01:46:07 +0000 (+0800)
Subject: clean the esr-server parent pom.
X-Git-Tag: v1.0.0~90
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=commitdiff_plain;h=afc480b86ce89a10c744d81a99977ce59d2c0cf6
clean the esr-server parent pom.
The esr-server parent pom defined too complicate.
Change-Id: Ie85086ada8d064c19dc2e26c5c0730e446507a3f
Issue-ID: AAI-262
Signed-off-by: lizi00164331
---
diff --git a/esr-parent/esrparent-lite/pom.xml b/esr-parent/esrparent-lite/pom.xml
deleted file mode 100644
index 657abc2..0000000
--- a/esr-parent/esrparent-lite/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
- org.onap.oparent
- oparent
- 1.0.0-SNAPSHOT
-
-
- 4.0.0
- org.onap.aai.esr-server
- esrparent-lite
- 1.0.0-SNAPSHOT
- esr-server/esr-parent/esrparent-lite
- pom
-
-
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
- true
- true
- 1.7
-
- 1.7
- UTF-8
- true
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.6
-
-
- false
-
- true
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 2.4
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.10
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.7
-
- UTF-8
-
- pdf
- swf
- exe
- png
- gif
- jpg
- jpeg
- bmp
- eot
- ttf
- svg
- woff
- woff2
- mso
- wmz
- emz
- otf
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.10
-
-
- com.mycila
- license-maven-plugin
- 3.0.rc1
-
-
- maven-antrun-plugin
- 1.8
-
-
-
-
-
diff --git a/esr-parent/esrparent/pom.xml b/esr-parent/esrparent/pom.xml
deleted file mode 100644
index c60b0d0..0000000
--- a/esr-parent/esrparent/pom.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
- org.onap.aai.esr-server
- esrparent-lite
- 1.0.0-SNAPSHOT
- ../esrparent-lite
-
-
- 4.0.0
- esrparent
- esr-server/esr-parent/esrparent
- pom
-
-
- 0.8.0
- 1.5.3
- 2.16
- 5.0
- 2.2.4
- 4.10
- 1.4.10
- 1.8.2
-
-
-
-
-
- io.dropwizard
- dropwizard-core
- ${dropwizard.version}
-
-
- io.dropwizard
- dropwizard-assets
- ${dropwizard.version}
-
-
- io.dropwizard
- dropwizard-hibernate
- ${dropwizard.version}
-
-
- io.swagger
- swagger-jersey2-jaxrs
- ${swagger.version}
-
-
-
-
- org.glassfish.jersey.core
- jersey-server
- ${jersey.version}
-
-
- org.glassfish.jersey.media
- jersey-media-multipart
- ${jersey.version}
-
-
- org.glassfish.jersey.containers
- jersey-container-servlet-core
- ${jersey.version}
-
-
-
- com.eclipsesource.jaxrs
- consumer
- ${jaxrs.consumer.version}
-
-
-
- com.google.code.gson
- gson
- ${gson.version}
-
-
-
- junit
- junit
- ${junit.version}
-
-
- org.powermock
- powermock-module-junit4
- ${org.powermock.version}
-
-
- org.powermock
- powermock-api-mockito
- ${org.powermock.version}
-
-
- org.apache.ant
- ant
- ${org.apache.ant.version}
-
-
-
-
-
diff --git a/esr-parent/pom.xml b/esr-parent/pom.xml
index a1a2f91..40edc02 100644
--- a/esr-parent/pom.xml
+++ b/esr-parent/pom.xml
@@ -18,20 +18,189 @@
-->
- org.onap.aai.esr-server
- esrparent-lite
+ org.onap.oparent
+ oparent
1.0.0-SNAPSHOT
- esrparent-lite
-
+
4.0.0
org.onap.aai.esr-server
esrparent-aggregator
esr-server/esr-parent
pom
-
- esrparent
- esrparent-lite
-
+
+ 0.8.0
+ 1.5.3
+ 2.16
+ 5.0
+ 2.2.4
+ 4.10
+ 1.4.10
+ 1.8.2
+
+
+
+
+
+ io.dropwizard
+ dropwizard-core
+ ${dropwizard.version}
+
+
+ io.dropwizard
+ dropwizard-assets
+ ${dropwizard.version}
+
+
+ io.dropwizard
+ dropwizard-hibernate
+ ${dropwizard.version}
+
+
+ io.swagger
+ swagger-jersey2-jaxrs
+ ${swagger.version}
+
+
+
+
+ org.glassfish.jersey.core
+ jersey-server
+ ${jersey.version}
+
+
+ org.glassfish.jersey.media
+ jersey-media-multipart
+ ${jersey.version}
+
+
+ org.glassfish.jersey.containers
+ jersey-container-servlet-core
+ ${jersey.version}
+
+
+
+ com.eclipsesource.jaxrs
+ consumer
+ ${jaxrs.consumer.version}
+
+
+
+ com.google.code.gson
+ gson
+ ${gson.version}
+
+
+
+ junit
+ junit
+ ${junit.version}
+
+
+ org.powermock
+ powermock-module-junit4
+ ${org.powermock.version}
+
+
+ org.powermock
+ powermock-api-mockito
+ ${org.powermock.version}
+
+
+ org.apache.ant
+ ant
+ ${org.apache.ant.version}
+
+
+
+
+
+
+
+
+
+ org.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.3
+
+ true
+ true
+ 1.7
+
+ 1.7
+ UTF-8
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 2.6
+
+
+ false
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 2.4
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.10
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.7
+
+ UTF-8
+
+ pdf
+ swf
+ exe
+ png
+ gif
+ jpg
+ jpeg
+ bmp
+ eot
+ ttf
+ svg
+ woff
+ woff2
+ mso
+ wmz
+ emz
+ otf
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 1.10
+
+
+ com.mycila
+ license-maven-plugin
+ 3.0.rc1
+
+
+ maven-antrun-plugin
+ 1.8
+
+
+
+
diff --git a/version.properties b/version.properties
index e2595ba..cdcd1e9 100644
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=1
+minor=0
patch=0
base_version=${major}.${minor}.${patch}