Merge branch 'master' into fix/nl.basjes.parse.useragent

Author: relaxedboi

build.gradle

@@ -133,7 +133,7 @@ project.ext.externalDependency = [
     'awsSecretsManagerJdbc': 'com.amazonaws.secretsmanager:aws-secretsmanager-jdbc:1.0.15',
     'awsPostgresIamAuth': 'software.amazon.jdbc:aws-advanced-jdbc-wrapper:2.5.6',
     'awsRds':"software.amazon.awssdk:rds:$awsSdk2Version",
-    'azureIdentityExtensions': 'com.azure:azure-identity-extensions:1.2.5',
+    'azureIdentityExtensions': 'com.azure:azure-identity-extensions:1.2.6',
     'azureIdentity': 'com.azure:azure-identity:1.18.1',
     'cacheApi': 'javax.cache:cache-api:1.1.0',
     'commonsCli': 'commons-cli:commons-cli:1.5.0',

datahub-frontend/gradle.lockfile

@@ -8,7 +8,7 @@ ch.qos.logback:logback-classic:1.5.19=compileClasspath,runtimeClasspath,testComp
 ch.qos.logback:logback-core:1.5.19=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-core-http-netty:1.16.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-core:1.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.azure:azure-identity-extensions:1.2.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.azure:azure-identity-extensions:1.2.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-identity:1.18.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-json:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-xml:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -38,7 +38,7 @@ com.fasterxml.jackson.module:jackson-module-scala_2.13:2.11.4=play
 com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.18.4.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml:classmate:1.3.4=compileClasspath,play
-com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ben-manes.caffeine:caffeine:3.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.ben-manes.caffeine:jcache:2.8.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.luben:zstd-jni:1.5.5-5=compileClasspath,testCompileClasspath
 com.github.luben:zstd-jni:1.5.6-6=runtimeClasspath,testRuntimeClasspath
@@ -52,7 +52,7 @@ com.google.code.gson:gson:2.11.0=runtimeClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.2.4=javaScriptCompiler
 com.google.code.gson:gson:2.8.9=compileClasspath,testCompileClasspath
 com.google.errorprone:error_prone_annotations:2.21.1=spotless865458226
-com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.40.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.errorprone:error_prone_annotations:2.5.1=play
 com.google.googlejavaformat:google-java-format:1.18.1=spotless865458226
 com.google.guava:failureaccess:1.0.1=play,spotless865458226
@@ -290,8 +290,8 @@ net.sourceforge.htmlunit:htmlunit-cssparser:1.12.0=testCompileClasspath,testRunt
 net.sourceforge.htmlunit:htmlunit-xpath:2.67.0=testCompileClasspath,testRuntimeClasspath
 net.sourceforge.htmlunit:htmlunit:2.67.0=testCompileClasspath,testRuntimeClasspath
 net.sourceforge.htmlunit:neko-htmlunit:2.67.0=testCompileClasspath,testRuntimeClasspath
-nl.basjes.collections:prefixmap:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-nl.basjes.parse.useragent:yauaa:7.29.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+nl.basjes.collections:prefixmap:2.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+nl.basjes.parse.useragent:yauaa:7.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 no.nav.security:mock-oauth2-server:2.1.9=testCompileClasspath,testRuntimeClasspath
 org.abego.treelayout:org.abego.treelayout.core:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:ST4:4.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -356,7 +356,7 @@ org.bouncycastle:bcpkix-jdk18on:1.78.1=testRuntimeClasspath
 org.bouncycastle:bcprov-jdk18on:1.78.1=testRuntimeClasspath
 org.bouncycastle:bcutil-jdk18on:1.78.1=testRuntimeClasspath
 org.brotli:dec:0.1.2=testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,spotless865458226,testCompileClasspath,testRuntimeClasspath
+org.checkerframework:checker-qual:3.37.0=spotless865458226
 org.checkerframework:checker-qual:3.8.0=play
 org.codehaus.jackson:jackson-core-asl:1.8.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath

datahub-graphql-core/gradle.lockfile

@@ -18,7 +18,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.4=compileClasspat
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.18.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ben-manes.caffeine:caffeine:3.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.java-json-tools:btf:1.3=runtimeClasspath,testRuntimeClasspath
 com.github.java-json-tools:jackson-coreutils:2.0=runtimeClasspath,testRuntimeClasspath
 com.github.java-json-tools:json-patch:1.13=runtimeClasspath,testRuntimeClasspath
@@ -38,7 +38,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,spotless
 com.google.code.gson:gson:2.11.0=runtimeClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.8.9=compileClasspath,testCompileClasspath
 com.google.errorprone:error_prone_annotations:2.21.1=spotless865458226
-com.google.errorprone:error_prone_annotations:2.30.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.40.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.googlejavaformat:google-java-format:1.18.1=spotless865458226
 com.google.guava:failureaccess:1.0.1=spotless865458226
 com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -233,8 +233,8 @@ net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.openhft:zero-allocation-hashing:0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.sf.jopt-simple:jopt-simple:5.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-nl.basjes.collections:prefixmap:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-nl.basjes.parse.useragent:yauaa:7.29.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+nl.basjes.collections:prefixmap:2.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+nl.basjes.parse.useragent:yauaa:7.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.abego.treelayout:org.abego.treelayout.core:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:ST4:4.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr-runtime:3.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -304,6 +304,7 @@ org.jacoco:org.jacoco.report:0.8.12=jacocoAnt
 org.javassist:javassist:3.26.0-GA=runtimeClasspath,testRuntimeClasspath
 org.javatuples:javatuples:1.2=runtimeClasspath,testRuntimeClasspath
 org.json:json:20231013=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.knowm.xchart:xchart:3.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.locationtech.jts:jts-core:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

datahub-graphql-core/src/main/resources/entity.graphql

@@ -3072,6 +3072,16 @@ enum FabricType {
   Designates sandbox fabrics
   """
   SANDBOX
+
+  """
+  Designates alternative spelling PROD
+  """
+  PRD
+
+  """
+  Designates alternative spelling TEST
+  """
+  TST
 }
 
 """

datahub-upgrade/gradle.lockfile

@@ -14,7 +14,7 @@ com.amazonaws:aws-java-sdk-sts:1.12.660=productionRuntimeClasspath,runtimeClassp
 com.amazonaws:jmespath-java:1.12.660=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.azure:azure-core-http-netty:1.16.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-core:1.57.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.azure:azure-identity-extensions:1.2.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.azure:azure-identity-extensions:1.2.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-identity:1.18.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-json:1.5.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.azure:azure-xml:1.2.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -39,7 +39,7 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.4=compileClasspath,
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.18.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.18.4.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.woodstox:woodstox-core:6.4.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ben-manes.caffeine:caffeine:3.2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.erosb:everit-json-schema:1.14.5=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.github.java-json-tools:btf:1.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.github.java-json-tools:jackson-coreutils:2.0=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
@@ -60,8 +60,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,productionRuntimeClasspat
 com.google.code.gson:gson:2.12.0=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.9.0=compileClasspath,testCompileClasspath
 com.google.errorprone:error_prone_annotations:2.21.1=spotless865458226
-com.google.errorprone:error_prone_annotations:2.30.0=compileClasspath,testCompileClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.40.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.googlejavaformat:google-java-format:1.18.1=spotless865458226
 com.google.guava:failureaccess:1.0.1=spotless865458226
 com.google.guava:failureaccess:1.0.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -336,8 +335,8 @@ net.minidev:accessors-smart:2.5.2=testCompileClasspath,testRuntimeClasspath
 net.minidev:json-smart:2.5.2=testCompileClasspath,testRuntimeClasspath
 net.openhft:zero-allocation-hashing:0.7=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.sf.jopt-simple:jopt-simple:5.0.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-nl.basjes.collections:prefixmap:2.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-nl.basjes.parse.useragent:yauaa:7.29.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+nl.basjes.collections:prefixmap:2.1.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+nl.basjes.parse.useragent:yauaa:7.32.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.abego.treelayout:org.abego.treelayout.core:1.0.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:ST4:4.3.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr-runtime:3.5.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -469,6 +468,7 @@ org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=productionRuntimeClasspat
 org.jetbrains:annotations:13.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jline:jline:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.json:json:20231013=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.11.4=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testRuntimeClasspath

ingestion-scheduler/gradle.lockfile

@@ -18,7 +18,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.4=compileClasspat
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.18.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ben-manes.caffeine:caffeine:3.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.java-json-tools:btf:1.3=runtimeClasspath,testRuntimeClasspath
 com.github.java-json-tools:jackson-coreutils:2.0=runtimeClasspath,testRuntimeClasspath
 com.github.java-json-tools:json-patch:1.13=runtimeClasspath,testRuntimeClasspath
@@ -38,7 +38,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,spotless
 com.google.code.gson:gson:2.11.0=runtimeClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.8.9=compileClasspath,testCompileClasspath
 com.google.errorprone:error_prone_annotations:2.21.1=spotless865458226
-com.google.errorprone:error_prone_annotations:2.30.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.40.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.googlejavaformat:google-java-format:1.18.1=spotless865458226
 com.google.guava:failureaccess:1.0.1=spotless865458226
 com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -231,8 +231,8 @@ net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.openhft:zero-allocation-hashing:0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.sf.jopt-simple:jopt-simple:5.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-nl.basjes.collections:prefixmap:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-nl.basjes.parse.useragent:yauaa:7.29.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+nl.basjes.collections:prefixmap:2.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+nl.basjes.parse.useragent:yauaa:7.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.abego.treelayout:org.abego.treelayout.core:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:ST4:4.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr-runtime:3.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -300,6 +300,7 @@ org.jacoco:org.jacoco.report:0.8.12=jacocoAnt
 org.javassist:javassist:3.26.0-GA=runtimeClasspath,testRuntimeClasspath
 org.javatuples:javatuples:1.2=runtimeClasspath,testRuntimeClasspath
 org.json:json:20231013=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.knowm.xchart:xchart:3.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.locationtech.jts:jts-core:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath