Update apache velocity in graphgraph1.8.3

- update apache velocity
- bump version to 1.8.3-SNAPSHOT

Issue-ID: AAI-3915
Change-Id: I28f4d03bf6badd54480253aa349752f3c543f911
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

7 files changed, 19 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 4710213..28ccadc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,7 @@
 # idea
 /.idea
 *.iml
+.vscode
 
-node
\ No newline at end of file
+node
+*.uml
diff --git a/graphgraph-fe/package-lock.json b/graphgraph-fe/package-lock.json
index d0ae451..74789e9 100644
--- a/graphgraph-fe/package-lock.json
+++ b/graphgraph-fe/package-lock.json
@@ -5388,9 +5388,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001292",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz",
-            "integrity": "sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw=="
+            "version": "1.0.30001639",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz",
+            "integrity": "sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg=="
         },
         "case-sensitive-paths-webpack-plugin": {
             "version": "2.4.0",
@@ -8266,9 +8266,9 @@
             "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
         },
         "fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
             "optional": true
         },
         "function-bind": {
diff --git a/graphgraph-fe/package.json b/graphgraph-fe/package.json
index ebe4efa..17408b2 100644
--- a/graphgraph-fe/package.json
+++ b/graphgraph-fe/package.json
@@ -3,9 +3,10 @@
     "version": "0.0.1",
     "private": true,
     "dependencies": {
+        "@babel/core": "^7.16.5",
         "bootstrap": "4.6.0",
+        "caniuse-lite": "^1.0.30001639",
         "d3": "5.7.0",
-        "@babel/core": "^7.16.5",
         "eslint-config-react-app": "7.0.0",
         "react": "17.0.2",
         "react-bootstrap": "1.6.1",
@@ -40,8 +41,8 @@
         "eslint-plugin-promise": "^6.0.0"
     },
     "devDependencies": {
-        "enzyme": "^3.11.0",
         "@wojtekmaj/enzyme-adapter-react-17": "0.6.6",
+        "enzyme": "^3.11.0",
         "enzyme-async-helpers": "^0.9.1",
         "fetch-mock-jest": "^1.5.1",
         "node-fetch": "^2.6.0"
diff --git a/pom.xml b/pom.xml
index 8560071..b2ca6c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.onap.aai.graphgraph</groupId>
   <artifactId>graphgraph</artifactId>
-  <version>1.8.2-SNAPSHOT</version>
+  <version>1.8.3-SNAPSHOT</version>
 
   <properties>
     <nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -145,8 +145,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
-      <version>1.7</version>
+      <artifactId>velocity-engine-core</artifactId>
+      <version>2.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
diff --git a/src/test/java/org/onap/aai/graphgraph/SchemaResourceTest.java b/src/test/java/org/onap/aai/graphgraph/SchemaResourceTest.java
index a6fb7ed..01436f5 100644
--- a/src/test/java/org/onap/aai/graphgraph/SchemaResourceTest.java
+++ b/src/test/java/org/onap/aai/graphgraph/SchemaResourceTest.java
@@ -123,7 +123,7 @@ public class SchemaResourceTest {
     public void exportSchemaVersion10Test() {
         String schemaExport = schemaResource.exportSchema("v10");
         Assert.assertNotNull(schemaExport);
-        Assert.assertEquals(844919, schemaExport.length());
+        Assert.assertEquals(764869, schemaExport.length());
     }
 
     @Test
diff --git a/src/test/java/org/onap/aai/graphgraph/TestConfig.java b/src/test/java/org/onap/aai/graphgraph/TestConfig.java
index 7f6314b..3c26736 100644
--- a/src/test/java/org/onap/aai/graphgraph/TestConfig.java
+++ b/src/test/java/org/onap/aai/graphgraph/TestConfig.java
@@ -43,7 +43,7 @@ public class TestConfig {
         Mockito.when(restClient.getGetRequest(Mockito.anyString(),
                 Mockito.eq("versions"),
                 Mockito.any(Map.class)))
-                .thenReturn(new ResponseEntity("{\"versions\":[\"v10\",\"v23\"],\"edge-version\":\"v10\",\"default-version\":\"v10\",\"depth-version\":\"v10\",\"app-root-version\":\"v10\",\"related-link-version\":\"v10\",\"namespace-change-version\":\"v10\"}", HttpStatus.OK));
+                .thenReturn(new ResponseEntity<String>("{\"versions\":[\"v10\",\"v23\"],\"edge-version\":\"v10\",\"default-version\":\"v10\",\"depth-version\":\"v10\",\"app-root-version\":\"v10\",\"related-link-version\":\"v10\",\"namespace-change-version\":\"v10\"}", HttpStatus.OK));
 
         //extend test in the future with the following versions:
         //{"versions":["v10","v11","v12","v13","v14","v15","v16","v17","v18","v19","v20","v21","v22","v23"],"edge-version":"v12","default-version":"v23","depth-version":"v10","app-root-version":"v11","related-link-version":"v10","namespace-change-version":"v12"}
@@ -75,7 +75,7 @@ public class TestConfig {
         Mockito.when(restClient.getGetRequest(Mockito.anyString(),
                 Mockito.eq("edgerules?version=" + version),
                 Mockito.any(Map.class)))
-                .thenReturn(new ResponseEntity(new String(bytes, StandardCharsets.UTF_8), HttpStatus.OK));
+                .thenReturn(new ResponseEntity<String>(new String(bytes, StandardCharsets.UTF_8), HttpStatus.OK));
     }
 
 }
diff --git a/version.properties b/version.properties
index 5403b8c..f05b75a 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=8
-patch_version=0
+patch_version=3
 
 base_version=${major_version}.${minor_version}.${patch_version}