diff --git a/build.gradle b/build.gradle index c223199bf67..3fd3b45d890 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' @@ -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 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 + } diff --git a/pom.xml b/pom.xml index 5b4049dc5b8..064b27520e2 100644 --- a/pom.xml +++ b/pom.xml @@ -165,10 +165,10 @@ 0.6.1 9.0.62 2.3.6.RELEASE - 3.5.1 + 3.5.2 2.6.3 1.6.6 - 5.3.18 + 5.3.19 5.6.2 1.4 2.11.0 @@ -200,7 +200,8 @@ 18.3.12 2.10.14 1.9.14-atlassian-6 - 3.5.2 + 3.5.3 + 4.3.3 1.1.8.4 2.1.13 1.30 @@ -240,7 +241,7 @@ 3.0.0 1.4.13 3.0.0-M3 - 0.8.7 + 0.8.8 3.3.0 1.12.1 3.0.0 @@ -259,6 +260,11 @@ 2.1.1 0.6.2 1.1.0 + 3.11.12 + 1.10.12 + 3.19.2 + 2.8.9 + 3.1.8 jacoco @@ -3096,6 +3102,13 @@ runtime + + org.antlr + ST4 + ${ST4.version} + runtime + + org.xerial.snappy snappy-java @@ -3316,6 +3329,36 @@ ${hibernate-validator.version} + + org.apache.cassandra + cassandra-all + ${cassandra.version} + + + + org.apache.ant + ant + ${ant.version} + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + com.google.code.gson + gson + ${gson.version} + + + + com.github.jnr + jnr-posix + ${jnr.version} + + 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