X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fmodel-loader.git;a=blobdiff_plain;f=pom.xml;h=8dc1cd1e308968340fbfd9ce9ae1e36d01680016;hp=eec459a23fdb3bd69abfca8fedfdd14280e77546;hb=86359a2f445a19a19d8239f2e7e07480a1bc7ba3;hpb=ddecfbc623951cf72b818ca93da91648a4ffae7a
diff --git a/pom.xml b/pom.xml
index eec459a..8dc1cd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,14 @@
org.onap.oparent
oparent
- 1.1.0
+ 2.0.0
org.onap.aai.model-loader
model-loader
- 1.2.0-SNAPSHOT
+ aai-model-loader
+ 1.5.0-SNAPSHOT
@@ -50,31 +51,164 @@
org.onap.aai.modelloader.service.ModelLoaderApplication
https://nexus.onap.org
${basedir}/target
- 1.5.12.RELEASE
+ 2.1.6.RELEASE
1.1
+ 1.18
1.3
- 1.2.0
+ 1.3.1
1.2.1
+ 1.3.0
1.2.3
+
+ 0.28.0
+ 1.0.0
+ ${project.build.directory}/${project.artifactId}-${project.version}-build/
+ onap
+ alpine
+ 1.6.0
+
+ yyyyMMdd'T'HHmmss'Z'
-
-
- ecomp-releases
- ECOMP Release Repository
- ${nexusproxy}/content/repositories/releases/
-
-
- ecomp-snapshots
- ECOMP Snapshot Repository
- ${nexusproxy}/content/repositories/snapshots/
-
-
+
+
+ ecomp-releases
+ ECOMP Release Repository
+ ${nexusproxy}/content/repositories/releases/
+
+
+ ecomp-snapshots
+ ECOMP Snapshot Repository
+ ${nexusproxy}/content/repositories/snapshots/
+
+
+
+
+
+
+ docker
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.0.0
+
+
+ pre-clean
+ parse-version
+
+ parse-version
+
+
+
+
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+ 1.0
+
+
+ pre-clean
+
+ execute
+
+
+
+
+
+
+
+
+ io.fabric8
+ docker-maven-plugin
+ ${docker.fabric.version}
+
+ true
+ 1.23
+
+
+ ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l
+
+ @
+
+ latest
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}
+
+ try
+ ${project.basedir}/src/main/docker
+
+
+
+
+ ${aai.build.directory}
+ /${project.artifactId}
+
+
+
+
+
+
+
+
+
+
+ clean-images
+ pre-clean
+
+ remove
+
+
+ true
+
+
+
+ generate-images
+ package
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-jetty
+
org.springframework.boot
spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
org.onap.aai
@@ -104,28 +238,6 @@
-
- junit
- junit
- test
-
-
- org.hamcrest
- hamcrest-all
- ${hamcrest-all.version}
- test
-
-
- org.mockito
- mockito-core
- test
-
-
- org.eclipse.persistence
- org.eclipse.persistence.moxy
- 2.6.2
- compile
-
com.mikesamuel
@@ -137,22 +249,22 @@
org.onap.aai.logging-service
common-logging
- 1.2.2
+ 1.5.0
ch.qos.logback
logback-classic
- ${logback.version}
+ ${logback.version}
ch.qos.logback
logback-core
- ${logback.version}
+ ${logback.version}
org.onap.sdc.sdc-distribution-client
sdc-distribution-client
- 1.3.0
+ ${sdc-distribution-client.version}
org.json
@@ -163,15 +275,16 @@
org.eclipse.jetty
jetty-security
-
- org.springframework
- spring-webmvc
-
jline
jline
2.12.1
+
+ org.apache.commons
+ commons-compress
+ ${commons-compress.version}
+
commons-io
commons-io
@@ -182,46 +295,68 @@
commons-text
${apache.commons-text.version}
+
+
+
+ junit
+ junit
+ test
+
+
+ org.hamcrest
+ hamcrest-all
+ ${hamcrest-all.version}
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
-
-
-
- central
- http://repo1.maven.org/maven2
-
-
- EvoSuite
- EvoSuite Repository
- http://www.evosuite.org/m2
-
-
+
+
+
+ central
+ http://repo1.maven.org/maven2
+
+
+ EvoSuite
+ EvoSuite Repository
+ http://www.evosuite.org/m2
+
+
-
-
- central
- Maven 2 repository 2
- http://repo2.maven.org/maven2/
-
-
- ecomp-releases
- ECOMP Release Repository
- ${nexusproxy}/content/repositories/releases/
-
-
- ecomp-snapshots
- ECOMP Snapshot Repository
- ${nexusproxy}/content/repositories/snapshots/
-
-
- ecomp-staging
- ECOMP Staging Repository
- ${nexusproxy}/content/repositories/staging/
-
-
+
+
+ central
+ Maven 2 repository 2
+ http://repo2.maven.org/maven2/
+
+
+ ecomp-releases
+ ECOMP Release Repository
+ ${nexusproxy}/content/repositories/releases/
+
+
+ ecomp-snapshots
+ ECOMP Snapshot Repository
+ ${nexusproxy}/content/repositories/snapshots/
+
+
+ ecomp-staging
+ ECOMP Staging Repository
+ ${nexusproxy}/content/repositories/staging/
+
+
- model-loader
org.springframework.boot
@@ -239,80 +374,52 @@
- org.apache.maven.plugins
- maven-resources-plugin
- 2.7
+ com.mycila
+ license-maven-plugin
+ 3.0
+
+
+
+ src/main/java/**
+ src/test/java/**
+ version/properties
+ pom.xml
+
+ true
+
- copy-docker-file
- package
- copy-resources
+
+ check
-
- target
- true
-
-
- ${basedir}/src/main/docker
- true
-
- **/*
-
-
-
- ${basedir}/src/main/bin/
-
-
-
+ process-sources
-
- com.mycila
- license-maven-plugin
- 3.0
-
-
-
- src/main/java/**
- src/test/java/**
- version/properties
- pom.xml
-
- true
-
-
-
-
-
- check
-
- process-sources
-
-
-
- com.spotify
- docker-maven-plugin
- 0.4.11
+ org.apache.maven.plugins
+ maven-deploy-plugin
- true
- docker-hub
- ${docker.push.registry}/onap/${project.artifactId}
- ${docker.location}
-
- latest
-
- true
+ true
- org.apache.maven.plugins
- maven-deploy-plugin
+ maven-assembly-plugin
- true
+
+ src/main/assembly/descriptor.xml
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+