From e1e16edcdd05271c7e133dc758b409433f783089 Mon Sep 17 00:00:00 2001 From: Edyta Krukowska Date: Thu, 11 Feb 2021 09:55:21 +0100 Subject: Upgrade libraries and add instructions to makefile Issue-ID: DCAEGEN2-2594 Signed-off-by: Edyta Krukowska Change-Id: I0d16307424de3b677ceed6edc94318f79e565dc2 --- CHANGELOG.md | 7 +++++++ Makefile | 7 +++++-- pom.xml | 61 +++++++++++++++++++++--------------------------------- version.properties | 2 +- 4 files changed, 37 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ebbd50..4113177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/). The version in the brackets represents the version of DCAE inventory and not the ONAP DCAE version. +## [3.5.2] +* Upgrade libraries: + - jetty-util + - dropwizard + - hibernate + - postgresql + ## [3.5.1] * Add dependency to javax.activation.activation library diff --git a/Makefile b/Makefile index 6dd1f67..e52ad1b 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,13 @@ build: start-service: @echo "##### Start inventory api service #####" @echo "########################### IMPORTANT ############################################################################################" - @echo "##### Before you start service you must properly configure connection to database in ./tools/congif_local.json! #####" + @echo "##### Before you start service you must properly configure connection to database in ./tools/congif_local.json!: #####" + @echo "##### Check password to inventory api on your lab: kubectl get secret dev-dcae-inventory-api-pg-user-creds -o yaml, decode it #####" + @echo "##### from base64. #####" + @echo "##### Change Worker_IP adress in url, expose port from svc dcae-inv-pg-primary, and also change it in url #####" @echo "##### Now service should up and running pls check: http://localhost:9080/swagger.json or http://localhost:9080/servicehealth #####" @echo "##################################################################################################################################" - java -DdevMode=true --add-opens java.base/java.lang=ALL-UNNAMED -jar ./target/inventory-api-3.5.0-SNAPSHOT.jar server ./tools/config_local.json + java -DdevMode=true --add-opens java.base/java.lang=ALL-UNNAMED -jar ./target/inventory-api-3.5.1-SNAPSHOT.jar server ./tools/config_local.json @echo "##### DONE #####" diff --git a/pom.xml b/pom.xml index 6250d03..e86a7db 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,8 @@ limitations under the License. ECOMP is a trademark and service mark of AT&T Intellectual Property. --> - + 4.0.0 @@ -30,12 +31,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.onap.dcaegen2.platform inventory-api - 3.5.1-SNAPSHOT + 3.5.2-SNAPSHOT dcaegen2-platform-inventory-api - 1.3.11 + 1.3.29 1.2.3 1.5.8 28.2-jre @@ -48,7 +49,8 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. content/repositories/snapshots/ content/repositories/releases/ content/sites/site/org/onap/dcae/dcae-inventory/${project.artifactId}/${project.version}/ - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + 1.1.1 @@ -69,6 +71,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. + + org.javassist + javassist + 3.27.0-GA + io.dropwizard dropwizard-core @@ -78,30 +85,8 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.hibernate hibernate-validator - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-http - 9.4.12.v20180830 - io.dropwizard dropwizard-jdbi @@ -122,12 +107,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.hibernate hibernate-validator - 5.3.6.Final + 5.4.3.Final org.eclipse.jetty jetty-util - 9.4.12.v20180830 + 9.4.33.v20201020 ch.qos.logback @@ -137,7 +122,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.postgresql postgresql - 42.2.5 + 42.2.18 io.swagger @@ -202,7 +187,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. com.google.guava guava - ${guava.version} + ${guava.version} org.glassfish.jersey.media @@ -226,10 +211,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. test - org.json - json - 20131018 - + org.json + json + 20131018 + org.mockito mockito-all @@ -265,7 +250,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. h2 1.4.197 test - + @@ -349,9 +334,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. http://stackoverflow.com/questions/27543060/why-does-dropwizard-configuration-is-not-working Some more context here: https://github.com/dropwizard/dropwizard/issues/455 --> - + - + org.onap.dcae.inventory.InventoryApplication diff --git a/version.properties b/version.properties index f7ed100..fda1602 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,7 @@ # because they are used in Jenkins, whose plug-in doesn't support major=3 minor=5 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins -- cgit 1.2.3-korg