X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=f8ab95a2d7d4ea616841a8c4123f0374dbb12471;hb=refs%2Fchanges%2F76%2F95776%2F1;hp=01db83057ac5b5025f15af85b9c72ee0c2c12a08;hpb=7b7e4267376c14e59f762a785123b8de3d64a285;p=music.git
diff --git a/pom.xml b/pom.xml
index 01db8305..f8ab95a2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
-
-
@@ -26,31 +26,51 @@
4.0.0
org.onap.music
MUSIC
- war
- 3.0.24
+ jar
+ 3.2.35-SNAPSHOT
- This is the MUSIC REST interface, packaged as a war file.
+ This is the MUSIC REST interface, packaged as a Springboot jar file.
-
+
org.onap.oparent
oparent
- 1.2.0
+ 2.0.0
-
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ 2.1.1.RELEASE
+ pom
+ import
+
+
+
+ org.onap.music.MusicApplication
+ UTF-8
+ UTF-8
UTF-8
+ 1.8
1.19
2.25.1
2.0.1
3.6.0
- 3.4.11
UTF-8
UTF-8
https://nexus.onap.org
+ https://nexus.onap.org
/content/repositories/snapshots/
/content/repositories/releases/
/content/repositories/staging/
@@ -58,31 +78,40 @@
${maven.build.timestamp}
yyyy.MM.dd.HH.mm
+
+ false
${project.version}-${timestamp}
${project.version}-latest
+ 1.8
+ 1.8
- ecomp-releases
- ECOMP Release Repository
- ${onap.nexus.url}/${releaseNexusPath}
+ onap-releases
+ ONAP - Release Repository
+ ${nexusproxy}/${releaseNexusPath}
- ecomp-snapshots
- Snapshot Repository
+ onap-staging
+ ONAP - Staging Repository
+ ${nexusproxy}/${stagingNexusPath}
+
+
+ onap-snapshots
+ ONAP - Snapshot Repository
${nexusproxy}/${snapshotNexusPath}
- ecomp-staging
- Staging Repository
- ${nexusproxy}/${stagingNexusPath}
+ onap-public
+ ONAP public Repository
+ ${nexusproxy}/content/groups/public
- MUSIC
+ ${project.artifactId}
src/main/java
src/main/webapp/WEB-INF/classes
src/test/java
@@ -92,42 +121,59 @@
src/main/resources
true
+
+ **/*.properties
+ **/*.xml
+ **/*.ccf
+
+
+
+ ${project.basedir}/src/test/resources
+
+
+
- maven-eclipse-plugin
- 2.9
+ org.springframework.boot
+ spring-boot-maven-plugin
+ 2.1.1.RELEASE
-
- org.springframework.ide.eclipse.core.springnature
-
-
- org.springframework.ide.eclipse.core.springbuilder
-
- true
- true
+ org.onap.music.MusicApplication
+ ./distribution/music/
+ true
+ ${project.artifactId}-SB
+
+
+ install
+
+ repackage
+
+
+
+
- maven-war-plugin
- 2.4
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
- WebContent
+ ${maven.check.skip}
+
org.apache.maven.plugins
maven-jar-plugin
@@ -141,8 +187,8 @@
- **/*.xml
- **/*.properties
+
**/Sample*
@@ -155,6 +201,7 @@
2.4
+ base
install
install-file
@@ -167,14 +214,74 @@
${project.build.directory}/${project.artifactId}.jar
+
+ spring
+ install
+
+ install-file
+
+
+ jar
+ ${project.artifactId}-SB
+ ${project.groupId}
+ ${project.version}
+ ${project.basedir}/distribution/music/${project.artifactId}-SB.jar
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ org.springframework.data
+ spring-data-cassandra
+
+
+ org.springframework.boot
+ spring-boot-starter-jersey
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.springframework
+ spring-aop
+ compile
+
+
+ org.springframework.boot
+ spring-boot-autoconfigure
+
+
+ org.aspectj
+ aspectjweaver
+ compile
+
+
-
+
+ javax.servlet
+ servlet-api
+ 2.4
+ provided
+
javax.servlet
javax.servlet-api
@@ -182,12 +289,6 @@
provided
-
-
ch.qos.logback
@@ -215,28 +316,30 @@
com.att.eelf
eelf-core
1.0.1-oss
+
+
+ org.powermock
+ powermock-api-mockito
+
+
+ org.powermock
+ powermock-module-junit4
+
+
-
+
+
+ io.dropwizard.metrics
+ metrics-core
+ 4.1.0-rc3
+
com.datastax.cassandra
cassandra-driver-core
${cassandra.version}
-
-
-
-
- org.apache.zookeeper
- zookeeper
- ${zookeeper.version}
-
-
- org.slf4j
- slf4j-log4j12
-
-
-
-
+
+
com.sun.jersey
@@ -253,10 +356,10 @@
jersey-json
${jersey1.version}
-
- com.sun.jersey
- jersey-servlet
- ${jersey1.version}
+
+ com.sun.jersey
+ jersey-servlet
+ ${jersey1.version}
@@ -270,6 +373,11 @@
commons-codec
1.11
+
+ org.apache.commons
+ commons-lang3
+ 3.8
+
@@ -280,74 +388,145 @@
org.cassandraunit
- cassandra-unit
- 3.3.0.2
+ cassandra-unit-spring
+ 3.5.0.1
test
-
-
- org.apache.curator
- curator-test
- 2.3.0
-
- org.apache.zookeeper
- zookeeper
-
org.slf4j
slf4j-log4j12
+
+ ch.qos.logback
+ logback-core
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ org.cassandraunit
+ cassandra-unit
+
+
+ io.dropwizard.metrics
+ metrics-core
+
+
+ com.addthis.metrics
+ reporter-config-base
+
+
+
+ org.cassandraunit
+ cassandra-unit-shaded
+ 3.5.0.1
test
org.mockito
- mockito-all
- 1.9.0
+ mockito-core
+ 2.23.4
test
+
+
- io.netty
- netty-handler
- 4.1.30.Final
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+ 2.9.8
com.fasterxml.jackson.core
jackson-databind
- 2.9.4
+ 2.9.8
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ 2.9.8
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.9.8
org.apache.httpcomponents
httpclient
- 4.5.3
io.swagger
swagger-jersey-jaxrs
- 1.5.18
+ 1.5.22
com.google.guava
guava
- org.mindrot
- jbcrypt
- 0.4
+ de.svenkubiak
+ jBCrypt
+ 0.4.1
-
-
-
- javax.xml.bind
- jaxb-api
- 2.2.3
+
+ io.netty
+ netty-handler
+ 4.1.33.Final
+
+
+ io.netty
+ netty-buffer
+ 4.1.33.Final
+
+
+ io.netty
+ netty-codec
+ 4.1.33.Final
+
+
+ io.netty
+ netty-common
+ 4.1.33.Final
+
+
+ io.netty
+ netty-resolver
+ 4.1.33.Final
+
+
+ io.netty
+ netty-transport
+ 4.1.33.Final
+
+
+ org.onap.aaf.authz
+ aaf-cadi-aaf
+ 2.1.7
+
+
+ log4j
+ log4j
+
+
+
+
+ org.onap.aaf.authz
+ aaf-cadi-client
+ 2.1.7
+
+
+ org.onap.aaf.authz
+ aaf-cadi-core
+ 2.1.7
+
+
+ com.google.code.gson
+ gson
+ 2.8.5
-
@@ -367,6 +546,14 @@
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ 1.8
+
+
@@ -386,7 +573,7 @@
- onap/music/music
+ onap/music/music_sb
docker_music
true
@@ -394,10 +581,10 @@
${docker.tag}
${docker.latest.tag}
- ${project.basedir}
-
+ ${project.basedir}/distribution/music
+
@@ -426,15 +613,10 @@
${project.basedir}/distribution/cassandra_job
-
-
-
@@ -472,6 +654,9 @@
+
+ default
+