Merge pull request #8857 from mandy-chessell/oak2025

Clean up bom (a bit)

Author: mandy-chessell

CODEOWNERS

@@ -36,7 +36,6 @@ open-metadata-implementation/adapters/ @mandy-chessell
 open-metadata-implementation/adapters/authentication-plugins/ @mandy-chessell
 open-metadata-implementation/adapters/open-connectors/ @mandy-chessell
 open-metadata-implementation/adapters/open-connectors/rest-client-connectors/spring-rest-client-connector/ @mandy-chessell
-open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/ @cmgrote
 open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/ @mandy-chessell
 open-metadata-implementation/admin-services/ @mandy-chessell
 open-metadata-implementation/common-services/ @mandy-chessell

bom/build.gradle

@@ -137,10 +137,10 @@ dependencies {
         api("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}")
         api("com.fasterxml:classmate:${classmateVersion}")
         api("com.github.jsonld-java:jsonld-java:${jsonldVersion}")
-        api("com.google.crypto.tink:tink:${tinkVersion}")
+        //api("com.google.crypto.tink:tink:${tinkVersion}")
         api("com.github.spotbugs:spotbugs-annotations:${spotbugsVersion}")
         api("com.google.code.findbugs:jsr305:${findbugsVersion}")
-        api("com.google.guava:guava:${guavaVersion}")
+        //api("com.google.guava:guava:${guavaVersion}")
         api("com.sleepycat:je:${sleepycatVersion}")
         api("commons-codec:commons-codec:${commonscodecVersion}")
         api("commons-io:commons-io:${commonsioVersion}")
@@ -170,34 +170,34 @@ dependencies {
         api("org.apache.commons:commons-lang3:${lang3Version}")
         api("org.apache.jena:jena-core:${jenaVersion}")
         api("org.apache.kafka:kafka-clients:${kafkaVersion}")
-        api("org.apache.lucene:lucene-core:${luceneVersion}")
-        api("org.apache.lucene:lucene-analyzers-common:${luceneVersion}")
-        api("org.apache.lucene:lucene-queryparser:${luceneVersion}")
-        api("org.apache.lucene:lucene-spatial:${luceneVersion}")
-        api("org.apache.lucene:lucene-spatial-extras:${luceneVersion}")
-        api("org.apache.tinkerpop:tinkergraph-gremlin:${gremlinVersion}")
-        api("org.apache.tinkerpop:gremlin-driver:${gremlinVersion}")
-        api("org.apache.tinkerpop:gremlin-core:${gremlinVersion}")
-        api("org.apache.tinkerpop:gremlin-groovy:${gremlinVersion}")
-        api("org.apache.tinkerpop:gremlin-shaded:${gremlinVersion}")
+       // api("org.apache.lucene:lucene-core:${luceneVersion}")
+       // api("org.apache.lucene:lucene-analyzers-common:${luceneVersion}")
+       // api("org.apache.lucene:lucene-queryparser:${luceneVersion}")
+      //  api("org.apache.lucene:lucene-spatial:${luceneVersion}")
+      //  api("org.apache.lucene:lucene-spatial-extras:${luceneVersion}")
+      //  api("org.apache.tinkerpop:tinkergraph-gremlin:${gremlinVersion}")
+     //   api("org.apache.tinkerpop:gremlin-driver:${gremlinVersion}")
+      //  api("org.apache.tinkerpop:gremlin-core:${gremlinVersion}")
+     //   api("org.apache.tinkerpop:gremlin-groovy:${gremlinVersion}")
+    //    api("org.apache.tinkerpop:gremlin-shaded:${gremlinVersion}")
         api("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
         //TODO May need to exclude tomcat-annotations-api
         api("org.apache.tomcat:tomcat-coyote:${tomcatVersion}")
         //TODO May need to exclude tomcat-annotations-api
-        api("org.codehaus.groovy:groovy:${groovyVersion}")
-        api("org.codehaus.groovy:groovy-cli-picocli:${groovyVersion}")
-        api("org.codehaus.groovy:groovy-console:${groovyVersion}")
-        api("org.codehaus.groovy:groovy-jsr223:${groovyVersion}")
-        api("org.codehaus.groovy:groovy-templates:${groovyVersion}")
-        api("org.codehaus.groovy:groovysh:${groovyVersion}")
-        api("org.elasticsearch:elasticsearch:${elasticsearchVersion}")
-        api("org.elasticsearch.client:elasticsearch-rest-client:${elasticsearchVersion}")
-        api("co.elastic.clients:elasticsearch-java:${elasticsearchVersion}")
+    //    api("org.codehaus.groovy:groovy:${groovyVersion}")
+    //    api("org.codehaus.groovy:groovy-cli-picocli:${groovyVersion}")
+    //    api("org.codehaus.groovy:groovy-console:${groovyVersion}")
+    //    api("org.codehaus.groovy:groovy-jsr223:${groovyVersion}")
+    //    api("org.codehaus.groovy:groovy-templates:${groovyVersion}")
+    //    api("org.codehaus.groovy:groovysh:${groovyVersion}")
+    //    api("org.elasticsearch:elasticsearch:${elasticsearchVersion}")
+    //    api("org.elasticsearch.client:elasticsearch-rest-client:${elasticsearchVersion}")
+   //     api("co.elastic.clients:elasticsearch-java:${elasticsearchVersion}")
         api("org.codehaus.plexus:plexus-utils:${plexusVersion}")
-        api("org.hdrhistogram:HdrHistogram:${hdrhistogramVersion}")
-        api("org.janusgraph:janusgraph-core:${janusVersion}")
-        api("org.janusgraph:janusgraph-inmemory:${janusVersion}")
-        api("org.janusgraph:janusgraph-driver:${janusVersion}")
+    //    api("org.hdrhistogram:HdrHistogram:${hdrhistogramVersion}")
+    //    api("org.janusgraph:janusgraph-core:${janusVersion}")
+    //    api("org.janusgraph:janusgraph-inmemory:${janusVersion}")
+   //     api("org.janusgraph:janusgraph-driver:${janusVersion}")
         api("org.javassist:${javassistVersion}")
         api("org.postgresql:postgresql:${postgresVersion}")
         api("org.quartz-scheduler:quartz:${quartzVersion}")
@@ -236,15 +236,15 @@ dependencies {
         api("commons-configuration:commons-configuration:${commonsconfigurationVersion}")
         api("org.apache.commons:commons-configuration2:${commonsconfiguration2Version}")
         api("org.hibernate:hibernate-validator:${hibernatevalidatorVersion}")
-        api("org.apache.cassandra:cassandra-all:${cassandraVersion}")
+    //    api("org.apache.cassandra:cassandra-all:${cassandraVersion}")
         api("org.apache.ant:ant:${antVersion}")
         api("com.google.protobuf:protobuf-java:${protobufVersion}")
         api("com.google.code.gson:gson:${gsonVersion}")
         api("com.github.jnr:jnr-posix:${jnrVersion}")
         api("org.apache.logging.log4j:log4j-api:${log4jVersion}")
         api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jacksonjdk8Version}")
 
-        api("org.projectlombok:lombok:${lombokVersion}")
+    //    api("org.projectlombok:lombok:${lombokVersion}")
         api("org.springdoc:springdoc-openapi-starter-webmvc-ui:${springdocStarterVersion}")
         api("io.swagger.core.v3:swagger-annotations-jakarta:${swaggerVersion}")
 
@@ -256,11 +256,11 @@ dependencies {
         api("org.apache.jena:jena-arq:${jenaVersion}")
         api("org.codehaus.jackson:jackson-mapper-asl:${jacksonaslVersion}")
         api("org.codehaus.jackson:jackson-core-asl:${jacksonaslVersion}")
-        api("org.janusgraph:janusgraph-berkeleyje:${janusVersion}")
-        api("org.janusgraph:janusgraph-cql:${janusVersion}")
-        api("org.janusgraph:janusgraph-lucene:${janusVersion}")
-        api("org.janusgraph:janusgraph-es:${janusVersion}")
-        api("org.janusgraph:janusgraph-hbase:${janusVersion}")
+    //    api("org.janusgraph:janusgraph-berkeleyje:${janusVersion}")
+    //    api("org.janusgraph:janusgraph-cql:${janusVersion}")
+    //    api("org.janusgraph:janusgraph-lucene:${janusVersion}")
+    //    api("org.janusgraph:janusgraph-es:${janusVersion}")
+    //    api("org.janusgraph:janusgraph-hbase:${janusVersion}")
         api("org.xerial.snappy:snappy-java:${snappyVersion}")
         api("javax.servlet:javax.servlet-api:${servletVersion}")
         api("io.jsonwebtoken:jjwt-impl:${jwtImplVersion}")
@@ -288,19 +288,19 @@ dependencies {
         api("org.apache.ivy:ivy:2.5.2")
 
         // XTDB Additions
-        api("com.xtdb:xtdb-core:${xtdbVersion}")
-        api("org.clojure:clojure:${clojureVersion}")
+     //   api("com.xtdb:xtdb-core:${xtdbVersion}")
+      //  api("org.clojure:clojure:${clojureVersion}")
         // Dependencies only required if configured to run with these extras: they will be included in the
         // 'jar-with-dependencies' by default, but if you do not need them you can remove them and re-build
         // to get a smaller footprint with less potential CVE exposure.
         // runtimeOnly("org.apache.lucene:lucene-analyzers-common:${luceneVersion}")
-        api("com.xtdb:xtdb-lucene:${xtdbVersion}")
-        api("com.xtdb:xtdb-rocksdb:${xtdbVersion}")
-        api("com.xtdb:xtdb-lmdb:${xtdbVersion}")
-        api("com.xtdb:xtdb-kafka:${xtdbVersion}")
-        api("com.xtdb:xtdb-jdbc:${xtdbVersion}")
-        api("com.xtdb:xtdb-s3:${xtdbVersion}")
-        api("com.xtdb:xtdb-metrics:${xtdbVersion}")
+     //   api("com.xtdb:xtdb-lucene:${xtdbVersion}")
+   //     api("com.xtdb:xtdb-rocksdb:${xtdbVersion}")
+    //    api("com.xtdb:xtdb-lmdb:${xtdbVersion}")
+    //    api("com.xtdb:xtdb-kafka:${xtdbVersion}")
+    //    api("com.xtdb:xtdb-jdbc:${xtdbVersion}")
+    //    api("com.xtdb:xtdb-s3:${xtdbVersion}")
+    //    api("com.xtdb:xtdb-metrics:${xtdbVersion}")
 
         // Add in Egeria's own projects -- not for us, but for our users
         //subprojects.forEach { subProject ->

build.gradle

@@ -38,8 +38,6 @@ allprojects {
     // Only use maven central
     repositories {
         mavenCentral()
-        // used by tink (encrypted filestore connector)
-        google()
     }
 } // end of allProjects
 

open-metadata-distribution/omag-server-platform/build.gradle

@@ -32,7 +32,6 @@ dependencies {
     implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:data-folder-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:jdbc-resource-connector')
-    implementation project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-encrypted-file-store-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:metadata-security-connectors:open-metadata-access-security-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors')
@@ -191,7 +190,6 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:data-folder-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:jdbc-resource-connector').shadowJar }
-                from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-encrypted-file-store-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:file-survey-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:dynamic-archiver-connectors').jar }