X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fpom.xml;h=5e674fa2667284f20859472a4284781cf669c60d;hb=0dea71245049f2e318ed7035b8d19559f3435fd7;hp=66e9dc01739311cc42710f8ba87695b11da71923;hpb=e6a4b30df9c1e712feacdacb04b205c9efd773bc;p=sdc.git
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 66e9dc0173..5e674fa266 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -9,7 +9,7 @@
org.openecomp.sdc
sdc-main
- 1.7.0-SNAPSHOT
+ 1.7.2-SNAPSHOT
@@ -21,19 +21,40 @@
+
+ org.openecomp.sdc
+ togglz-rest-services
+ ${project.version}
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ ${jackson.version}
+
com.fasterxml.jackson.dataformat
jackson-dataformat-yaml
${jackson.version}
- compile
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
com.fasterxml.jackson.core
jackson-databind
${jackson.version}
- compile
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
@@ -48,6 +69,12 @@
io.swagger.core.v3
swagger-jaxrs2
${swagger.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
io.swagger.core.v3
@@ -60,7 +87,18 @@
org.openecomp.sdc
common-app-api
${project.version}
- compile
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${ws.rs.version}
@@ -80,14 +118,24 @@
org.openecomp.sdc.be
catalog-dao
${project.version}
- compile
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
org.openecomp.sdc.be
catalog-model
${project.version}
- compile
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
@@ -126,7 +174,12 @@
org.glassfish.jersey.media
jersey-media-json-jackson
${jersey-bom.version}
- compile
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
@@ -432,11 +485,6 @@
${cassandra.driver.version}
compile
-
- org.apache.thrift
- libthrift
- ${libthrift.version}
-
@@ -455,12 +503,8 @@
org.slf4j
- powermock-api-mockito
- org.powermock
-
-
- org.onap.aaf.authz
- aaf-cadi-aaf
+ org.onap.aaf.authz
+ aaf-cadi-aaf
aaf-cadi-core
@@ -504,6 +548,10 @@
com.att.aft
dme2
+
+ com.fasterxml.jackson.core
+ jackson-core
+
@@ -519,22 +567,22 @@
provided
-
+
- org.onap.aaf.authz
- aaf-cadi-aaf
- ${cadi.version}
-
+ org.onap.aaf.authz
+ aaf-cadi-aaf
+ ${cadi.version}
+
- com.datastax.cassandra
- cassandra-driver-core
+ com.datastax.cassandra
+ cassandra-driver-core
org.slf4j
slf4j-log4j12
-
-
+
+
@@ -558,28 +606,56 @@
- com.github.tomakehurst
- wiremock-standalone
+ org.eclipse.jetty
+ jetty-webapp
+ ${jetty.version}
test
- org.eclipse.jetty
- jetty-webapp
- ${jetty.version}
+ org.hamcrest
+ hamcrest
+ ${hamcrest.version}
+ test
+
+
+
+ org.hamcrest
+ hamcrest-library
+ ${hamcrest.version}
test
- junit
- junit
- ${junit.version}
+ org.junit.jupiter
+ junit-jupiter-api
+ ${junitJupiter.version}
test
+
+ org.junit.jupiter
+ junit-jupiter
+ ${junitJupiter.version}
+ test
+
+
+
+ org.junit.platform
+ junit-platform-commons
+ ${junit.platform.version}
+ test
+
+
+ org.junit.platform
+ junit-platform-engine
+ ${junit.platform.version}
+ test
+
org.mockito
- mockito-core
+ mockito-junit-jupiter
+ ${mockitoJupiter.version}
test
@@ -599,12 +675,14 @@
io.cucumber
cucumber-java
+ ${cucumber.version}
test
io.cucumber
cucumber-junit
+ ${cucumber.version}
test
@@ -622,13 +700,6 @@
test
-
- org.hamcrest
- java-hamcrest
- ${java-hamcrest.version}
- test
-
-
org.codehaus.groovy
groovy
@@ -643,27 +714,46 @@
org.onap.sdc.common
onap-tosca-datatype
${project.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
org.apache.commons
commons-collections4
${commons.collections.version}
-
- org.codehaus.jackson
- jackson-mapper-asl
- ${jackson.mapper.version}
-
org.onap.sdc.sdc-be-common
security-util-lib
${security.util.lib.version}
+
+ org.openecomp.sdc.core
+ openecomp-tosca-lib
+ ${project.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+
- ${project.artifactId}-${project.version}
+ catalog-be
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ 1
+
+
maven-dependency-plugin
@@ -701,7 +791,9 @@
- ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html
+
+ ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html
+
https://petstore.swagger.io/v2/swagger.json
@@ -730,7 +822,9 @@
true
- ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}
+
+ ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}
+
**/*.*
@@ -767,6 +861,7 @@
+ ${skipYamlJsonValidator}
@@ -775,6 +870,18 @@
com.jcabi
jcabi-maven-plugin
${jcabi.maven.plugin.version}
+
+
+ org.aspectj
+ aspectjtools
+ 1.9.2
+
+
+ org.aspectj
+ aspectjweaver
+ 1.9.2
+
+
@@ -815,31 +922,8 @@
-
-
- ${project.parent.basedir}/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default
-
- false
-
- Artifact-Generator.properties
- error-configuration.yaml
- ecomp-error-configuration.yaml
- logback.xml
-
-
-
-
- ${project.parent.basedir}/catalog-be/sdc-backend
- false
-
- *.war
- context.xml
-
-
-
-
- ${project.basedir}/sdc-backend-init/chef-repo/cookbooks/sdc-normatives/files/default
+ sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
false
@@ -849,70 +933,6 @@
-
- clean-static-files
- clean
-
- clean
-
-
-
-
-
- ${project.parent.basedir}/asdctool/tosca
- false
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
-
-
- copy-static-configuration-files
- verify
-
- copy-resources
-
-
-
- ${project.parent.basedir}/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default
-
-
-
- ${project.parent.basedir}/catalog-be/src/main/resources/config
-
-
- Artifact-Generator.properties
- error-configuration.yaml
- ecomp-error-configuration.yaml
- logback.xml
-
-
-
-
-
-
- copy-tosca-folder
-
- install
-
- copy-resources
-
-
- ${project.parent.basedir}/asdctool/tosca
-
-
- ${project.parent.basedir}/catalog-be/src/main/resources/import/tosca
-
- true
-
-
-
-
@@ -937,9 +957,6 @@
wget
-
-
-
@@ -966,14 +983,6 @@
-
- docker-staging
-
- ${project.version}-STAGING-${maven.build.timestamp}
- ${project.version}-STAGING-latest
-
-
-
docker
@@ -981,76 +990,47 @@
-
- maven-antrun-plugin
- 1.8
-
-
- copy-context-file
- validate
-
-
-
-
-
-
- run
-
-
-
- set-version-in-context-file
- generate-resources
-
-
-
- projectversion
- ${project.version}
-
-
-
-
- run
-
-
-
-
org.apache.maven.plugins
maven-resources-plugin
- copy-resources-be
- verify
+ copy-normatives
+ package
copy-resources
- ${basedir}/sdc-backend
+
+ sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
+
${project.parent.basedir}/catalog-be/target
- catalog-be-${project.version}.war
+ normatives.tar.gz
- copy-normatives
- package
+ copy-sdc-be-py
+ verify
copy-resources
- sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
+ sdc-backend-init/
- ${project.parent.basedir}/catalog-be/target
+ ${project.parent.basedir}/catalog-be/src/main/resources/
+
- normatives.tar.gz
+ scripts/sdcBePy/**
+ scripts/setup.py
@@ -1062,7 +1042,7 @@
io.fabric8
docker-maven-plugin
- 1.23
+ ${docker.api.version}
nexus3.onap.org:10001
@@ -1078,13 +1058,18 @@
sdc-backend
try
- ${project.basedir}/sdc-backend
+ backend
- ${docker.tag}
+ latest
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+
+ backend/backend-files.xml
+ onap-sdc-backend
+
@@ -1095,10 +1080,11 @@
try
${project.basedir}/sdc-backend-init
- ${docker.tag}
+ latest
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}