X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fpom.xml;h=b227e55f50ef71214e158406df56c35d76ba1621;hb=0560a3a55dd2ba8fe1af6aeed425dad09c7f7261;hp=befbad13b2342a6f3b9998e2f74562e08ba332fb;hpb=e9171113772c0c7dc3f7514ffd0660d1e0f8ef02;p=sdc.git
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index befbad13b2..b227e55f50 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -9,7 +9,7 @@
org.openecomp.sdc
sdc-main
- 1.10.0-SNAPSHOT
+ 1.13.6-SNAPSHOT
@@ -18,9 +18,11 @@
3.25.0
3.2.0
1.5.3
+ ${project.version}
+
org.openecomp.sdc
togglz-rest-services
@@ -33,7 +35,24 @@
+
+ org.jsoup
+ jsoup
+ ${jsoup.version}
+
+
+
+ com.networknt
+ json-schema-validator
+ 1.0.84
+
+
+ org.slf4j
+ slf4j-api
+
+
+
com.fasterxml.jackson.core
jackson-core
@@ -50,7 +69,6 @@
-
com.fasterxml.jackson.core
jackson-databind
@@ -80,6 +98,14 @@
com.fasterxml.jackson.core
jackson-core
+
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-json-provider
+
+
+ io.github.classgraph
+ classgraph
+
@@ -95,6 +121,34 @@
${hibernate.validator.version}
+
+ org.eclipse.jetty
+ jetty-server
+ ${jetty.version}
+ compile
+
+
+ org.eclipse.jetty
+ jetty-http
+
+
+ javax.servlet
+ javax.servlet-api
+
+
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ ${jetty.version}
+ compile
+
+
+ org.eclipse.jetty
+ jetty-security
+
+
+
org.openecomp.sdc
common-app-api
@@ -104,12 +158,20 @@
com.fasterxml.jackson.core
jackson-core
+
+ org.apache.httpcomponents
+ httpcore
+
+
+ org.functionaljava
+ functionaljava
+
- javax.ws.rs
- javax.ws.rs-api
+ jakarta.ws.rs
+ jakarta.ws.rs-api
${ws.rs.version}
@@ -127,15 +189,22 @@
org.openecomp.sdc.be
- common-be
+ common-be-tests-utils
${project.version}
- test-jar
test
org.springframework
spring-core
+
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
+
@@ -162,6 +231,12 @@
+
+ io.micrometer
+ micrometer-registry-prometheus
+ ${micrometer.version}
+
+
ch.qos.logback
logback-classic
@@ -177,20 +252,6 @@
compile
-
-
- org.apache.commons
- commons-jci-core
- ${commons-jci-core.version}
- compile
-
-
- commons-io
- commons-io
-
-
-
-
com.google.code.gson
@@ -209,8 +270,17 @@
com.fasterxml.jackson.core
jackson-core
+
+ com.fasterxml.jackson.module
+ jackson-module-jaxb-annotations
+
+
+ com.fasterxml.jackson.module
+ jackson-module-jaxb-annotations
+ ${jackson.version}
+
org.glassfish.jersey.containers
@@ -274,15 +344,30 @@
org.hibernate
hibernate-validator
+
+ org.glassfish
+ jakarta.el
+
+
+ org.glassfish
+ jakarta.el
+ ${jakarta.el.version}
+
- org.apache.httpcomponents
- httpclient
+ org.apache.httpcomponents.client5
+ httpclient5
${httpclient.version}
compile
+
+
+ org.apache.httpcomponents
+ httpcore
+
+
@@ -292,13 +377,6 @@
compile
-
- commons-logging
- commons-logging
- ${commons-logging}
- compile
-
-
commons-codec
commons-codec
@@ -307,13 +385,6 @@
-
- javax.servlet
- javax.servlet-api
- ${servlet-api.version}
- provided
-
-
org.eclipse.jgit
org.eclipse.jgit
@@ -441,8 +512,12 @@
compile
+ org.apache.tinkerpop
gremlin-groovy
+
+
org.apache.tinkerpop
+ gremlin-core
org.json
@@ -472,6 +547,10 @@
dom4j
dom4j
+
+ org.slf4j
+ jcl-over-slf4j
+
@@ -511,14 +590,6 @@
compile
-
- com.googlecode.json-simple
- json-simple
- ${json-simple.version}
- compile
-
-
-
org.functionaljava
@@ -560,8 +631,7 @@
org.json
json
- 20131018
- compile
+ ${org.json.version}
@@ -570,6 +640,12 @@
cassandra-driver-core
${cassandra.driver.version}
compile
+
+
+ com.github.jnr
+ jnr-posix
+
+
com.datastax.cassandra
@@ -585,14 +661,14 @@
esapi
${org.owasp.esapi.version}
-
- xerces
- xercesImpl
-
log4j
log4j
+
+ commons-io
+ commons-io
+
commons-fileupload
commons-fileupload
@@ -609,6 +685,14 @@
xml-apis
xml-apis
+
+ xerces
+ xercesImpl
+
+
+ net.sourceforge.nekohtml
+ nekohtml
+
@@ -641,6 +725,22 @@
log4j
log4j
+
+ javax.servlet
+ javax.servlet-api
+
+
+ org.onap.aaf.authz
+ aaf-cadi-aaf
+
+
+ org.onap.aaf.authz
+ aaf-cadi-client
+
+
+ org.onap.aaf.authz
+ aaf-cadi-core
+
@@ -657,12 +757,6 @@
jetty-proxy
${jetty.version}
compile
-
-
- org.eclipse.jetty
- jetty-http
-
-
@@ -675,10 +769,6 @@
org.eclipse.jetty
jetty-http
-
- org.eclipse.jetty
- jetty-continuation
-
@@ -716,6 +806,14 @@
apache-log4j-extras
log4j
+
+ org.apache.httpcomponents
+ httpclient-cache
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+
@@ -727,26 +825,9 @@
javax.jms
jms
-
-
-
-
-
- org.onap.aaf.authz
- aaf-cadi-aaf
- ${cadi.version}
-
- com.datastax.cassandra
- cassandra-driver-core
-
-
- org.slf4j
- slf4j-log4j12
-
-
- log4j
- log4j
+ javax.servlet
+ javax.servlet-api
@@ -766,12 +847,8 @@
test
- org.eclipse.jetty
- jetty-server
-
-
- org.eclipse.jetty
- jetty-continuation
+ junit
+ junit
@@ -787,12 +864,6 @@
jetty-webapp
${jetty.version}
test
-
-
- org.eclipse.jetty
- jetty-servlet
-
-
@@ -885,12 +956,11 @@
com.google.code.bean-matchers
bean-matchers
- 0.11
+ ${bean-matchers.version}
test
-
- org.codehaus.groovy
+ org.apache.groovy
groovy
${groovy.version}
@@ -924,6 +994,10 @@
org.springframework.boot
spring-boot-starter-logging
+
+ org.springframework.boot
+ spring-boot-starter
+
@@ -964,6 +1038,10 @@
+
+ org.apache.kafka
+ kafka-clients
+
@@ -1036,7 +1114,7 @@
- ${project.version}
+ ${ui.version}
true
@@ -1078,6 +1156,9 @@
src/test/resources/artifacts/pnfSoftwareInformation/**
+
+ src/test/resources/yamlValidation/noValid/**
+
@@ -1119,6 +1200,7 @@
org.apache.maven.plugins
maven-assembly-plugin
+ ${mvn.assembly.version}
normatives
@@ -1175,9 +1257,9 @@
sdce-2-sdce-5
- ${project.build.directory}/generated/swagger
- swagger-sdce-2-sdce-5
- JSON
+ ${project.build.directory}/generated/openapi
+ openapi-sdce-2-sdce-5
+ JSONANDYAML
${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml
@@ -1192,9 +1274,9 @@
sdce-4
- ${project.build.directory}/generated/swagger
- swagger-sdce-4
- JSON
+ ${project.build.directory}/generated/openapi
+ openapi-sdce-4
+ JSONANDYAML
${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml
@@ -1209,9 +1291,9 @@
sdce-6
- ${project.build.directory}/generated/swagger
- swagger-sdce-6
- JSON
+ ${project.build.directory}/generated/openapi
+ openapi-sdce-6
+ JSONANDYAML
${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml
@@ -1226,9 +1308,9 @@
sdce-7
- ${project.build.directory}/generated/swagger
- swagger-sdce-7
- JSON
+ ${project.build.directory}/generated/openapi
+ openapi-sdce-7
+ JSONANDYAML
${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml
@@ -1347,18 +1429,18 @@
${verbose}
${docker.api.version}
- nexus3.onap.org:10001
+ ${docker.registry}
- docker
- docker
+ ${docker.username}
+ ${docker.password}
- onap/sdc-backend
+ ${docker.namespace}/sdc-backend
sdc-backend
try
@@ -1380,7 +1462,7 @@
- onap/sdc-backend-init
+ ${docker.namespace}/sdc-backend-init
sdc-backend-init
try
@@ -1408,7 +1490,7 @@
true
- onap/sdc-backend,onap/sdc-backend-init
+ ${docker.namespace}/sdc-backend,onap/sdc-backend-init
@@ -1427,7 +1509,7 @@
push
- onap/sdc-backend,onap/sdc-backend-init
+ ${docker.namespace}/sdc-backend,onap/sdc-backend-init