From 6cd638396825075a45fa65fee76b3e154f09205d Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 15:22:02 +0100
Subject: [PATCH 01/12] Fix SNYK-JAVA-ORGAPACHECASSANDRA-2400628

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle | 4 +++-
 pom.xml      | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c223199bf67..2911d489265 100644
--- a/build.gradle
+++ b/build.gradle
@@ -123,6 +123,7 @@ allprojects {
         tinkVersion = '1.6.1'
         tomcatVersion = '9.0.62'
         validationVersion = '2.0.1.Final'
+        cassandraVersion = '3.11.12'
     }
 
     dependencies {
@@ -234,6 +235,8 @@ allprojects {
 	        implementation("commons-configuration:commons-configuration:${commonsconfigurationVersion}")
 	        implementation("org.apache.commons:commons-configuration2:${commonsconfiguration2Version}")
             implementation("org.hibernate:hibernate-validator:${hibernatevalidatorVersion}")
+            implementation("org.apache.thrift:libthrift:${thriftVersion}")
+            implementation("org.apache.cassandra:cassandra-all:${cassandraVersion}")
 
             // testng also used in our 'source' code to support unit tests
             implementation("org.testng:testng:${testngVersion}")
@@ -263,7 +266,6 @@ allprojects {
             testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}")
             testImplementation("org.testng:testng:${testngVersion}")
             testImplementation("org.hamcrest:hamcrest:${hamcrestVersion}")
-            implementation("org.apache.thrift:libthrift:${thriftVersion}")
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 5b4049dc5b8..ac65e96e7c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,6 +259,7 @@
         <groovy-plugin.version>2.1.1</groovy-plugin.version>
         <openlineage.version>0.6.2</openlineage.version>
         <properties.plugin.version>1.1.0</properties.plugin.version>
+        <cassandra.version>3.11.12</cassandra.version>
 
         <!-- Configuration of sonar code scanning-->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -3316,6 +3317,12 @@
                 <version>${hibernate-validator.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.cassandra</groupId>
+                <artifactId>cassandra-all</artifactId>
+                <version>${cassandra.version}</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>

From 19b89d33d15acec3678af8ddbce94ce3b433b3b1 Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 15:26:08 +0100
Subject: [PATCH 02/12] Fix SNYK-JAVA-ORGAPACHEANT-1015405

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle | 2 ++
 pom.xml      | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/build.gradle b/build.gradle
index 2911d489265..16332778ed7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -124,6 +124,7 @@ allprojects {
         tomcatVersion = '9.0.62'
         validationVersion = '2.0.1.Final'
         cassandraVersion = '3.11.12'
+        antVersion = '1.10.9'
     }
 
     dependencies {
@@ -237,6 +238,7 @@ allprojects {
             implementation("org.hibernate:hibernate-validator:${hibernatevalidatorVersion}")
             implementation("org.apache.thrift:libthrift:${thriftVersion}")
             implementation("org.apache.cassandra:cassandra-all:${cassandraVersion}")
+            implementation("org.apache.ant:ant:${antVersion}")
 
             // testng also used in our 'source' code to support unit tests
             implementation("org.testng:testng:${testngVersion}")
diff --git a/pom.xml b/pom.xml
index ac65e96e7c8..899a6318b37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,6 +260,7 @@
         <openlineage.version>0.6.2</openlineage.version>
         <properties.plugin.version>1.1.0</properties.plugin.version>
         <cassandra.version>3.11.12</cassandra.version>
+        <ant.version>1.10.12</ant.version>
 
         <!-- Configuration of sonar code scanning-->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -3323,6 +3324,12 @@
                 <version>${cassandra.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant</artifactId>
+                <version>${ant.version}</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>

From 82ecb553923dc5305e648b4ad6d6ffc6eb7f5d3a Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 15:28:51 +0100
Subject: [PATCH 03/12] Fix SNYK-JAVA-COMGOOGLEPROTOBUF-2331703

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle | 2 ++
 pom.xml      | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/build.gradle b/build.gradle
index 16332778ed7..dda607831e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,6 +125,7 @@ allprojects {
         validationVersion = '2.0.1.Final'
         cassandraVersion = '3.11.12'
         antVersion = '1.10.9'
+        protobufVersion = '3.19.2'
     }
 
     dependencies {
@@ -239,6 +240,7 @@ allprojects {
             implementation("org.apache.thrift:libthrift:${thriftVersion}")
             implementation("org.apache.cassandra:cassandra-all:${cassandraVersion}")
             implementation("org.apache.ant:ant:${antVersion}")
+            implementation("com.google.protobuf:protobuf-java:${protobufVersion}")
 
             // testng also used in our 'source' code to support unit tests
             implementation("org.testng:testng:${testngVersion}")
diff --git a/pom.xml b/pom.xml
index 899a6318b37..e40ef8b14c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,6 +261,7 @@
         <properties.plugin.version>1.1.0</properties.plugin.version>
         <cassandra.version>3.11.12</cassandra.version>
         <ant.version>1.10.12</ant.version>
+        <protobuf.version>3.19.2</protobuf.version>
 
         <!-- Configuration of sonar code scanning-->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -3330,6 +3331,12 @@
                 <version>${ant.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf.version}</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>

From a3f6a6f6033086f185c1b949b124df512b811682 Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 15:31:45 +0100
Subject: [PATCH 04/12] Fix SNYK-JAVA-COMGOOGLECODEGSON-1730327

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle | 2 ++
 pom.xml      | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/build.gradle b/build.gradle
index dda607831e3..6e565dea535 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,6 +126,7 @@ allprojects {
         cassandraVersion = '3.11.12'
         antVersion = '1.10.9'
         protobufVersion = '3.19.2'
+        gsonVersion = '2.8.9'
     }
 
     dependencies {
@@ -241,6 +242,7 @@ allprojects {
             implementation("org.apache.cassandra:cassandra-all:${cassandraVersion}")
             implementation("org.apache.ant:ant:${antVersion}")
             implementation("com.google.protobuf:protobuf-java:${protobufVersion}")
+            implementation("com.google.code.gson:gson:${gsonVersion}")
 
             // testng also used in our 'source' code to support unit tests
             implementation("org.testng:testng:${testngVersion}")
diff --git a/pom.xml b/pom.xml
index e40ef8b14c6..c56d1cc2d15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,6 +262,7 @@
         <cassandra.version>3.11.12</cassandra.version>
         <ant.version>1.10.12</ant.version>
         <protobuf.version>3.19.2</protobuf.version>
+        <gson.version>2.8.9</gson.version>
 
         <!-- Configuration of sonar code scanning-->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -3337,6 +3338,12 @@
                 <version>${protobuf.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>${gson.version}</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>

From 447ded91dbcddf53340231ca6226f916a8abf5d9 Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 15:36:09 +0100
Subject: [PATCH 05/12] Fix SNYK-JAVA-ORGSPRINGFRAMEWORK-2689634

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6e565dea535..2ba3a0e1f19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -117,7 +117,7 @@ allprojects {
         springldapVersion = '2.3.5.RELEASE'
         springsecurityVersion = '5.6.2'
         swaggerVersion = '2.1.13'
-        springwebVersion = '5.3.18'
+        springwebVersion = '5.3.19'
         testngVersion = '7.5'
         thriftVersion = '0.16.0'
         tinkVersion = '1.6.1'
diff --git a/pom.xml b/pom.xml
index c56d1cc2d15..3f3bc449b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
         <gremlin.version>3.5.1</gremlin.version>
         <spring-data.version>2.6.3</spring-data.version>
         <springdoc.version>1.6.6</springdoc.version>
-        <spring.version>5.3.18</spring.version>
+        <spring.version>5.3.19</spring.version>
         <spring-security.version>5.6.2</spring-security.version>
         <springdoc-plugin.version>1.4</springdoc-plugin.version>
         <commons-io.version>2.11.0</commons-io.version>

From 0ba56789f00a3261c0010c5d36a216db307d4b37 Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 15:39:39 +0100
Subject: [PATCH 06/12] Fix SNYK-JAVA-COMGITHUBJNR-1570422

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle | 2 ++
 pom.xml      | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/build.gradle b/build.gradle
index 2ba3a0e1f19..235d8763d7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,6 +127,7 @@ allprojects {
         antVersion = '1.10.9'
         protobufVersion = '3.19.2'
         gsonVersion = '2.8.9'
+        jnrVersion = '3.1.8'
     }
 
     dependencies {
@@ -243,6 +244,7 @@ allprojects {
             implementation("org.apache.ant:ant:${antVersion}")
             implementation("com.google.protobuf:protobuf-java:${protobufVersion}")
             implementation("com.google.code.gson:gson:${gsonVersion}")
+            implementation("com.github.jnr:jnr-posix:${jnrVersion}")
 
             // testng also used in our 'source' code to support unit tests
             implementation("org.testng:testng:${testngVersion}")
diff --git a/pom.xml b/pom.xml
index 3f3bc449b83..5c6e8a1c697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,6 +263,7 @@
         <ant.version>1.10.12</ant.version>
         <protobuf.version>3.19.2</protobuf.version>
         <gson.version>2.8.9</gson.version>
+        <jnr.version>3.1.8</jnr.version>
 
         <!-- Configuration of sonar code scanning-->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -3344,6 +3345,12 @@
                 <version>${gson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.github.jnr</groupId>
+                <artifactId>jnr-posix</artifactId>
+                <version>${jnr.version}</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>

From c2f61da21e647409fad6348f142f1de43044ff11 Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 15:41:18 +0100
Subject: [PATCH 07/12] Fix SNYK-JAVA-ORGAPACHETINKERPOP-1535125

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 235d8763d7d..c5ee27f1524 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,7 @@ allprojects {
         elasticsearchVersion = '7.17.1'
         findbugsVersion = '3.0.2'
         glassfishVersion = '1.1.4'
-        gremlinVersion = '3.5.1'
+        gremlinVersion = '3.5.2'
         groovyVersion = '3.0.9'
         guavaVersion = '31.1-jre'
         hamcrestVersion = '2.2'
diff --git a/pom.xml b/pom.xml
index 5c6e8a1c697..dc616894c74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,7 +165,7 @@
         <janus.version>0.6.1</janus.version>
         <tomcat.version>9.0.62</tomcat.version>
         <spring.ldap.core>2.3.6.RELEASE</spring.ldap.core>
-        <gremlin.version>3.5.1</gremlin.version>
+        <gremlin.version>3.5.2</gremlin.version>
         <spring-data.version>2.6.3</spring-data.version>
         <springdoc.version>1.6.6</springdoc.version>
         <spring.version>5.3.19</spring.version>

From 4a75555b9d263dbcf7f10e131042b55a4651517b Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 16:30:27 +0100
Subject: [PATCH 08/12] Address antlr dependency mismatch

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle |  4 +++-
 pom.xml      | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index c5ee27f1524..6a68ea7bdfe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,8 @@ allprojects {
     // Assign variables for any constraints
 
     ext {
-        antlrVersion = '3.5.2'
+        antlrVersion = '3.5.3'
+        ST4Version = '4.3.3'
         avroVersion = '1.11.0'
         classgraphVersion = '4.8.143'
         classmateVersion = '1.5.1'
@@ -251,6 +252,7 @@ allprojects {
             runtimeOnly("joda-time:joda-time:${jodatimeVersion}")
             implementation("org.yaml:snakeyaml:${snakeyamlVersion}")
             runtimeOnly("org.antlr:antlr-runtime:${antlrVersion}")
+            runtimeOnly("org.antlr:ST4:${ST4Version}")
             runtimeOnly("org.apache.jena:jena-arq:${jenaVersion}")
             runtimeOnly("org.codehaus.jackson:jackson-mapper-asl:${jacksonaslVersion}")
             runtimeOnly("org.codehaus.jackson:jackson-core-asl:${jacksonaslVersion}")
diff --git a/pom.xml b/pom.xml
index dc616894c74..061fbab60b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,8 @@
         <sleepycat.version>18.3.12</sleepycat.version>
         <joda.version>2.10.14</joda.version>
         <jackson-asl.version>1.9.14-atlassian-6</jackson-asl.version>
-        <antlr.version>3.5.2</antlr.version>
+        <antlr.version>3.5.3</antlr.version>
+        <ST4.version>4.3.3</ST4.version>
         <snappy.version>1.1.8.4</snappy.version>
         <swagger.version>2.1.13</swagger.version>
         <snakeyaml.version>1.30</snakeyaml.version>
@@ -3101,6 +3102,13 @@
                 <scope>runtime</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>ST4</artifactId>
+                <version>${ST4.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.xerial.snappy</groupId>
                 <artifactId>snappy-java</artifactId>

From 549ae9e4e6da44583bc6078bc4a89b265bbb2267 Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 16:31:57 +0100
Subject: [PATCH 09/12] Fix jacoco for Java 18

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 061fbab60b6..064b27520e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,7 +241,7 @@
         <maven-antrun.version>3.0.0</maven-antrun.version>
         <spotify-docker-plugin.version>1.4.13</spotify-docker-plugin.version>
         <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
-        <jacoco-plugin.version>0.8.7</jacoco-plugin.version>
+        <jacoco-plugin.version>0.8.8</jacoco-plugin.version>
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
         <frontend.plugin.version>1.12.1</frontend.plugin.version>
         <exec.plugin.version>3.0.0</exec.plugin.version>

From c94e901ee077885ee5c6ab31584f0fc7f13c8040 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Apr 2022 12:28:37 +0000
Subject: [PATCH 10/12] Bump com.github.psxpaul.execfork from 0.1.15 to 0.2.0

Bumps com.github.psxpaul.execfork from 0.1.15 to 0.2.0.

---
updated-dependencies:
- dependency-name: com.github.psxpaul.execfork
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index c0344c6ccd7..11cd13536b0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,7 +11,7 @@ pluginManagement {
         id 'gradle-aggregate-javadocs-plugin' version '3.0.1'
         id 'org.siouan.frontend-jdk11' version '6.0.0'
         id 'com.github.johnrengelman.shadow' version '7.1.2'
-        id 'com.github.psxpaul.execfork' version '0.1.15'
+        id 'com.github.psxpaul.execfork' version '0.2.0'
 
 
         // For reference we use these, but they are internal so no version spec needed

From 41777ece6e4087e29461553bfd1fef457cab4dea Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 18:09:44 +0100
Subject: [PATCH 11/12] Update FVTs to work with latest psxfork plugin

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 .../access-services-fvt/analytics-modeling-fvt/build.gradle | 5 ++---
 .../access-services-fvt/asset-consumer-fvt/build.gradle     | 6 +++---
 .../access-services-fvt/asset-manager-fvt/build.gradle      | 6 +++---
 .../access-services-fvt/asset-owner-fvt/build.gradle        | 6 +++---
 .../access-services-fvt/community-profile-fvt/build.gradle  | 6 +++---
 .../access-services-fvt/data-engine-fvt/build.gradle        | 6 +++---
 .../access-services-fvt/data-manager-fvt/build.gradle       | 6 +++---
 .../digital-architecture-fvt/build.gradle                   | 6 +++---
 .../access-services-fvt/discovery-engine-fvt/build.gradle   | 6 +++---
 .../access-services-fvt/governance-engine-fvt/build.gradle  | 6 +++---
 .../access-services-fvt/governance-program-fvt/build.gradle | 6 +++---
 .../access-services-fvt/stewardship-action-fvt/build.gradle | 6 +++---
 .../access-services-fvt/subject-area-fvt/build.gradle       | 6 +++---
 .../view-services-fvt/glossary-author-fvt/build.gradle      | 6 +++---
 14 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/analytics-modeling-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/analytics-modeling-fvt/build.gradle
index 62e3c98289b..81a5cb34012 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/analytics-modeling-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/analytics-modeling-fvt/build.gradle
@@ -68,8 +68,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10453
     timeout = 180
@@ -106,6 +106,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
 }
 
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-consumer-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-consumer-fvt/build.gradle
index ba612824470..c9b31f46693 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-consumer-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-consumer-fvt/build.gradle
@@ -66,8 +66,8 @@ task startServer(dependsOn: [':open-metadata-distribution:open-metadata-assembli
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10443
     timeout = 180
@@ -102,5 +102,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+
 }
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-manager-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-manager-fvt/build.gradle
index 79f9127a1a6..90107c61bc1 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-manager-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-manager-fvt/build.gradle
@@ -66,8 +66,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10444
     timeout = 180
@@ -103,6 +103,6 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+
 }
 
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-owner-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-owner-fvt/build.gradle
index 9b3372c4a4c..64b3bacc0b9 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-owner-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-owner-fvt/build.gradle
@@ -64,8 +64,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10445
     timeout = 180
@@ -96,7 +96,7 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+
 }
 
 task cleanData(type: Delete) {
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/community-profile-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/community-profile-fvt/build.gradle
index 18698e534cf..fe7fa2d73cd 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/community-profile-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/community-profile-fvt/build.gradle
@@ -67,8 +67,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10446
     timeout = 180
@@ -105,5 +105,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+errorOutput = layout.buildDirectory.file("chassis-error.log")
 }
\ No newline at end of file
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/data-engine-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/data-engine-fvt/build.gradle
index 4abf75821eb..18f37eb1d5b 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/data-engine-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/data-engine-fvt/build.gradle
@@ -74,8 +74,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = Integer.parseInt(port)
     timeout = 180
@@ -117,5 +117,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+
 }
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/data-manager-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/data-manager-fvt/build.gradle
index fb1381a827d..2631d587987 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/data-manager-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/data-manager-fvt/build.gradle
@@ -67,8 +67,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10446
     timeout = 180
@@ -105,5 +105,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+
 }
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/digital-architecture-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/digital-architecture-fvt/build.gradle
index 443cd50a749..e81dbd4328d 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/digital-architecture-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/digital-architecture-fvt/build.gradle
@@ -64,8 +64,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10447
     timeout = 180
@@ -101,5 +101,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+
 }
\ No newline at end of file
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/discovery-engine-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/discovery-engine-fvt/build.gradle
index d661c9767ee..f02b77210ea 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/discovery-engine-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/discovery-engine-fvt/build.gradle
@@ -66,8 +66,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10446
     timeout = 180
@@ -104,5 +104,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+
 }
\ No newline at end of file
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-engine-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-engine-fvt/build.gradle
index d6c7b54fd5e..74618ff991b 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-engine-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-engine-fvt/build.gradle
@@ -67,8 +67,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10446
     timeout = 180
@@ -105,5 +105,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+
 }
\ No newline at end of file
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-program-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-program-fvt/build.gradle
index 429caccd13f..3376cf18247 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-program-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-program-fvt/build.gradle
@@ -70,8 +70,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10446
     timeout = 180
@@ -108,5 +108,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+    
 }
\ No newline at end of file
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/stewardship-action-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/stewardship-action-fvt/build.gradle
index b0cfecca2e9..9624e906822 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/stewardship-action-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/stewardship-action-fvt/build.gradle
@@ -68,8 +68,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10455
     timeout = 180
@@ -100,7 +100,7 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+    
 }
 
 task cleanData(type: Delete) {
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/subject-area-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/subject-area-fvt/build.gradle
index f4b8e60da8c..d1a03b2894c 100644
--- a/open-metadata-test/open-metadata-fvt/access-services-fvt/subject-area-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/subject-area-fvt/build.gradle
@@ -62,8 +62,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = 10448
     timeout = 180
@@ -100,5 +100,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+    
 }
diff --git a/open-metadata-test/open-metadata-fvt/view-services-fvt/glossary-author-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/view-services-fvt/glossary-author-fvt/build.gradle
index c4716a6c09f..620990d8ac3 100644
--- a/open-metadata-test/open-metadata-fvt/view-services-fvt/glossary-author-fvt/build.gradle
+++ b/open-metadata-test/open-metadata-fvt/view-services-fvt/glossary-author-fvt/build.gradle
@@ -88,8 +88,8 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
              "${distdir}/server/server-chassis-spring-${project.version}.jar" ]
     // Setting the output directories to be the same for ALL FVTs acts as a synchronization mechanism
     // - alternatively we need to ensure the server port is unique per test
-    standardOutput = "${buildDir}/chassis.log"
-    errorOutput = "${buildDir}/chassis-error.log"
+    standardOutput = layout.buildDirectory.file("chassis.log")
+    errorOutput = layout.buildDirectory.file("chassis-error.log")
     //stopAfter = verify
     waitForPort = Integer.valueOf(gaport)
     timeout = 180
@@ -130,5 +130,5 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-    finalizedBy stopServer
+    
 }

From c447d975e9fc15b6fb05bf327ac3d7f336e673ca Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Sat, 16 Apr 2022 18:14:41 +0100
Subject: [PATCH 12/12] Update jacoco version for gradle - Java 18 support

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 6a68ea7bdfe..3fd3b45d890 100644
--- a/build.gradle
+++ b/build.gradle
@@ -284,6 +284,10 @@ allprojects {
         withJavadocJar()
     }
 
+    jacoco {
+        toolVersion = "0.8.8"
+    }
+
     publishing {
         publications {
             maven(MavenPublication) {