X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=champ-service%2Fpom.xml;h=53116923e8048c90db830108737effe3394f9487;hb=HEAD;hp=6ca7d004a13431af287945a523c4b8dd1d07f0e2;hpb=f20d0f04997dd07a94cab89dabec36b76f970e37;p=aai%2Fchamp.git
diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 6ca7d00..f2b8463 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -24,67 +24,130 @@ limitations under the License.
4.0.0
- com.att.ajsc
- ajsc-archetype-parent
- 2.0.0
+ org.onap.aai
+ champ
+ 1.6.0-SNAPSHOT
- org.onap.aai
+ org.onap.aai.champ
champ-service
- 1.2.0-SNAPSHOT
- ${basedir}/target/swm/package/nix/dist_files${distFilesRoot}
- 2.0.0
+ https://nexus.onap.org
+ org.onap.aai.logging-service
+ 1.2.2
- /appl/${project.artifactId}
+ 3.7
+ 1.3
+ 1.5.21.RELEASE
+
+ 0.16
-
- /appl/${project.artifactId}/${project.version}
+
+ champ
+ 0.28.0
+ 1.0.0
+ ${project.build.directory}/${project.artifactId}-build/
+
+ onap
+ alpine
+ 1.6.0
+
+ yyyyMMdd'T'HHmmss'Z'
+
- org.onap.aai.logging-service
- 1.2.0
- 4.5.2
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${version.org.springframework.boot.spring-boot-dependencies}
+ pom
+ import
+
- ${basedir}/target
- https://nexus.onap.org
-
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.3
+
+
+
+ org.apache.httpcomponents
+ httpclient-cache
+ 4.5.3
+
+
+
- com.sun.jersey
- jersey-core
- 1.18.6
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+ ch.qos.logback
+ logback-classic
+
+
- dom4j
- dom4j
- 1.6.1
- provided
+ org.springframework.boot
+ spring-boot-starter-jetty
- com.att.aft
- dme2
- 3.1.200
- provided
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.powermock
+ powermock-module-junit4
+ 1.7.4
+ test
+
+
+ org.javassist
+ javassist
+
+
+
+
+ org.powermock
+ powermock-api-mockito
+ 1.7.4
+ test
+
- org.json
- json
- 20160212
+ org.javassist
+ javassist
+ 3.22.0-GA
- org.glassfish.jersey.core
- jersey-client
- 2.23
+ org.springframework.boot
+ spring-boot-starter-jersey
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+
+
+
+ org.json
+ json
+ 20160212
@@ -100,15 +163,28 @@ limitations under the License.
- ${common.logging.groupid}
- common-logging
- ${common.logging.version}
+ com.google.guava
+ guava
- ch.qos.logback
- logback-core
- 1.1.7
+ ${common.logging.groupid}
+ common-logging
+ ${common.logging.version}
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
+ org.slf4j
+ slf4j-api
+
+
@@ -118,23 +194,66 @@ limitations under the License.
- org.apache.httpcomponents
- httpclient
- ${org.apache.httpcomponents.httpclient.version}
+ org.apache.commons
+ commons-lang3
+ 3.7
- org.onap.aai
+ org.onap.aai.champ.champ-lib
champ-core
- 1.2.0-SNAPSHOT
+ ${project.version}
compile
org.apache.hbase
hbase-client
+
+ log4j
+ log4j
+
+
+ log4j
+ apache-log4j-extras
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+ org.hamcrest
+ hamcrest-library
+ test
+
+
+
+ org.skyscreamer
+ jsonassert
+ 1.5.0
+ test
+
+
+
+ ch.qos.logback
+ logback-classic
+ 1.2.3
+
+
+
+ ch.qos.logback
+ logback-core
+ 1.2.3
+
+
+
+ org.onap.dmaap.messagerouter.dmaapclient
+ dmaapClient
+ 1.1.5
+
@@ -154,49 +273,38 @@ limitations under the License.
${project.artifactId}
- org.apache.maven.plugins
- maven-resources-plugin
- 2.7
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ ZIP
+
- copy-docker-file
- package
- copy-resources
+ repackage
-
- target
- true
-
-
- ${basedir}/src/main/docker
- true
-
- **/*
-
-
-
- ${basedir}/src/main/bin/
-
-
- ../champ-service-deps-janus/target/
-
-
- ../champ-service-deps-titan/target/
-
-
-
+
- org.apache.maven.plugins
- maven-deploy-plugin
+ maven-assembly-plugin
- true
+
+ src/main/assembly/descriptor.xml
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
-
+ check
process-sources
- -->
- com.spotify
- docker-maven-plugin
- 0.4.11
-
- true
- docker-hub
- ${docker.push.registry}/onap/${project.artifactId}
- ${docker.location}
-
- latest
-
- true
-
+ org.apache.maven.plugins
+ maven-deploy-plugin
- org.jacoco
- jacoco-maven-plugin
- 0.7.9
-
-
- default-prepare-agent
-
- prepare-agent
-
-
-
- default-report
- prepare-package
-
- report
-
-
-
- default-check
-
- check
-
-
-
-
-
- BUNDLE
-
-
-
- INSTRUCTION
- COVEREDRATIO
- .15
-
-
- BRANCH
- COVEREDRATIO
- .12
-
-
- COMPLEXITY
- COVEREDRATIO
- .15
-
-
- LINE
- COVEREDRATIO
- .10
-
-
- METHOD
- COVEREDRATIO
- .17
-
-
- CLASS
- MISSEDCOUNT
- 5
-
-
-
-
-
-
-
+ org.apache.maven.plugins
+ maven-site-plugin
- runAjsc
+ docker
- initialize
org.codehaus.mojo
- exec-maven-plugin
- 1.3.2
+ build-helper-maven-plugin
+ 3.0.0
- initialize
+ pre-clean
+ parse-version
- java
+ parse-version
+
+
+
+
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+ 1.0
+
+
+ pre-clean
+
+ execute
- false
- true
- java
- com.att.ajsc.runner.Runner
-
- com.att.ajsc
- ajsc-runner
-
-
- ${basedir}/ajsc-shared-config/etc
-
-
-
- ${runAjscHome}
-
-
-
-
-
- AJSC_HOME
- ${runAjscHome}
-
-
- CONFIG_HOME
- ${basedir}/appconfig-local/
-
-
- AJSC_CONF_HOME
- ${basedir}/bundleconfig-local
-
-
- logback.configurationFile
- ${basedir}/ajsc-shared-config/etc/logback.xml
-
-
- AJSC_SHARED_CONFIG
- ${basedir}/ajsc-shared-config
-
-
-
- AJSC_EXTERNAL_LIB_FOLDERS
- ${basedir}/target/commonLibs
-
-
- AJSC_EXTERNAL_PROPERTIES_FOLDERS
- ${basedir}/ajsc-shared-config/etc
-
-
-
- AJSC_SERVICE_NAMESPACE
- ${module.ajsc.namespace.name}
-
-
- AJSC_SERVICE_VERSION
- ${module.ajsc.namespace.version}
-
-
- SOACLOUD_SERVICE_VERSION
- ${project.version}
-
-
- server.port
- ${serverPort}
-
-
-
-
-
- context=/
- port=${serverPort}
- sslport=${sslport}
-
+
+ def userAaiBaseImage = session.userProperties['aai.base.image']
+ def userAaiCommonVersion = session.userProperties['aai.base.image.version']
+ if (userAaiCommonVersion != null) {
+ project.properties['aai.base.image.version'] = userAaiCommonVersion
+ }
+ if (userAaiBaseImage != null) {
+ project.properties['aai.base.image'] = userAaiBaseImage
+ }
+ log.info 'Base image flavour: ' + project.properties['aai.base.image']
+ log.info 'Base image version: ' + project.properties['aai.base.image.version']
+
+
+
+ io.fabric8
+ docker-maven-plugin
+ ${docker.fabric.version}
- java
+ true
+ 1.23
+
+
+ ${docker.push.registry}/${aai.docker.namespace}/${docker.image.name}:%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}
+
+
+
+
+
+
+
-
-
- com.att.ajsc
- ajsc-runner
- ${ajscRuntimeVersion}
-
-
+
+
+ clean-images
+ pre-clean
+
+ remove
+
+
+ true
+
+
+
+ generate-images
+ package
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+