Upgrade libraries and add instructions to makefile

Issue-ID: DCAEGEN2-2594
Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
Change-Id: I0d16307424de3b677ceed6edc94318f79e565dc2

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ebbd50..4113177 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -30,12 +31,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
     <groupId>org.onap.dcaegen2.platform</groupId>
     <artifactId>inventory-api</artifactId>
-    <version>3.5.1-SNAPSHOT</version>
+    <version>3.5.2-SNAPSHOT</version>
     <name>dcaegen2-platform-inventory-api</name>
     <!--internal <version>3.0.0</version>-->
 
     <properties>
-        <dropwizard.version>1.3.11</dropwizard.version>
+        <dropwizard.version>1.3.29</dropwizard.version>
         <logback.version>1.2.3</logback.version>
         <swagger-core.version>1.5.8</swagger-core.version>
         <guava.version>28.2-jre</guava.version>
@@ -48,7 +49,8 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <snapshots.path>content/repositories/snapshots/</snapshots.path>
         <releases.path>content/repositories/releases/</releases.path>
         <site.path>content/sites/site/org/onap/dcae/dcae-inventory/${project.artifactId}/${project.version}/</site.path>
-        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
         <activation.version>1.1.1</activation.version>
     </properties>
 
@@ -69,6 +71,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 
     <dependencies>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.27.0-GA</version>
+        </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>
@@ -78,30 +85,8 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                     <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-validator</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-server</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-   <dependency>
-       <groupId>org.eclipse.jetty</groupId>
-       <artifactId>jetty-server</artifactId>
-       <version>9.4.12.v20180830</version>
-   </dependency>
-   <dependency>
-       <groupId>org.eclipse.jetty</groupId>
-       <artifactId>jetty-http</artifactId>
-       <version>9.4.12.v20180830</version>
-   </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-jdbi</artifactId>
@@ -122,12 +107,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>5.3.6.Final</version>
+            <version>5.4.3.Final</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>9.4.12.v20180830</version>
+            <version>9.4.33.v20201020</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -137,7 +122,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.5</version>
+            <version>42.2.18</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
@@ -202,7 +187,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
@@ -226,10 +211,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <scope>test</scope>
         </dependency>
         <dependency>
-               <groupId>org.json</groupId>
-               <artifactId>json</artifactId>
-               <version>20131018</version>
-               </dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20131018</version>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
@@ -265,7 +250,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <artifactId>h2</artifactId>
             <version>1.4.197</version>
             <scope>test</scope>
-      </dependency>
+        </dependency>
     </dependencies>
 
     <build>
@@ -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 -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <!-- add Main-Class to manifest file -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.onap.dcae.inventory.InventoryApplication</mainClass>
                                 </transformer>
                             </transformers>

diff --git a/version.properties b/version.properties
index f7ed100..fda1602 100644 (file)
--- 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