Merge pull request #6430 from planetf1/fixsec

Fix various dependencies
odpi · Apr 16, 2022 · cfa719d · cfa719d
2 parents 3c6e3d8 + 50a5fd3
commit cfa719d
Show file tree

Hide file tree

Showing 17 changed files with 109 additions and 51 deletions.
diff --git 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'
@@ -68,7 +69,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'
@@ -117,12 +118,17 @@ 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'
         tomcatVersion = '9.0.62'
         validationVersion = '2.0.1.Final'
+        cassandraVersion = '3.11.12'
+        antVersion = '1.10.9'
+        protobufVersion = '3.19.2'
+        gsonVersion = '2.8.9'
+        jnrVersion = '3.1.8'
     }
 
     dependencies {
@@ -234,12 +240,19 @@ 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}")
+            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}")
             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}")
@@ -263,7 +276,6 @@ allprojects {
             testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}")
             testImplementation("org.testng:testng:${testngVersion}")
             testImplementation("org.hamcrest:hamcrest:${hamcrestVersion}")
-            implementation("org.apache.thrift:libthrift:${thriftVersion}")
         }
     }
 
@@ -272,6 +284,10 @@ allprojects {
         withJavadocJar()
     }
 
+    jacoco {
+        toolVersion = "0.8.8"
+    }
+
     publishing {
         publications {
             maven(MavenPublication) {

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")
 }
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
@@ -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
@@ -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/...metadata-test/open-metadata-fvt/access-services-fvt/digital-architecture-fvt/build.gradle b/...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
+
 }
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
@@ -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
+
 }
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
@@ -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/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
+
 }
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
@@ -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
@@ -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
@@ -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
+
 }