From 7cfd3d1b1d6274926682f72ae56b91724f6e5562 Mon Sep 17 00:00:00 2001 From: rj77259 <141829236+rj77259@users.noreply.github.com> Date: Mon, 22 Jul 2024 10:58:40 +0000 Subject: [PATCH 01/32] inital commit --- .../uk/gov/gchq/gaffer/store/StoreTest.java | 8 +- .../dependency-reduced-pom.xml | 346 ++++++++++++++++++ .../bitmap-library/dependency-reduced-pom.xml | 154 ++++++++ .../dependency-reduced-pom.xml | 175 +++++++++ library/sketches-library/pom.xml | 8 + .../dependency-reduced-pom.xml | 246 +++++++++++++ .../time-library/dependency-reduced-pom.xml | 152 ++++++++ pom.xml | 92 ++++- .../accumulo-store/dependency-reduced-pom.xml | 322 ++++++++++++++++ 9 files changed, 1482 insertions(+), 21 deletions(-) create mode 100644 example/road-traffic/road-traffic-generators/dependency-reduced-pom.xml create mode 100644 library/bitmap-library/dependency-reduced-pom.xml create mode 100644 library/sketches-library/dependency-reduced-pom.xml create mode 100644 library/spark/spark-accumulo-library/dependency-reduced-pom.xml create mode 100644 library/time-library/dependency-reduced-pom.xml create mode 100644 store-implementation/accumulo-store/dependency-reduced-pom.xml diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java index 2eaafd8c112..772440b7b16 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java @@ -527,9 +527,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina assertThat(supportedOperations).isNotNull(); final List> expectedOperations = - Lists.newArrayList(AddElements.class, - GetElements.class, - GetAdjacentIds.class, + Lists.newArrayList( GetAllElements.class, mock(AddElements.class).getClass(), @@ -639,9 +637,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin assertThat(supportedOperations).isNotNull(); final List> expectedOperations = - Lists.newArrayList(AddElements.class, - GetElements.class, - GetAdjacentIds.class, + Lists.newArrayList( GetAllElements.class, mock(AddElements.class).getClass(), diff --git a/example/road-traffic/road-traffic-generators/dependency-reduced-pom.xml b/example/road-traffic/road-traffic-generators/dependency-reduced-pom.xml new file mode 100644 index 00000000000..289ce07edb4 --- /dev/null +++ b/example/road-traffic/road-traffic-generators/dependency-reduced-pom.xml @@ -0,0 +1,346 @@ + + + + road-traffic + uk.gov.gchq.gaffer + 2.2.5-SNAPSHOT + + 4.0.0 + road-traffic-generators + + + + maven-shade-plugin + ${shade.plugin.version} + + + full + ${shaded.jar.phase} + + shade + + + true + utility + + + uk.gov.gchq.gaffer.traffic.generator.* + org.apache.commons:commons-csv + + + + + + + + + + + uk.gov.gchq.gaffer + road-traffic-model + 2.2.5-SNAPSHOT + compile + + + uk.gov.gchq.gaffer + graph + 2.2.5-SNAPSHOT + compile + + + uk.gov.gchq.gaffer + common-util + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + data + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + accumulo-store + 2.2.5-SNAPSHOT + test + + + hdfs-library + uk.gov.gchq.gaffer + + + accumulo-core + org.apache.accumulo + + + + + uk.gov.gchq.gaffer + accumulo-store + 2.2.5-SNAPSHOT + test-jar + test + + + org.apache.accumulo + accumulo-minicluster + 2.0.1 + test + + + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + accumulo-monitor + org.apache.accumulo + + + jcommander + com.beust + + + accumulo-gc + org.apache.accumulo + + + accumulo-master + org.apache.accumulo + + + accumulo-server-base + org.apache.accumulo + + + accumulo-start + org.apache.accumulo + + + accumulo-tracer + org.apache.accumulo + + + accumulo-tserver + org.apache.accumulo + + + commons-configuration2 + org.apache.commons + + + hadoop-client-api + org.apache.hadoop + + + libthrift + org.apache.thrift + + + zookeeper + org.apache.zookeeper + + + hadoop-client-runtime + org.apache.hadoop + + + + + org.apache.hadoop + hadoop-hdfs + 3.3.3 + test + + + jersey-grizzly2 + com.sun.jersey + + + jersey-json + com.sun.jersey + + + jersey-server + com.sun.jersey + + + jersey-client + com.sun.jersey + + + jersey-core + com.sun.jersey + + + servlet-api + javax.servlet + + + jetty-util + org.mortbay.jetty + + + avro-ipc + org.apache.avro + + + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + hadoop-shaded-guava + org.apache.hadoop.thirdparty + + + jetty-server + org.eclipse.jetty + + + jetty-util + org.eclipse.jetty + + + jetty-util-ajax + org.eclipse.jetty + + + commons-cli + commons-cli + + + commons-logging + commons-logging + + + commons-daemon + commons-daemon + + + protobuf-java + com.google.protobuf + + + javax.servlet-api + javax.servlet + + + netty + io.netty + + + netty-all + io.netty + + + leveldbjni-all + org.fusesource.leveldbjni + + + + + uk.gov.gchq.gaffer + time-library + 2.2.5-SNAPSHOT + test + + + bitmap-library + uk.gov.gchq.gaffer + + + + + com.google.guava + guava + 33.2.1-jre + compile + + + org.slf4j + slf4j-api + 1.7.36 + compile + + + org.slf4j + slf4j-reload4j + 1.7.36 + compile + + + org.junit.jupiter + junit-jupiter + 5.11.0-M2 + test + + + junit-jupiter-api + org.junit.jupiter + + + junit-jupiter-params + org.junit.jupiter + + + + + org.junit.jupiter + junit-jupiter-engine + 5.11.0-M2 + test + + + junit-platform-engine + org.junit.platform + + + apiguardian-api + org.apiguardian + + + junit-jupiter-api + org.junit.jupiter + + + + + org.assertj + assertj-core + 3.26.3 + test + + + byte-buddy + net.bytebuddy + + + + + org.mockito + mockito-junit-jupiter + 5.12.0 + test + + + mockito-core + org.mockito + + + junit-jupiter-api + org.junit.jupiter + + + + + diff --git a/library/bitmap-library/dependency-reduced-pom.xml b/library/bitmap-library/dependency-reduced-pom.xml new file mode 100644 index 00000000000..2f614f53400 --- /dev/null +++ b/library/bitmap-library/dependency-reduced-pom.xml @@ -0,0 +1,154 @@ + + + + library + uk.gov.gchq.gaffer + 2.2.5-SNAPSHOT + + 4.0.0 + bitmap-library + + + + maven-shade-plugin + ${shade.plugin.version} + + + deploy + ${shaded.jar.phase} + + shade + + + true + deploy + + + org.roaringbitmap:RoaringBitmap + + + + + com.fasterxml.jackson + hidden.com.fasterxml.jackson + + + + + + + + + + + uk.gov.gchq.gaffer + serialisation + 2.2.5-SNAPSHOT + compile + + + uk.gov.gchq.koryphe + core + 2.5.2 + jdk8 + compile + + + uk.gov.gchq.koryphe + core + 2.5.2 + test-jar + tests-jdk8 + test + + + uk.gov.gchq.gaffer + serialisation + 2.2.5-SNAPSHOT + test-jar + test + + + com.google.guava + guava + 33.2.1-jre + compile + + + org.slf4j + slf4j-api + 1.7.36 + compile + + + org.slf4j + slf4j-reload4j + 1.7.36 + compile + + + org.junit.jupiter + junit-jupiter + 5.11.0-M2 + test + + + junit-jupiter-api + org.junit.jupiter + + + junit-jupiter-params + org.junit.jupiter + + + + + org.junit.jupiter + junit-jupiter-engine + 5.11.0-M2 + test + + + junit-platform-engine + org.junit.platform + + + apiguardian-api + org.apiguardian + + + junit-jupiter-api + org.junit.jupiter + + + + + org.assertj + assertj-core + 3.26.3 + test + + + byte-buddy + net.bytebuddy + + + + + org.mockito + mockito-junit-jupiter + 5.12.0 + test + + + mockito-core + org.mockito + + + junit-jupiter-api + org.junit.jupiter + + + + + diff --git a/library/sketches-library/dependency-reduced-pom.xml b/library/sketches-library/dependency-reduced-pom.xml new file mode 100644 index 00000000000..37b956aae22 --- /dev/null +++ b/library/sketches-library/dependency-reduced-pom.xml @@ -0,0 +1,175 @@ + + + + library + uk.gov.gchq.gaffer + 2.2.5-SNAPSHOT + + 4.0.0 + sketches-library + + + + maven-shade-plugin + ${shade.plugin.version} + + + deploy + ${shaded.jar.phase} + + shade + + + true + deploy + + + com.clearspring.analytics:stream + org.apache.datasketches:* + + + + + com.fasterxml.jackson + hidden.com.fasterxml.jackson + + + + + + + + + + + uk.gov.gchq.gaffer + serialisation + 2.2.5-SNAPSHOT + compile + + + uk.gov.gchq.gaffer + data + 2.2.5-SNAPSHOT + compile + + + uk.gov.gchq.koryphe + core + 2.5.2 + jdk8 + compile + + + org.apache.datasketches + datasketches-memory + 2.2.1 + pom + compile + + + uk.gov.gchq.koryphe + core + 2.5.2 + test-jar + tests-jdk8 + test + + + uk.gov.gchq.gaffer + common-util + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + serialisation + 2.2.5-SNAPSHOT + test-jar + test + + + com.google.guava + guava + 33.2.1-jre + compile + + + org.slf4j + slf4j-api + 1.7.36 + compile + + + org.slf4j + slf4j-reload4j + 1.7.36 + compile + + + org.junit.jupiter + junit-jupiter + 5.11.0-M2 + test + + + junit-jupiter-api + org.junit.jupiter + + + junit-jupiter-params + org.junit.jupiter + + + + + org.junit.jupiter + junit-jupiter-engine + 5.11.0-M2 + test + + + junit-platform-engine + org.junit.platform + + + apiguardian-api + org.apiguardian + + + junit-jupiter-api + org.junit.jupiter + + + + + org.assertj + assertj-core + 3.26.3 + test + + + byte-buddy + net.bytebuddy + + + + + org.mockito + mockito-junit-jupiter + 5.12.0 + test + + + mockito-core + org.mockito + + + junit-jupiter-api + org.junit.jupiter + + + + + diff --git a/library/sketches-library/pom.xml b/library/sketches-library/pom.xml index 51a27aff5d5..5dcc2d6e8a7 100644 --- a/library/sketches-library/pom.xml +++ b/library/sketches-library/pom.xml @@ -51,6 +51,14 @@ datasketches-java ${datasketches.version} + + + org.apache.datasketches + datasketches-memory + 2.2.1 + pom + + diff --git a/library/spark/spark-accumulo-library/dependency-reduced-pom.xml b/library/spark/spark-accumulo-library/dependency-reduced-pom.xml new file mode 100644 index 00000000000..1fb5f426068 --- /dev/null +++ b/library/spark/spark-accumulo-library/dependency-reduced-pom.xml @@ -0,0 +1,246 @@ + + + + spark + uk.gov.gchq.gaffer + 2.2.5-SNAPSHOT + + 4.0.0 + spark-accumulo-library + + + + maven-shade-plugin + ${shade.plugin.version} + + + full + ${shaded.jar.phase} + + shade + + + true + full${append.shaded.classifier} + + + org.apache.spark:* + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + + + + uk.gov.gchq.gaffer + common-util + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + serialisation + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + operation + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + data + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + accumulo-store + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + spark-library + 2.2.5-SNAPSHOT + test-jar + test + + + org.apache.accumulo + accumulo-minicluster + 2.0.1 + test + + + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + accumulo-monitor + org.apache.accumulo + + + accumulo-gc + org.apache.accumulo + + + accumulo-master + org.apache.accumulo + + + accumulo-server-base + org.apache.accumulo + + + accumulo-tracer + org.apache.accumulo + + + accumulo-tserver + org.apache.accumulo + + + + + org.apache.hadoop + hadoop-hdfs + 3.3.3 + test + + + jersey-grizzly2 + com.sun.jersey + + + jersey-json + com.sun.jersey + + + jersey-server + com.sun.jersey + + + jersey-client + com.sun.jersey + + + jersey-core + com.sun.jersey + + + servlet-api + javax.servlet + + + jetty-util + org.mortbay.jetty + + + avro-ipc + org.apache.avro + + + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + commons-daemon + commons-daemon + + + + + org.junit.jupiter + junit-jupiter + 5.11.0-M2 + test + + + junit-jupiter-api + org.junit.jupiter + + + junit-jupiter-params + org.junit.jupiter + + + + + org.junit.jupiter + junit-jupiter-engine + 5.11.0-M2 + test + + + junit-platform-engine + org.junit.platform + + + apiguardian-api + org.apiguardian + + + junit-jupiter-api + org.junit.jupiter + + + + + org.assertj + assertj-core + 3.26.3 + test + + + byte-buddy + net.bytebuddy + + + + + org.mockito + mockito-junit-jupiter + 5.12.0 + test + + + mockito-core + org.mockito + + + junit-jupiter-api + org.junit.jupiter + + + + + diff --git a/library/time-library/dependency-reduced-pom.xml b/library/time-library/dependency-reduced-pom.xml new file mode 100644 index 00000000000..5054186e5a7 --- /dev/null +++ b/library/time-library/dependency-reduced-pom.xml @@ -0,0 +1,152 @@ + + + + library + uk.gov.gchq.gaffer + 2.2.5-SNAPSHOT + + 4.0.0 + time-library + + + + maven-shade-plugin + ${shade.plugin.version} + + + deploy + ${shaded.jar.phase} + + shade + + + true + deploy + + + org.roaringbitmap:RoaringBitmap + uk.gov.gchq.gaffer:bitmap-library + uk.gov.gchq.gaffer:sketches-library + com.clearspring.analytics:stream + org.apache.datasketches:datasketches-java + + + + + com.fasterxml.jackson + hidden.com.fasterxml.jackson + + + + + + + + + + + uk.gov.gchq.gaffer + serialisation + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + common-util + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.koryphe + core + 2.5.2 + test-jar + tests-jdk8 + test + + + com.google.guava + guava + 33.2.1-jre + compile + + + org.slf4j + slf4j-api + 1.7.36 + compile + + + org.slf4j + slf4j-reload4j + 1.7.36 + compile + + + org.junit.jupiter + junit-jupiter + 5.11.0-M2 + test + + + junit-jupiter-api + org.junit.jupiter + + + junit-jupiter-params + org.junit.jupiter + + + + + org.junit.jupiter + junit-jupiter-engine + 5.11.0-M2 + test + + + junit-platform-engine + org.junit.platform + + + apiguardian-api + org.apiguardian + + + junit-jupiter-api + org.junit.jupiter + + + + + org.assertj + assertj-core + 3.26.3 + test + + + byte-buddy + net.bytebuddy + + + + + org.mockito + mockito-junit-jupiter + 5.12.0 + test + + + mockito-core + org.mockito + + + junit-jupiter-api + org.junit.jupiter + + + + + diff --git a/pom.xml b/pom.xml index 25626464c92..ce9c214c821 100644 --- a/pom.xml +++ b/pom.xml @@ -50,28 +50,28 @@ - 1.8 + 11 - 5.9.3 - 1.9.3 - 3.24.2 - 4.11.0 + 5.11.0-M2 + 1.11.0-M2 + 3.26.3 + 5.12.0 1.7.36 - 2.11 - ${scala.minor.version}.12 - 2.4 - ${spark.minor.version}.5 + 3.0 + ${spark.minor.version}.3 + 2.12 + ${scala.minor.version}.15 2.5.2 2.0.1 1.8.2 3.3.3 - 2.13.5 + 2.17.2 - 2.7.0 - 4.0.0 + 2.9.8 + 6.0.0 1.15 2.11.0 3.12.0 @@ -82,7 +82,7 @@ 4.4 1.10.0 2.13.0 - 30.1.1-jre + 33.2.1-jre 3.29.2-GA 1.1.1 1.3.2 @@ -120,9 +120,9 @@ 1.6.8 3.0.0-M5 3.1.0 - 3.2.4 + 3.6.0 3.2.1 - 3.1.2 + 3.3.1 3.1.2 1.9.10 3.1.0 @@ -199,6 +199,13 @@ jackson-databind ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + 2.17.2 + + com.fasterxml.jackson.core jackson-core @@ -837,6 +844,11 @@ + + org.owasp + dependency-check-maven + 10.0.3 + org.apache.maven.plugins maven-release-plugin @@ -1117,6 +1129,31 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + ${enforcer.plugin.version} + + + enforce-compatible-hadoop + + enforce + + + + + + org.apache.hadoop:*:(,2.9.9] + + + Hadoop versions below 3.3.0 are incompatible with JDK 11, JDK 8 must be used with the legacy profile + + + + + + + org.apache.maven.plugins maven-enforcer-plugin @@ -1560,6 +1597,31 @@ ${failsafeArgLine} + + org.apache.maven.plugins + maven-enforcer-plugin + ${enforcer.plugin.version} + + + enforce-compatible-hadoop + + enforce + + + + + + org.apache.hadoop:*:(,2.9.9] + + + Hadoop versions below 3.3.0 are incompatible with JDK 11, JDK 8 must be used with the legacy profile + + + + + + + org.jacoco jacoco-maven-plugin diff --git a/store-implementation/accumulo-store/dependency-reduced-pom.xml b/store-implementation/accumulo-store/dependency-reduced-pom.xml new file mode 100644 index 00000000000..94db92f66a4 --- /dev/null +++ b/store-implementation/accumulo-store/dependency-reduced-pom.xml @@ -0,0 +1,322 @@ + + + + store-implementation + uk.gov.gchq.gaffer + 2.2.5-SNAPSHOT + + 4.0.0 + accumulo-store + + + + maven-shade-plugin + ${shade.plugin.version} + + + iterators + ${shaded.jar.phase} + + shade + + + true + iterators${append.shaded.classifier} + + + uk.gov.gchq.koryphe* + uk.gov.gchq.gaffer* + com.google.guava:* + org.apache.commons:commons-lang3 + com.fasterxml.jackson.*:* + com.clearspring.analytics:stream + com.yahoo.* + io.github.lukehutch* + + + + + com.fasterxml.jackson + hidden.com.fasterxml.jackson + + + org.apache.commons.lang3 + hidden.org.apache.commons.lang3 + + + com.google + hidden.com.google + + + + + + utility + package + + shade + + + true + utility${append.shaded.classifier} + + + + + + + + + org.apache.accumulo + accumulo-minicluster + 2.0.1 + test + + + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + accumulo-monitor + org.apache.accumulo + + + accumulo-gc + org.apache.accumulo + + + accumulo-master + org.apache.accumulo + + + accumulo-server-base + org.apache.accumulo + + + accumulo-tracer + org.apache.accumulo + + + accumulo-tserver + org.apache.accumulo + + + + + uk.gov.gchq.gaffer + store + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + data + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + graph + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + operation + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + common-util + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + integration-test + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + integration-test + 2.2.5-SNAPSHOT + test + + + uk.gov.gchq.gaffer + serialisation + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + hdfs-library + 2.2.5-SNAPSHOT + test-jar + test + + + uk.gov.gchq.gaffer + map-store + 2.2.5-SNAPSHOT + test + + + org.apache.hadoop + hadoop-hdfs + 3.3.3 + test + + + jersey-grizzly2 + com.sun.jersey + + + jersey-json + com.sun.jersey + + + jersey-server + com.sun.jersey + + + jersey-client + com.sun.jersey + + + jersey-core + com.sun.jersey + + + servlet-api + javax.servlet + + + jetty-util + org.mortbay.jetty + + + avro-ipc + org.apache.avro + + + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + commons-daemon + commons-daemon + + + netty + io.netty + + + netty-all + io.netty + + + leveldbjni-all + org.fusesource.leveldbjni + + + + + org.junit.platform + junit-platform-suite + 1.11.0-M2 + test + + + junit-platform-suite-api + org.junit.platform + + + junit-platform-suite-engine + org.junit.platform + + + + + org.junit.jupiter + junit-jupiter + 5.11.0-M2 + test + + + junit-jupiter-api + org.junit.jupiter + + + junit-jupiter-params + org.junit.jupiter + + + + + org.junit.jupiter + junit-jupiter-engine + 5.11.0-M2 + test + + + junit-platform-engine + org.junit.platform + + + apiguardian-api + org.apiguardian + + + junit-jupiter-api + org.junit.jupiter + + + + + org.assertj + assertj-core + 3.26.3 + test + + + byte-buddy + net.bytebuddy + + + + + org.mockito + mockito-junit-jupiter + 5.12.0 + test + + + mockito-core + org.mockito + + + junit-jupiter-api + org.junit.jupiter + + + + + From e26062da0dacd074c7041cfef8653eaf179150d7 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:00:02 +0000 Subject: [PATCH 02/32] tweaks --- core/common-util/pom.xml | 1 - core/data/pom.xml | 2 - core/operation/pom.xml | 1 - core/type/pom.xml | 2 - .../dependency-reduced-pom.xml | 346 ------------------ .../bitmap-library/dependency-reduced-pom.xml | 154 -------- library/bitmap-library/pom.xml | 2 - .../dependency-reduced-pom.xml | 175 --------- library/sketches-library/pom.xml | 2 - .../dependency-reduced-pom.xml | 246 ------------- .../time-library/dependency-reduced-pom.xml | 152 -------- library/time-library/pom.xml | 1 - library/tinkerpop/pom.xml | 3 +- pom.xml | 70 +--- rest-api/common-rest/pom.xml | 1 - .../accumulo-store/dependency-reduced-pom.xml | 322 ---------------- store-implementation/accumulo-store/pom.xml | 4 +- 17 files changed, 9 insertions(+), 1475 deletions(-) delete mode 100644 example/road-traffic/road-traffic-generators/dependency-reduced-pom.xml delete mode 100644 library/bitmap-library/dependency-reduced-pom.xml delete mode 100644 library/sketches-library/dependency-reduced-pom.xml delete mode 100644 library/spark/spark-accumulo-library/dependency-reduced-pom.xml delete mode 100644 library/time-library/dependency-reduced-pom.xml delete mode 100644 store-implementation/accumulo-store/dependency-reduced-pom.xml diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml index 36dd693b4c1..207deb50b76 100644 --- a/core/common-util/pom.xml +++ b/core/common-util/pom.xml @@ -46,7 +46,6 @@ uk.gov.gchq.koryphe core - jdk8 diff --git a/core/data/pom.xml b/core/data/pom.xml index 794f2f1b275..78292405574 100644 --- a/core/data/pom.xml +++ b/core/data/pom.xml @@ -29,7 +29,6 @@ uk.gov.gchq.koryphe core - jdk8 uk.gov.gchq.gaffer @@ -67,7 +66,6 @@ uk.gov.gchq.koryphe core - tests-jdk8 test-jar test diff --git a/core/operation/pom.xml b/core/operation/pom.xml index 7ff19df5b64..cad0049f049 100644 --- a/core/operation/pom.xml +++ b/core/operation/pom.xml @@ -58,7 +58,6 @@ uk.gov.gchq.koryphe core - tests-jdk8 test-jar test diff --git a/core/type/pom.xml b/core/type/pom.xml index 04f82cef686..78ea6c79f41 100644 --- a/core/type/pom.xml +++ b/core/type/pom.xml @@ -34,14 +34,12 @@ uk.gov.gchq.koryphe core - jdk8 uk.gov.gchq.koryphe core - tests-jdk8 test-jar test diff --git a/example/road-traffic/road-traffic-generators/dependency-reduced-pom.xml b/example/road-traffic/road-traffic-generators/dependency-reduced-pom.xml deleted file mode 100644 index 289ce07edb4..00000000000 --- a/example/road-traffic/road-traffic-generators/dependency-reduced-pom.xml +++ /dev/null @@ -1,346 +0,0 @@ - - - - road-traffic - uk.gov.gchq.gaffer - 2.2.5-SNAPSHOT - - 4.0.0 - road-traffic-generators - - - - maven-shade-plugin - ${shade.plugin.version} - - - full - ${shaded.jar.phase} - - shade - - - true - utility - - - uk.gov.gchq.gaffer.traffic.generator.* - org.apache.commons:commons-csv - - - - - - - - - - - uk.gov.gchq.gaffer - road-traffic-model - 2.2.5-SNAPSHOT - compile - - - uk.gov.gchq.gaffer - graph - 2.2.5-SNAPSHOT - compile - - - uk.gov.gchq.gaffer - common-util - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - data - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - accumulo-store - 2.2.5-SNAPSHOT - test - - - hdfs-library - uk.gov.gchq.gaffer - - - accumulo-core - org.apache.accumulo - - - - - uk.gov.gchq.gaffer - accumulo-store - 2.2.5-SNAPSHOT - test-jar - test - - - org.apache.accumulo - accumulo-minicluster - 2.0.1 - test - - - slf4j-log4j12 - org.slf4j - - - log4j - log4j - - - accumulo-monitor - org.apache.accumulo - - - jcommander - com.beust - - - accumulo-gc - org.apache.accumulo - - - accumulo-master - org.apache.accumulo - - - accumulo-server-base - org.apache.accumulo - - - accumulo-start - org.apache.accumulo - - - accumulo-tracer - org.apache.accumulo - - - accumulo-tserver - org.apache.accumulo - - - commons-configuration2 - org.apache.commons - - - hadoop-client-api - org.apache.hadoop - - - libthrift - org.apache.thrift - - - zookeeper - org.apache.zookeeper - - - hadoop-client-runtime - org.apache.hadoop - - - - - org.apache.hadoop - hadoop-hdfs - 3.3.3 - test - - - jersey-grizzly2 - com.sun.jersey - - - jersey-json - com.sun.jersey - - - jersey-server - com.sun.jersey - - - jersey-client - com.sun.jersey - - - jersey-core - com.sun.jersey - - - servlet-api - javax.servlet - - - jetty-util - org.mortbay.jetty - - - avro-ipc - org.apache.avro - - - slf4j-log4j12 - org.slf4j - - - log4j - log4j - - - hadoop-shaded-guava - org.apache.hadoop.thirdparty - - - jetty-server - org.eclipse.jetty - - - jetty-util - org.eclipse.jetty - - - jetty-util-ajax - org.eclipse.jetty - - - commons-cli - commons-cli - - - commons-logging - commons-logging - - - commons-daemon - commons-daemon - - - protobuf-java - com.google.protobuf - - - javax.servlet-api - javax.servlet - - - netty - io.netty - - - netty-all - io.netty - - - leveldbjni-all - org.fusesource.leveldbjni - - - - - uk.gov.gchq.gaffer - time-library - 2.2.5-SNAPSHOT - test - - - bitmap-library - uk.gov.gchq.gaffer - - - - - com.google.guava - guava - 33.2.1-jre - compile - - - org.slf4j - slf4j-api - 1.7.36 - compile - - - org.slf4j - slf4j-reload4j - 1.7.36 - compile - - - org.junit.jupiter - junit-jupiter - 5.11.0-M2 - test - - - junit-jupiter-api - org.junit.jupiter - - - junit-jupiter-params - org.junit.jupiter - - - - - org.junit.jupiter - junit-jupiter-engine - 5.11.0-M2 - test - - - junit-platform-engine - org.junit.platform - - - apiguardian-api - org.apiguardian - - - junit-jupiter-api - org.junit.jupiter - - - - - org.assertj - assertj-core - 3.26.3 - test - - - byte-buddy - net.bytebuddy - - - - - org.mockito - mockito-junit-jupiter - 5.12.0 - test - - - mockito-core - org.mockito - - - junit-jupiter-api - org.junit.jupiter - - - - - diff --git a/library/bitmap-library/dependency-reduced-pom.xml b/library/bitmap-library/dependency-reduced-pom.xml deleted file mode 100644 index 2f614f53400..00000000000 --- a/library/bitmap-library/dependency-reduced-pom.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - library - uk.gov.gchq.gaffer - 2.2.5-SNAPSHOT - - 4.0.0 - bitmap-library - - - - maven-shade-plugin - ${shade.plugin.version} - - - deploy - ${shaded.jar.phase} - - shade - - - true - deploy - - - org.roaringbitmap:RoaringBitmap - - - - - com.fasterxml.jackson - hidden.com.fasterxml.jackson - - - - - - - - - - - uk.gov.gchq.gaffer - serialisation - 2.2.5-SNAPSHOT - compile - - - uk.gov.gchq.koryphe - core - 2.5.2 - jdk8 - compile - - - uk.gov.gchq.koryphe - core - 2.5.2 - test-jar - tests-jdk8 - test - - - uk.gov.gchq.gaffer - serialisation - 2.2.5-SNAPSHOT - test-jar - test - - - com.google.guava - guava - 33.2.1-jre - compile - - - org.slf4j - slf4j-api - 1.7.36 - compile - - - org.slf4j - slf4j-reload4j - 1.7.36 - compile - - - org.junit.jupiter - junit-jupiter - 5.11.0-M2 - test - - - junit-jupiter-api - org.junit.jupiter - - - junit-jupiter-params - org.junit.jupiter - - - - - org.junit.jupiter - junit-jupiter-engine - 5.11.0-M2 - test - - - junit-platform-engine - org.junit.platform - - - apiguardian-api - org.apiguardian - - - junit-jupiter-api - org.junit.jupiter - - - - - org.assertj - assertj-core - 3.26.3 - test - - - byte-buddy - net.bytebuddy - - - - - org.mockito - mockito-junit-jupiter - 5.12.0 - test - - - mockito-core - org.mockito - - - junit-jupiter-api - org.junit.jupiter - - - - - diff --git a/library/bitmap-library/pom.xml b/library/bitmap-library/pom.xml index 1ffc9f9c7f9..9a3f14500e0 100644 --- a/library/bitmap-library/pom.xml +++ b/library/bitmap-library/pom.xml @@ -34,7 +34,6 @@ uk.gov.gchq.koryphe core - jdk8 org.roaringbitmap @@ -45,7 +44,6 @@ uk.gov.gchq.koryphe core - tests-jdk8 test-jar test diff --git a/library/sketches-library/dependency-reduced-pom.xml b/library/sketches-library/dependency-reduced-pom.xml deleted file mode 100644 index 37b956aae22..00000000000 --- a/library/sketches-library/dependency-reduced-pom.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - library - uk.gov.gchq.gaffer - 2.2.5-SNAPSHOT - - 4.0.0 - sketches-library - - - - maven-shade-plugin - ${shade.plugin.version} - - - deploy - ${shaded.jar.phase} - - shade - - - true - deploy - - - com.clearspring.analytics:stream - org.apache.datasketches:* - - - - - com.fasterxml.jackson - hidden.com.fasterxml.jackson - - - - - - - - - - - uk.gov.gchq.gaffer - serialisation - 2.2.5-SNAPSHOT - compile - - - uk.gov.gchq.gaffer - data - 2.2.5-SNAPSHOT - compile - - - uk.gov.gchq.koryphe - core - 2.5.2 - jdk8 - compile - - - org.apache.datasketches - datasketches-memory - 2.2.1 - pom - compile - - - uk.gov.gchq.koryphe - core - 2.5.2 - test-jar - tests-jdk8 - test - - - uk.gov.gchq.gaffer - common-util - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - serialisation - 2.2.5-SNAPSHOT - test-jar - test - - - com.google.guava - guava - 33.2.1-jre - compile - - - org.slf4j - slf4j-api - 1.7.36 - compile - - - org.slf4j - slf4j-reload4j - 1.7.36 - compile - - - org.junit.jupiter - junit-jupiter - 5.11.0-M2 - test - - - junit-jupiter-api - org.junit.jupiter - - - junit-jupiter-params - org.junit.jupiter - - - - - org.junit.jupiter - junit-jupiter-engine - 5.11.0-M2 - test - - - junit-platform-engine - org.junit.platform - - - apiguardian-api - org.apiguardian - - - junit-jupiter-api - org.junit.jupiter - - - - - org.assertj - assertj-core - 3.26.3 - test - - - byte-buddy - net.bytebuddy - - - - - org.mockito - mockito-junit-jupiter - 5.12.0 - test - - - mockito-core - org.mockito - - - junit-jupiter-api - org.junit.jupiter - - - - - diff --git a/library/sketches-library/pom.xml b/library/sketches-library/pom.xml index 5dcc2d6e8a7..49ff109f9d8 100644 --- a/library/sketches-library/pom.xml +++ b/library/sketches-library/pom.xml @@ -39,7 +39,6 @@ uk.gov.gchq.koryphe core - jdk8 com.clearspring.analytics @@ -64,7 +63,6 @@ uk.gov.gchq.koryphe core - tests-jdk8 test-jar test diff --git a/library/spark/spark-accumulo-library/dependency-reduced-pom.xml b/library/spark/spark-accumulo-library/dependency-reduced-pom.xml deleted file mode 100644 index 1fb5f426068..00000000000 --- a/library/spark/spark-accumulo-library/dependency-reduced-pom.xml +++ /dev/null @@ -1,246 +0,0 @@ - - - - spark - uk.gov.gchq.gaffer - 2.2.5-SNAPSHOT - - 4.0.0 - spark-accumulo-library - - - - maven-shade-plugin - ${shade.plugin.version} - - - full - ${shaded.jar.phase} - - shade - - - true - full${append.shaded.classifier} - - - org.apache.spark:* - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - - - uk.gov.gchq.gaffer - common-util - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - serialisation - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - operation - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - data - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - accumulo-store - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - spark-library - 2.2.5-SNAPSHOT - test-jar - test - - - org.apache.accumulo - accumulo-minicluster - 2.0.1 - test - - - slf4j-log4j12 - org.slf4j - - - log4j - log4j - - - accumulo-monitor - org.apache.accumulo - - - accumulo-gc - org.apache.accumulo - - - accumulo-master - org.apache.accumulo - - - accumulo-server-base - org.apache.accumulo - - - accumulo-tracer - org.apache.accumulo - - - accumulo-tserver - org.apache.accumulo - - - - - org.apache.hadoop - hadoop-hdfs - 3.3.3 - test - - - jersey-grizzly2 - com.sun.jersey - - - jersey-json - com.sun.jersey - - - jersey-server - com.sun.jersey - - - jersey-client - com.sun.jersey - - - jersey-core - com.sun.jersey - - - servlet-api - javax.servlet - - - jetty-util - org.mortbay.jetty - - - avro-ipc - org.apache.avro - - - slf4j-log4j12 - org.slf4j - - - log4j - log4j - - - commons-daemon - commons-daemon - - - - - org.junit.jupiter - junit-jupiter - 5.11.0-M2 - test - - - junit-jupiter-api - org.junit.jupiter - - - junit-jupiter-params - org.junit.jupiter - - - - - org.junit.jupiter - junit-jupiter-engine - 5.11.0-M2 - test - - - junit-platform-engine - org.junit.platform - - - apiguardian-api - org.apiguardian - - - junit-jupiter-api - org.junit.jupiter - - - - - org.assertj - assertj-core - 3.26.3 - test - - - byte-buddy - net.bytebuddy - - - - - org.mockito - mockito-junit-jupiter - 5.12.0 - test - - - mockito-core - org.mockito - - - junit-jupiter-api - org.junit.jupiter - - - - - diff --git a/library/time-library/dependency-reduced-pom.xml b/library/time-library/dependency-reduced-pom.xml deleted file mode 100644 index 5054186e5a7..00000000000 --- a/library/time-library/dependency-reduced-pom.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - library - uk.gov.gchq.gaffer - 2.2.5-SNAPSHOT - - 4.0.0 - time-library - - - - maven-shade-plugin - ${shade.plugin.version} - - - deploy - ${shaded.jar.phase} - - shade - - - true - deploy - - - org.roaringbitmap:RoaringBitmap - uk.gov.gchq.gaffer:bitmap-library - uk.gov.gchq.gaffer:sketches-library - com.clearspring.analytics:stream - org.apache.datasketches:datasketches-java - - - - - com.fasterxml.jackson - hidden.com.fasterxml.jackson - - - - - - - - - - - uk.gov.gchq.gaffer - serialisation - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - common-util - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.koryphe - core - 2.5.2 - test-jar - tests-jdk8 - test - - - com.google.guava - guava - 33.2.1-jre - compile - - - org.slf4j - slf4j-api - 1.7.36 - compile - - - org.slf4j - slf4j-reload4j - 1.7.36 - compile - - - org.junit.jupiter - junit-jupiter - 5.11.0-M2 - test - - - junit-jupiter-api - org.junit.jupiter - - - junit-jupiter-params - org.junit.jupiter - - - - - org.junit.jupiter - junit-jupiter-engine - 5.11.0-M2 - test - - - junit-platform-engine - org.junit.platform - - - apiguardian-api - org.apiguardian - - - junit-jupiter-api - org.junit.jupiter - - - - - org.assertj - assertj-core - 3.26.3 - test - - - byte-buddy - net.bytebuddy - - - - - org.mockito - mockito-junit-jupiter - 5.12.0 - test - - - mockito-core - org.mockito - - - junit-jupiter-api - org.junit.jupiter - - - - - diff --git a/library/time-library/pom.xml b/library/time-library/pom.xml index b2b02193ba3..729e3dd6a33 100644 --- a/library/time-library/pom.xml +++ b/library/time-library/pom.xml @@ -53,7 +53,6 @@ uk.gov.gchq.koryphe core - tests-jdk8 test-jar test diff --git a/library/tinkerpop/pom.xml b/library/tinkerpop/pom.xml index 7612fc4c477..a72c4473d79 100644 --- a/library/tinkerpop/pom.xml +++ b/library/tinkerpop/pom.xml @@ -28,8 +28,7 @@ 4.2.3 7.15.0 - - 1.0.0 + 1.0.4 !GafferPopGraphStructureStandardTest,!GafferPopFeatureTest,!GafferPopGraphProcessStandardTest diff --git a/pom.xml b/pom.xml index ce9c214c821..a6f01cb761f 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,7 @@ 3.12.1 3.4.1 1.5.0 + 10.0.3 @@ -184,13 +185,11 @@ uk.gov.gchq.koryphe core ${koryphe.version} - jdk8 uk.gov.gchq.koryphe core ${koryphe.version} - tests-jdk8 test-jar test @@ -199,13 +198,6 @@ jackson-databind ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - 2.17.2 - - com.fasterxml.jackson.core jackson-core @@ -844,11 +836,11 @@ - - org.owasp - dependency-check-maven - 10.0.3 - + + org.owasp + dependency-check-maven + ${dependency-check.plugin.version} + org.apache.maven.plugins maven-release-plugin @@ -1129,31 +1121,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - ${enforcer.plugin.version} - - - enforce-compatible-hadoop - - enforce - - - - - - org.apache.hadoop:*:(,2.9.9] - - - Hadoop versions below 3.3.0 are incompatible with JDK 11, JDK 8 must be used with the legacy profile - - - - - - - org.apache.maven.plugins maven-enforcer-plugin @@ -1597,31 +1564,6 @@ ${failsafeArgLine} - - org.apache.maven.plugins - maven-enforcer-plugin - ${enforcer.plugin.version} - - - enforce-compatible-hadoop - - enforce - - - - - - org.apache.hadoop:*:(,2.9.9] - - - Hadoop versions below 3.3.0 are incompatible with JDK 11, JDK 8 must be used with the legacy profile - - - - - - - org.jacoco jacoco-maven-plugin diff --git a/rest-api/common-rest/pom.xml b/rest-api/common-rest/pom.xml index e6e299312d0..85fade9aea5 100644 --- a/rest-api/common-rest/pom.xml +++ b/rest-api/common-rest/pom.xml @@ -45,7 +45,6 @@ uk.gov.gchq.koryphe core - tests-jdk8 test-jar test diff --git a/store-implementation/accumulo-store/dependency-reduced-pom.xml b/store-implementation/accumulo-store/dependency-reduced-pom.xml deleted file mode 100644 index 94db92f66a4..00000000000 --- a/store-implementation/accumulo-store/dependency-reduced-pom.xml +++ /dev/null @@ -1,322 +0,0 @@ - - - - store-implementation - uk.gov.gchq.gaffer - 2.2.5-SNAPSHOT - - 4.0.0 - accumulo-store - - - - maven-shade-plugin - ${shade.plugin.version} - - - iterators - ${shaded.jar.phase} - - shade - - - true - iterators${append.shaded.classifier} - - - uk.gov.gchq.koryphe* - uk.gov.gchq.gaffer* - com.google.guava:* - org.apache.commons:commons-lang3 - com.fasterxml.jackson.*:* - com.clearspring.analytics:stream - com.yahoo.* - io.github.lukehutch* - - - - - com.fasterxml.jackson - hidden.com.fasterxml.jackson - - - org.apache.commons.lang3 - hidden.org.apache.commons.lang3 - - - com.google - hidden.com.google - - - - - - utility - package - - shade - - - true - utility${append.shaded.classifier} - - - - - - - - - org.apache.accumulo - accumulo-minicluster - 2.0.1 - test - - - slf4j-log4j12 - org.slf4j - - - log4j - log4j - - - accumulo-monitor - org.apache.accumulo - - - accumulo-gc - org.apache.accumulo - - - accumulo-master - org.apache.accumulo - - - accumulo-server-base - org.apache.accumulo - - - accumulo-tracer - org.apache.accumulo - - - accumulo-tserver - org.apache.accumulo - - - - - uk.gov.gchq.gaffer - store - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - data - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - graph - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - operation - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - common-util - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - integration-test - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - integration-test - 2.2.5-SNAPSHOT - test - - - uk.gov.gchq.gaffer - serialisation - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - hdfs-library - 2.2.5-SNAPSHOT - test-jar - test - - - uk.gov.gchq.gaffer - map-store - 2.2.5-SNAPSHOT - test - - - org.apache.hadoop - hadoop-hdfs - 3.3.3 - test - - - jersey-grizzly2 - com.sun.jersey - - - jersey-json - com.sun.jersey - - - jersey-server - com.sun.jersey - - - jersey-client - com.sun.jersey - - - jersey-core - com.sun.jersey - - - servlet-api - javax.servlet - - - jetty-util - org.mortbay.jetty - - - avro-ipc - org.apache.avro - - - slf4j-log4j12 - org.slf4j - - - log4j - log4j - - - commons-daemon - commons-daemon - - - netty - io.netty - - - netty-all - io.netty - - - leveldbjni-all - org.fusesource.leveldbjni - - - - - org.junit.platform - junit-platform-suite - 1.11.0-M2 - test - - - junit-platform-suite-api - org.junit.platform - - - junit-platform-suite-engine - org.junit.platform - - - - - org.junit.jupiter - junit-jupiter - 5.11.0-M2 - test - - - junit-jupiter-api - org.junit.jupiter - - - junit-jupiter-params - org.junit.jupiter - - - - - org.junit.jupiter - junit-jupiter-engine - 5.11.0-M2 - test - - - junit-platform-engine - org.junit.platform - - - apiguardian-api - org.apiguardian - - - junit-jupiter-api - org.junit.jupiter - - - - - org.assertj - assertj-core - 3.26.3 - test - - - byte-buddy - net.bytebuddy - - - - - org.mockito - mockito-junit-jupiter - 5.12.0 - test - - - mockito-core - org.mockito - - - junit-jupiter-api - org.junit.jupiter - - - - - diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index d8fbc21adf4..cb22056dc87 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -179,12 +179,12 @@ junit-platform-suite test - + From cf7e17fe10a7577aeb24b69cdef2ded85e455b5f Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:00:38 +0000 Subject: [PATCH 03/32] gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2e22cd36844..549b2c0e494 100755 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ example/real-federated-store/*.properties example/real-federated-store/*.json example/real-federated-store/*.jar .flattened-pom.xml +dependency-reduced-pom.xml From 08ff767b1d6cdb88fbfbd4b9eef405a53574cafc Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:56:08 +0000 Subject: [PATCH 04/32] tweak to sketches --- library/sketches-library/pom.xml | 8 ------- pom.xml | 5 ++++ store-implementation/accumulo-store/pom.xml | 26 ++++++++++----------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/library/sketches-library/pom.xml b/library/sketches-library/pom.xml index 49ff109f9d8..aad80da65e6 100644 --- a/library/sketches-library/pom.xml +++ b/library/sketches-library/pom.xml @@ -50,14 +50,6 @@ datasketches-java ${datasketches.version} - - - org.apache.datasketches - datasketches-memory - 2.2.1 - pom - - diff --git a/pom.xml b/pom.xml index a6f01cb761f..93b871b04dc 100644 --- a/pom.xml +++ b/pom.xml @@ -203,6 +203,11 @@ jackson-core ${jackson.version} + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + com.fasterxml.jackson.dataformat jackson-dataformat-xml diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index cb22056dc87..376bb441009 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -31,17 +31,17 @@ uk.gov.gchq.gaffer graph - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer hdfs-library - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer sketches-library - ${project.parent.version} + ${project.version} @@ -104,69 +104,69 @@ uk.gov.gchq.gaffer store - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer data - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer graph - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer operation - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer common-util - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer integration-test - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer integration-test - ${project.parent.version} + ${project.version} test uk.gov.gchq.gaffer serialisation - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer hdfs-library - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer map-store - ${project.parent.version} + ${project.version} test From b272554b20c6896f5000b2f84d2e475c0178ba09 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:38:37 +0000 Subject: [PATCH 05/32] minor changes to test deps --- .../uk/gov/gchq/gaffer/store/StoreTest.java | 13 ++++++------ library/tinkerpop/pom.xml | 20 ++++++++++++------- store-implementation/accumulo-store/pom.xml | 6 ------ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java index 772440b7b16..2df05d6485b 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java @@ -529,10 +529,10 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina final List> expectedOperations = Lists.newArrayList( GetAllElements.class, + GetElements.class, + GetAdjacentIds.class, - mock(AddElements.class).getClass(), - mock(GetElements.class).getClass(), - mock(GetAdjacentIds.class).getClass(), + AddElements.class, // Export ExportToSet.class, @@ -639,10 +639,11 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin final List> expectedOperations = Lists.newArrayList( GetAllElements.class, + GetElements.class, + GetAdjacentIds.class, + + AddElements.class, - mock(AddElements.class).getClass(), - mock(GetElements.class).getClass(), - mock(GetAdjacentIds.class).getClass(), // Export ExportToSet.class, diff --git a/library/tinkerpop/pom.xml b/library/tinkerpop/pom.xml index a72c4473d79..304882b2f32 100644 --- a/library/tinkerpop/pom.xml +++ b/library/tinkerpop/pom.xml @@ -39,7 +39,7 @@ uk.gov.gchq.gaffer graph - ${project.parent.version} + ${project.version} @@ -64,25 +64,25 @@ uk.gov.gchq.gaffer accumulo-store - ${project.parent.version} + ${project.version} runtime uk.gov.gchq.gaffer map-store - ${project.parent.version} + ${project.version} runtime uk.gov.gchq.gaffer proxy-store - ${project.parent.version} + ${project.version} runtime uk.gov.gchq.gaffer jcs-cache-service - ${project.parent.version} + ${project.version} runtime @@ -90,7 +90,7 @@ uk.gov.gchq.gaffer accumulo-store - ${project.parent.version} + ${project.version} test-jar test @@ -99,10 +99,16 @@ accumulo-minicluster test + + uk.gov.gchq.gaffer + hdfs-library + ${project.version} + test + uk.gov.gchq.gaffer common-util - ${project.parent.version} + ${project.version} test-jar test diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index 376bb441009..b29c61b6635 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -179,12 +179,6 @@ junit-platform-suite test - From 7639369c1a52610bbdc6aecc940b639157a3d6d7 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:32:59 +0000 Subject: [PATCH 06/32] ensure legacy profile still available --- core/common-util/pom.xml | 1 + core/data/pom.xml | 2 ++ core/operation/pom.xml | 1 + core/type/pom.xml | 2 ++ library/bitmap-library/pom.xml | 2 ++ library/sketches-library/pom.xml | 2 ++ library/time-library/pom.xml | 1 + library/tinkerpop/pom.xml | 1 - pom.xml | 35 ++++++++++++++++++++++++++++++-- rest-api/common-rest/pom.xml | 1 + 10 files changed, 45 insertions(+), 3 deletions(-) diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml index 207deb50b76..cf40f68aaa3 100644 --- a/core/common-util/pom.xml +++ b/core/common-util/pom.xml @@ -46,6 +46,7 @@ uk.gov.gchq.koryphe core + ${koryphe.classifer} diff --git a/core/data/pom.xml b/core/data/pom.xml index 78292405574..73b83fcf3c4 100644 --- a/core/data/pom.xml +++ b/core/data/pom.xml @@ -29,6 +29,7 @@ uk.gov.gchq.koryphe core + ${koryphe.classifer} uk.gov.gchq.gaffer @@ -66,6 +67,7 @@ uk.gov.gchq.koryphe core + ${koryphe.test.classifer} test-jar test diff --git a/core/operation/pom.xml b/core/operation/pom.xml index cad0049f049..df388d4f23a 100644 --- a/core/operation/pom.xml +++ b/core/operation/pom.xml @@ -58,6 +58,7 @@ uk.gov.gchq.koryphe core + ${koryphe.test.classifer} test-jar test diff --git a/core/type/pom.xml b/core/type/pom.xml index 78ea6c79f41..c16edb2a71d 100644 --- a/core/type/pom.xml +++ b/core/type/pom.xml @@ -34,12 +34,14 @@ uk.gov.gchq.koryphe core + ${koryphe.classifer} uk.gov.gchq.koryphe core + ${koryphe.test.classifer} test-jar test diff --git a/library/bitmap-library/pom.xml b/library/bitmap-library/pom.xml index 9a3f14500e0..a354bd864ca 100644 --- a/library/bitmap-library/pom.xml +++ b/library/bitmap-library/pom.xml @@ -34,6 +34,7 @@ uk.gov.gchq.koryphe core + ${koryphe.classifer} org.roaringbitmap @@ -44,6 +45,7 @@ uk.gov.gchq.koryphe core + ${koryphe.test.classifer} test-jar test diff --git a/library/sketches-library/pom.xml b/library/sketches-library/pom.xml index aad80da65e6..53674e50ee7 100644 --- a/library/sketches-library/pom.xml +++ b/library/sketches-library/pom.xml @@ -39,6 +39,7 @@ uk.gov.gchq.koryphe core + ${koryphe.classifer} com.clearspring.analytics @@ -55,6 +56,7 @@ uk.gov.gchq.koryphe core + ${koryphe.test.classifer} test-jar test diff --git a/library/time-library/pom.xml b/library/time-library/pom.xml index 729e3dd6a33..abc9443e01d 100644 --- a/library/time-library/pom.xml +++ b/library/time-library/pom.xml @@ -53,6 +53,7 @@ uk.gov.gchq.koryphe core + ${koryphe.test.classifer} test-jar test diff --git a/library/tinkerpop/pom.xml b/library/tinkerpop/pom.xml index 304882b2f32..a96908a07ca 100644 --- a/library/tinkerpop/pom.xml +++ b/library/tinkerpop/pom.xml @@ -28,7 +28,6 @@ 4.2.3 7.15.0 - 1.0.4 !GafferPopGraphStructureStandardTest,!GafferPopFeatureTest,!GafferPopGraphProcessStandardTest diff --git a/pom.xml b/pom.xml index 93b871b04dc..a44142ed1d0 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,8 @@ package + + tests 11 @@ -59,10 +61,10 @@ 5.12.0 1.7.36 - 3.0 - ${spark.minor.version}.3 2.12 ${scala.minor.version}.15 + 3.0 + ${spark.minor.version}.3 2.5.2 2.0.1 @@ -99,6 +101,7 @@ 5.15.0 1.36.0 3.7.1 + 1.0.4 2.17 @@ -185,11 +188,13 @@ uk.gov.gchq.koryphe core ${koryphe.version} + ${koryphe.classifer} uk.gov.gchq.koryphe core ${koryphe.version} + ${koryphe.test.classifer} test-jar test @@ -1643,19 +1648,45 @@ + 1.8 legacy -legacy + jdk8 + tests-jdk8 1.9.3 2.6.5 13.0.1 + 2.7.0 + 4.0.0 + 1.0.0 + + 2.4 + ${spark.minor.version}.5 + 2.11 + ${scala.minor.version}.12 + + 5.9.3 + 1.9.3 + 3.24.2 + 4.11.0 2.5.2 + 3.2.4 + + org.apache.maven.plugins + maven-compiler-plugin + ${compiler.plugin.verson} + + ${java.version} + ${java.version} + + org.apache.maven.plugins maven-war-plugin diff --git a/rest-api/common-rest/pom.xml b/rest-api/common-rest/pom.xml index 85fade9aea5..832f1d59ef8 100644 --- a/rest-api/common-rest/pom.xml +++ b/rest-api/common-rest/pom.xml @@ -45,6 +45,7 @@ uk.gov.gchq.koryphe core + ${koryphe.test.classifer} test-jar test From 8d60307f4049b189e146497c91161b0b56394a40 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:41:11 +0000 Subject: [PATCH 07/32] jackson version for legacy --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a44142ed1d0..11f7fe306f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1657,6 +1657,7 @@ 1.9.3 2.6.5 13.0.1 + 2.13.5 2.7.0 4.0.0 1.0.0 From 5a264fb5ecf9570dc0c0aa4536d828dde7f20263 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:51:41 +0000 Subject: [PATCH 08/32] fix test assertion --- .../src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java index 2df05d6485b..0ecb5fcef8f 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java @@ -614,7 +614,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina expectedOperations.sort(Comparator.comparing(Class::getName)); supportedOperations.sort(Comparator.comparing(Class::getName)); - assertThat(supportedOperations).isEqualTo(expectedOperations); + assertThat(supportedOperations).containsExactlyElementsOf(expectedOperations); } @Test @@ -721,7 +721,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin expectedOperations.sort(Comparator.comparing(Class::getName)); supportedOperations.sort(Comparator.comparing(Class::getName)); - assertThat(supportedOperations).isEqualTo(expectedOperations); + assertThat(supportedOperations).containsExactlyElementsOf(expectedOperations); } @Test From bcee3829a104239172551cff0945c6de3efd3ea1 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:55:47 +0000 Subject: [PATCH 09/32] java 11 ci --- .github/workflows/continuous-integration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index b454c1a0e6e..f4cb09f5a46 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -33,7 +33,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '8' + java-version: '11' - name: Run Spotless copyright check run: mvn -ntp spotless:check -T0.5C @@ -134,7 +134,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '8' + java-version: '11' - name: Cache dependencies uses: actions/cache@v4 From 689dd3966a98086e5f27932901ba95464f34c648 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 15:04:27 +0000 Subject: [PATCH 10/32] revert test changes --- .../uk/gov/gchq/gaffer/store/StoreTest.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java index 0ecb5fcef8f..fc5d8850826 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java @@ -527,12 +527,10 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina assertThat(supportedOperations).isNotNull(); final List> expectedOperations = - Lists.newArrayList( - GetAllElements.class, - GetElements.class, - GetAdjacentIds.class, - - AddElements.class, + Lists.newArrayList(AddElements.class, + mock(GetAllElements.class).getClass(), + mock(GetElements.class).getClass(), + mock(GetAdjacentIds.class).getClass(), // Export ExportToSet.class, @@ -637,13 +635,10 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin assertThat(supportedOperations).isNotNull(); final List> expectedOperations = - Lists.newArrayList( - GetAllElements.class, - GetElements.class, - GetAdjacentIds.class, - - AddElements.class, - + Lists.newArrayList(AddElements.class, + mock(GetAllElements.class).getClass(), + mock(GetElements.class).getClass(), + mock(GetAdjacentIds.class).getClass(), // Export ExportToSet.class, From 0bb038cae344d67c34e5ac36a68a5d04f472decf Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:19:25 +0000 Subject: [PATCH 11/32] version tweaks --- library/bitmap-library/pom.xml | 1 + library/hdfs-library/pom.xml | 1 + library/sketches-library/pom.xml | 1 + library/time-library/pom.xml | 14 ++++++--- pom.xml | 4 +-- rest-api/spring-rest/pom.xml | 34 ++++++++++++++------- store-implementation/accumulo-store/pom.xml | 1 + 7 files changed, 39 insertions(+), 17 deletions(-) diff --git a/library/bitmap-library/pom.xml b/library/bitmap-library/pom.xml index a354bd864ca..fe7094f7344 100644 --- a/library/bitmap-library/pom.xml +++ b/library/bitmap-library/pom.xml @@ -24,6 +24,7 @@ 4.0.0 bitmap-library + ${revision} diff --git a/library/hdfs-library/pom.xml b/library/hdfs-library/pom.xml index 10627c38a59..5137515de90 100644 --- a/library/hdfs-library/pom.xml +++ b/library/hdfs-library/pom.xml @@ -24,6 +24,7 @@ hdfs-library + ${revision} diff --git a/library/sketches-library/pom.xml b/library/sketches-library/pom.xml index 53674e50ee7..02738bb34bf 100644 --- a/library/sketches-library/pom.xml +++ b/library/sketches-library/pom.xml @@ -24,6 +24,7 @@ sketches-library + ${revision} diff --git a/library/time-library/pom.xml b/library/time-library/pom.xml index abc9443e01d..886dd45a203 100644 --- a/library/time-library/pom.xml +++ b/library/time-library/pom.xml @@ -24,29 +24,35 @@ time-library + ${revision} uk.gov.gchq.gaffer bitmap-library - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer sketches-library - ${project.parent.version} + ${project.version} + + + org.roaringbitmap + RoaringBitmap + 0.5.11 uk.gov.gchq.gaffer serialisation - ${project.parent.version} + ${project.version} test-jar test uk.gov.gchq.gaffer common-util - ${project.parent.version} + ${project.version} test-jar test diff --git a/pom.xml b/pom.xml index 11f7fe306f4..e47fb96ad3e 100644 --- a/pom.xml +++ b/pom.xml @@ -55,8 +55,8 @@ 11 - 5.11.0-M2 - 1.11.0-M2 + 5.10.3 + 1.10.3 3.26.3 5.12.0 1.7.36 diff --git a/rest-api/spring-rest/pom.xml b/rest-api/spring-rest/pom.xml index 521ab6fb6e3..4193df94c57 100644 --- a/rest-api/spring-rest/pom.xml +++ b/rest-api/spring-rest/pom.xml @@ -36,56 +36,56 @@ uk.gov.gchq.gaffer common-rest - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer time-library - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer bitmap-library - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer sketches-library - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer jcs-cache-service - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer tinkerpop - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer map-store - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer federated-store - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer accumulo-store - ${project.parent.version} + ${project.version} uk.gov.gchq.gaffer proxy-store - ${project.parent.version} + ${project.version} @@ -144,7 +144,7 @@ uk.gov.gchq.gaffer tinkerpop - ${project.parent.version} + ${project.version} test-jar test @@ -154,6 +154,18 @@ ${tinkerpop.version} test + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index b29c61b6635..86da0c1354e 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -25,6 +25,7 @@ accumulo-store + ${revision} From b0b6e2f5c25eec9a9e5e4a71a62eefc18e0c4e47 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:24:44 +0000 Subject: [PATCH 12/32] direct dependecy to time library --- library/time-library/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/library/time-library/pom.xml b/library/time-library/pom.xml index 886dd45a203..8bdd6fdefd6 100644 --- a/library/time-library/pom.xml +++ b/library/time-library/pom.xml @@ -42,6 +42,11 @@ RoaringBitmap 0.5.11 + + org.apache.datasketches + datasketches-java + ${datasketches.version} + uk.gov.gchq.gaffer serialisation From 93a93271767f502e369f824b980c3f5b1fc41cb6 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:32:37 +0000 Subject: [PATCH 13/32] test dependency --- store-implementation/accumulo-store/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index 86da0c1354e..90aae677215 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -175,6 +175,12 @@ hadoop-hdfs test + + com.clearspring.analytics + stream + ${clearspring.version} + test + org.junit.platform junit-platform-suite From 6e2b712af5957da7c16e386e833a6a6141b0850d Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Wed, 24 Jul 2024 09:09:34 +0000 Subject: [PATCH 14/32] test dependency --- store-implementation/accumulo-store/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index 90aae677215..38f28dbb692 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -181,6 +181,12 @@ ${clearspring.version} test + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + org.junit.platform junit-platform-suite From d2b0c1b66aad38433c0e8fad92e61913111be3e0 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Wed, 24 Jul 2024 09:21:37 +0000 Subject: [PATCH 15/32] add direct dependencies --- library/spark/spark-accumulo-library/pom.xml | 50 ++++++++++++++++++++ library/spark/spark-library/pom.xml | 5 ++ 2 files changed, 55 insertions(+) diff --git a/library/spark/spark-accumulo-library/pom.xml b/library/spark/spark-accumulo-library/pom.xml index 4725a3b8ffa..8f86e5e3401 100644 --- a/library/spark/spark-accumulo-library/pom.xml +++ b/library/spark/spark-accumulo-library/pom.xml @@ -40,6 +40,56 @@ sketches-library ${project.parent.version} + + org.apache.accumulo + accumulo-core + ${accumulo.version} + + + + org.apache.hadoop + hadoop-hdfs + + + org.apache.avro + avro-ipc + + + com.sun.jersey + jersey-client + + + com.sun.jersey.jersey-test-framework + jersey-test-framework-grizzly2 + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-json + + + com.sun.jersey.contribs + jersey-guice + + + io.netty + netty + + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + diff --git a/library/spark/spark-library/pom.xml b/library/spark/spark-library/pom.xml index ca12edf02a4..6ad8ea7be3d 100644 --- a/library/spark/spark-library/pom.xml +++ b/library/spark/spark-library/pom.xml @@ -129,6 +129,11 @@ graphframes ${graphframes.version} + + org.apache.datasketches + datasketches-java + ${datasketches.version} + From 044da976fd6110b7af789bd55ce4bb540f9efdf1 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Wed, 24 Jul 2024 10:37:33 +0000 Subject: [PATCH 16/32] fix junit integration tests --- integration-test/pom.xml | 48 +++++------ .../IntegrationTestSuiteExtension.java | 9 ++- pom.xml | 80 +++---------------- store-implementation/map-store/pom.xml | 11 ++- 4 files changed, 50 insertions(+), 98 deletions(-) diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 8e30d4bff88..5c36ba7ad49 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -38,6 +38,27 @@ graph ${project.parent.version} + + org.junit.jupiter + junit-jupiter + ${junit.version} + + + org.junit.platform + junit-platform-suite + ${junit-platform.version} + + + org.junit.platform + junit-platform-suite-api + ${junit-platform.version} + + + org.junit.platform + junit-platform-commons + ${junit-platform.version} + + uk.gov.gchq.gaffer common-util @@ -56,35 +77,10 @@ ${project.parent.version} test-jar - - org.junit.platform - junit-platform-suite - - - org.junit.jupiter - junit-jupiter - ${junit.version} - provided - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - provided - - - org.assertj - assertj-core - ${assertj.version} - provided - - - - org.junit.platform junit-platform-testkit - ${junit-suite.version} + ${junit-platform.version} test diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/junit/extensions/IntegrationTestSuiteExtension.java b/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/junit/extensions/IntegrationTestSuiteExtension.java index 4a0fd9d910f..255d60f5aed 100644 --- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/junit/extensions/IntegrationTestSuiteExtension.java +++ b/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/junit/extensions/IntegrationTestSuiteExtension.java @@ -32,6 +32,7 @@ import uk.gov.gchq.gaffer.store.schema.Schema; import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -41,7 +42,6 @@ import static org.junit.platform.commons.support.ReflectionSupport.tryToLoadClass; import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields; -import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible; import static org.junit.platform.commons.util.ReflectionUtils.newInstance; /** @@ -271,8 +271,11 @@ private void injectInstanceFields(final Object instance) { LOGGER.debug("Field [{}] requires injecting", annotatedField); final Object object = getObject(annotatedField.getType()); LOGGER.debug("Object [{}] found for the field", object); - makeAccessible(annotatedField).set(instance, object); - } catch (final Throwable t) { + if (!Modifier.isPublic(annotatedField.getModifiers()) || !Modifier.isPublic(annotatedField.getDeclaringClass().getModifiers())) { + annotatedField.setAccessible(true); + annotatedField.set(instance, object); + } + } catch (final Exception t) { throw new RuntimeException("Error accessing the field object", t); } } diff --git a/pom.xml b/pom.xml index e47fb96ad3e..2e484dc8305 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 5.10.3 - 1.10.3 + 1.10.3 3.26.3 5.12.0 1.7.36 @@ -751,7 +751,17 @@ org.junit.platform junit-platform-suite - ${junit-suite.version} + ${junit-platform.version} + + + org.junit.platform + junit-platform-suite-api + ${junit-platform.version} + + + org.junit.platform + junit-platform-commons + ${junit-platform.version} org.glassfish.jersey.containers @@ -1668,7 +1678,7 @@ ${scala.minor.version}.12 5.9.3 - 1.9.3 + 1.9.3 3.24.2 4.11.0 @@ -1699,69 +1709,5 @@ - - java11 - - 11 - - - 11 - 3.0 - ${spark.minor.version}.3 - 2.12 - ${scala.minor.version}.15 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.plugin.verson} - - ${java.version} - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc.plugin.version} - - - --frames - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${enforcer.plugin.version} - - - enforce-compatible-hadoop - - enforce - - - - - - org.apache.hadoop:*:(,2.9.9] - - - Hadoop versions below 3.3.0 are incompatible with JDK 11, JDK 8 must be used with the legacy profile - - - - - - - - - - diff --git a/store-implementation/map-store/pom.xml b/store-implementation/map-store/pom.xml index f0e7a67f485..00232f6cf05 100755 --- a/store-implementation/map-store/pom.xml +++ b/store-implementation/map-store/pom.xml @@ -109,8 +109,15 @@ test - org.junit.platform - junit-platform-suite + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} test From 3dd9e3f608abc460d990274a4eae76476680a05b Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Wed, 24 Jul 2024 10:54:19 +0000 Subject: [PATCH 17/32] test dependency --- library/tinkerpop/pom.xml | 12 ++++++++++++ store-implementation/accumulo-store/pom.xml | 5 ----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/library/tinkerpop/pom.xml b/library/tinkerpop/pom.xml index a96908a07ca..126c908846c 100644 --- a/library/tinkerpop/pom.xml +++ b/library/tinkerpop/pom.xml @@ -117,6 +117,18 @@ ${project.parent.version} test + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + org.apache.tinkerpop diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index 38f28dbb692..701b4ed0b18 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -187,11 +187,6 @@ ${datasketches.version} test - - org.junit.platform - junit-platform-suite - test - From 5a6e37589021f5a847bdde99cff828dbc55d3f4f Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:02:59 +0000 Subject: [PATCH 18/32] test dependency --- example/road-traffic/road-traffic-model/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/example/road-traffic/road-traffic-model/pom.xml b/example/road-traffic/road-traffic-model/pom.xml index fee9fada104..89045f74244 100644 --- a/example/road-traffic/road-traffic-model/pom.xml +++ b/example/road-traffic/road-traffic-model/pom.xml @@ -80,5 +80,17 @@ hadoop-hdfs test + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + From 4d3a66260ab874048592e5070d7b245e39786a0a Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:12:14 +0000 Subject: [PATCH 19/32] test dependency --- example/road-traffic/road-traffic-model/pom.xml | 6 ++++++ library/spark/spark-accumulo-library/pom.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/example/road-traffic/road-traffic-model/pom.xml b/example/road-traffic/road-traffic-model/pom.xml index 89045f74244..e7214df08c1 100644 --- a/example/road-traffic/road-traffic-model/pom.xml +++ b/example/road-traffic/road-traffic-model/pom.xml @@ -63,6 +63,12 @@ test-jar test + + uk.gov.gchq.gaffer + hdfs-library + ${project.parent.version} + test + uk.gov.gchq.gaffer hdfs-library diff --git a/library/spark/spark-accumulo-library/pom.xml b/library/spark/spark-accumulo-library/pom.xml index 8f86e5e3401..0023e201deb 100644 --- a/library/spark/spark-accumulo-library/pom.xml +++ b/library/spark/spark-accumulo-library/pom.xml @@ -134,6 +134,12 @@ test test-jar + + uk.gov.gchq.gaffer + hdfs-library + ${project.parent.version} + test + org.apache.accumulo accumulo-minicluster From 50ad365e81fc79c4cbac80bca406d9ef2d9e6b3e Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:29:30 +0000 Subject: [PATCH 20/32] refactor rest api test for updated jackson --- rest-api/common-rest/pom.xml | 13 ++ rest-api/core-rest/pom.xml | 12 ++ rest-api/spring-rest/pom.xml | 13 +- .../config/JsonSerialisationConfigIT.java | 158 +++++++++++++----- .../controller/AbstractRestApiIT.java | 2 +- store-implementation/proxy-store/pom.xml | 12 ++ 6 files changed, 164 insertions(+), 46 deletions(-) diff --git a/rest-api/common-rest/pom.xml b/rest-api/common-rest/pom.xml index 832f1d59ef8..5d8eba656ca 100644 --- a/rest-api/common-rest/pom.xml +++ b/rest-api/common-rest/pom.xml @@ -41,6 +41,19 @@ uk.gov.gchq.gaffer map-store ${project.parent.version} + test + + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test uk.gov.gchq.koryphe diff --git a/rest-api/core-rest/pom.xml b/rest-api/core-rest/pom.xml index 040a0e76426..5deb569692f 100644 --- a/rest-api/core-rest/pom.xml +++ b/rest-api/core-rest/pom.xml @@ -163,6 +163,18 @@ ${jersey.version} test + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + diff --git a/rest-api/spring-rest/pom.xml b/rest-api/spring-rest/pom.xml index 4193df94c57..60ed5878190 100644 --- a/rest-api/spring-rest/pom.xml +++ b/rest-api/spring-rest/pom.xml @@ -26,7 +26,7 @@ spring-rest - 2.7.12 + 2.7.18 1.6.15 map @@ -38,6 +38,11 @@ common-rest ${project.version} + + uk.gov.gchq.gaffer + serialisation + ${project.version} + @@ -141,6 +146,11 @@ junit-jupiter-engine test + + org.junit.platform + junit-platform-launcher + test + uk.gov.gchq.gaffer tinkerpop @@ -148,6 +158,7 @@ test-jar test + org.apache.tinkerpop gremlin-driver diff --git a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/config/JsonSerialisationConfigIT.java b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/config/JsonSerialisationConfigIT.java index 990be1d801d..d26ae573b00 100644 --- a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/config/JsonSerialisationConfigIT.java +++ b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/config/JsonSerialisationConfigIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 Crown Copyright + * Copyright 2020-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,40 +21,73 @@ import org.apache.datasketches.hll.HllSketch; import org.assertj.core.data.Percentage; +import org.json.JSONArray; +import org.json.JSONObject; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.TestPropertySource; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.Profile; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import uk.gov.gchq.gaffer.commonutil.StreamUtil; import uk.gov.gchq.gaffer.data.element.Entity; -import uk.gov.gchq.gaffer.data.elementdefinition.view.View; import uk.gov.gchq.gaffer.graph.Graph; import uk.gov.gchq.gaffer.graph.GraphConfig; import uk.gov.gchq.gaffer.mapstore.MapStoreProperties; -import uk.gov.gchq.gaffer.operation.OperationException; import uk.gov.gchq.gaffer.operation.impl.add.AddElements; -import uk.gov.gchq.gaffer.operation.impl.get.GetElements; import uk.gov.gchq.gaffer.rest.factory.GraphFactory; -import uk.gov.gchq.gaffer.rest.integration.controller.AbstractRestApiIT; +import uk.gov.gchq.gaffer.rest.factory.spring.AbstractUserFactory; +import uk.gov.gchq.gaffer.rest.factory.spring.UnknownUserFactory; import uk.gov.gchq.gaffer.sketches.serialisation.json.SketchesJsonModules; import uk.gov.gchq.gaffer.store.StoreProperties; import uk.gov.gchq.gaffer.user.User; -import java.util.List; -import java.util.Map; +import javax.ws.rs.core.MediaType; import static org.assertj.core.api.Assertions.assertThat; -@TestPropertySource( - properties = "gaffer.graph.factory.class=uk.gov.gchq.gaffer.rest.integration.config.JsonSerialisationConfigIT$SerialisationGraphFactory" -) -public class JsonSerialisationConfigIT extends AbstractRestApiIT { +@ExtendWith(SpringExtension.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@AutoConfigureMockMvc +@Import(JsonSerialisationConfigIT.TestConfig.class) +@ActiveProfiles("test") +class JsonSerialisationConfigIT { + + @TestConfiguration + static class TestConfig { + + @Bean + @Primary + @Profile("test") + public GraphFactory createTestGraphFactory() { + return new SerialisationGraphFactory(); + } + + @Bean + @Profile("test") + public AbstractUserFactory userFactory() { + return new UnknownUserFactory(); + } + } + @Autowired private GraphFactory graphFactory; + @Autowired + private MockMvc mockMvc; + @Test - public void shouldSerialiseHyperLogLogPlussesWhenSerialiserModulesConfigured() throws OperationException { + public void shouldSerialiseHyperLogLogPlussesWhenSerialiserModulesConfigured() throws Exception { // Given final HyperLogLogPlus hllp = new HyperLogLogPlus(5, 5); hllp.offer(1); @@ -68,25 +101,44 @@ public void shouldSerialiseHyperLogLogPlussesWhenSerialiserModulesConfigured() t .build()) .build(), new User()); + final JSONObject expectedHllpProperty = new JSONObject() + .put("com.clearspring.analytics.stream.cardinality.HyperLogLogPlus", new JSONObject() + .put("hyperLogLogPlus", new JSONObject() + .put("hyperLogLogPlusSketchBytes", "/////gUFAQL7C4AJ") + .put("cardinality", 2))); + // When - final GetElements getElements = new GetElements.Builder() - .input("vertex1") - .view(new View.Builder() - .entity("CardinalityHllp") - .build()) - .build(); - final ResponseEntity elements = post("/graph/operations/execute", getElements, List.class); - final Map result = ((List>) elements.getBody()).get(0); - final Map hllpJson = ((Map>>>) result.get("properties")).get("hllp").get(HyperLogLogPlus.class.getName()).get("hyperLogLogPlus"); - - assertThat(hllpJson) - .isNotNull() - .containsKey("cardinality") - .containsEntry("cardinality", 2); + final JSONObject jsonQuery = new JSONObject() + .put("class", "GetElements") + .put("input", new JSONArray() + .put(new JSONObject() + .put("class", "EntitySeed") + .put("vertex", "vertex1"))) + .put("view", new JSONObject() + .put("entities", new JSONObject() + .put("CardinalityHllp", new JSONObject()))); + + + // When + MvcResult result = mockMvc + .perform(MockMvcRequestBuilders + .post("/rest/graph/operations/execute") + .content(jsonQuery.toString()) + .contentType(MediaType.APPLICATION_JSON)) + .andReturn(); + + assertThat(result.getResponse().getStatus()).isEqualTo(200); + + // Get and check response + JSONArray jsonResponse = new JSONArray(result.getResponse().getContentAsString()); + + assertThat(jsonResponse).hasSize(1); + JSONObject hllpProp = jsonResponse.getJSONObject(0).getJSONObject("properties").getJSONObject("hllp"); + assertThat(hllpProp.toMap()).isEqualTo(expectedHllpProperty.toMap()); } @Test - public void shouldSerialiseHllSketchWhenSerialiserModulesConfigured() throws OperationException { + public void shouldSerialiseHllSketchWhenSerialiserModulesConfigured() throws Exception { // Given final HllSketch hllSketch = new HllSketch(10); hllSketch.update(1); @@ -101,21 +153,39 @@ public void shouldSerialiseHllSketchWhenSerialiserModulesConfigured() throws Ope .build(), new User()); // When - final GetElements getElements = new GetElements.Builder() - .input("vertex1") - .view(new View.Builder() - .entity("CardinalityHllSketch") - .build()) - .build(); - final ResponseEntity elements = post("/graph/operations/execute", getElements, List.class); - final Map result = ((List>) elements.getBody()).get(0); - final Map hllSketchJson = ((Map>>) result.get("properties")).get("hllSketch").get(HllSketch.class.getName()); - - assertThat(hllSketchJson) - .isNotNull() - .containsKey("cardinality"); - - assertThat((double) hllSketchJson.get("cardinality")).isCloseTo(2, Percentage.withPercentage(0.001)); + final JSONObject jsonQuery = new JSONObject() + .put("class", "GetElements") + .put("input", new JSONArray() + .put(new JSONObject() + .put("class", "EntitySeed") + .put("vertex", "vertex1"))) + .put("view", new JSONObject() + .put("entities", new JSONObject() + .put("CardinalityHllSketch", new JSONObject()))); + + // When + MvcResult result = mockMvc + .perform(MockMvcRequestBuilders + .post("/rest/graph/operations/execute") + .content(jsonQuery.toString()) + .contentType(MediaType.APPLICATION_JSON)) + .andReturn(); + + // When + assertThat(result.getResponse().getStatus()).isEqualTo(200); + + // Get and check response + JSONArray jsonResponse = new JSONArray(result.getResponse().getContentAsString()); + + assertThat(jsonResponse).hasSize(1); + + JSONObject hllpSketch = jsonResponse.getJSONObject(0) + .getJSONObject("properties") + .getJSONObject("hllSketch") + .getJSONObject(HllSketch.class.getName()); + + assertThat(hllpSketch.toMap()).containsKey("cardinality"); + assertThat(hllpSketch.getDouble("cardinality")).isCloseTo(2, Percentage.withPercentage(0.001)); } diff --git a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/controller/AbstractRestApiIT.java b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/controller/AbstractRestApiIT.java index f8274cc8d68..6e54b66c746 100644 --- a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/controller/AbstractRestApiIT.java +++ b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/controller/AbstractRestApiIT.java @@ -87,7 +87,7 @@ protected String getContextPath() { } protected String getBaseURl() { - return "http://localhost:" + port + "/" + getContextPath(); + return "http://localhost:" + port + getContextPath(); } protected ResponseEntity get(final String path, final Class responseBodyClass) { diff --git a/store-implementation/proxy-store/pom.xml b/store-implementation/proxy-store/pom.xml index 527ad4f792e..cc7b10a714c 100644 --- a/store-implementation/proxy-store/pom.xml +++ b/store-implementation/proxy-store/pom.xml @@ -121,5 +121,17 @@ junit-platform-suite test + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + From 9d5dd612475610dd32047e2b1d0d93a8bdd8e2e7 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:38:57 +0000 Subject: [PATCH 21/32] revert store test --- .../java/uk/gov/gchq/gaffer/store/StoreTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java index fc5d8850826..a2ef1835a03 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java @@ -528,7 +528,11 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina final List> expectedOperations = Lists.newArrayList(AddElements.class, - mock(GetAllElements.class).getClass(), + GetElements.class, + GetAdjacentIds.class, + GetAllElements.class, + + mock(AddElements.class).getClass(), mock(GetElements.class).getClass(), mock(GetAdjacentIds.class).getClass(), @@ -636,7 +640,11 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin final List> expectedOperations = Lists.newArrayList(AddElements.class, - mock(GetAllElements.class).getClass(), + GetElements.class, + GetAdjacentIds.class, + GetAllElements.class, + + mock(AddElements.class).getClass(), mock(GetElements.class).getClass(), mock(GetAdjacentIds.class).getClass(), From 1fa6b5e2c27e77bbddfa800f2cd4dd208305dd95 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:39:46 +0000 Subject: [PATCH 22/32] spotless --- .../junit/extensions/IntegrationTestSuiteExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/junit/extensions/IntegrationTestSuiteExtension.java b/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/junit/extensions/IntegrationTestSuiteExtension.java index 255d60f5aed..2b91047775f 100644 --- a/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/junit/extensions/IntegrationTestSuiteExtension.java +++ b/integration-test/src/main/java/uk/gov/gchq/gaffer/integration/junit/extensions/IntegrationTestSuiteExtension.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Crown Copyright + * Copyright 2022-2024 Crown Copyright * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 7f21ccf9b962aded03806eb52c052d0d1462c3d9 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:55:33 +0000 Subject: [PATCH 23/32] test dependency --- example/road-traffic/road-traffic-rest/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/example/road-traffic/road-traffic-rest/pom.xml b/example/road-traffic/road-traffic-rest/pom.xml index b126abebdfe..f3f3a74d161 100644 --- a/example/road-traffic/road-traffic-rest/pom.xml +++ b/example/road-traffic/road-traffic-rest/pom.xml @@ -122,6 +122,18 @@ hadoop-hdfs test + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + From a6a14c69f5fe67898f628028c7d275dfe195e5fb Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:00:30 +0000 Subject: [PATCH 24/32] test dependency --- example/road-traffic/road-traffic-generators/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/example/road-traffic/road-traffic-generators/pom.xml b/example/road-traffic/road-traffic-generators/pom.xml index ae9569a4a75..b245cfc7646 100644 --- a/example/road-traffic/road-traffic-generators/pom.xml +++ b/example/road-traffic/road-traffic-generators/pom.xml @@ -88,6 +88,18 @@ ${project.parent.version} test + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + From 9a3ba8cb660b0b9f434a1cebb42e4d9068b1a45e Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:05:55 +0000 Subject: [PATCH 25/32] typo --- example/road-traffic/road-traffic-generators/pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/example/road-traffic/road-traffic-generators/pom.xml b/example/road-traffic/road-traffic-generators/pom.xml index b245cfc7646..db4f658d0b2 100644 --- a/example/road-traffic/road-traffic-generators/pom.xml +++ b/example/road-traffic/road-traffic-generators/pom.xml @@ -51,6 +51,11 @@ commons-csv ${commons-csv.version} + + org.apache.datasketches + datasketches-java + ${datasketches.version} + uk.gov.gchq.gaffer @@ -94,12 +99,6 @@ ${clearspring.version} test - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - From 5b705b12f8a37a387dbad3b3214ae41cdddb83bc Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:14:02 +0000 Subject: [PATCH 26/32] missing test dependency --- example/road-traffic/road-traffic-generators/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/example/road-traffic/road-traffic-generators/pom.xml b/example/road-traffic/road-traffic-generators/pom.xml index db4f658d0b2..10eae31d687 100644 --- a/example/road-traffic/road-traffic-generators/pom.xml +++ b/example/road-traffic/road-traffic-generators/pom.xml @@ -82,6 +82,12 @@ accumulo-minicluster test + + uk.gov.gchq.gaffer + hdfs-library + ${project.parent.version} + test + org.apache.hadoop hadoop-hdfs From 6d711ea4f2a0f05dd73230d2c7153e0e1b2e989c Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:31:05 +0000 Subject: [PATCH 27/32] test dependency --- store-implementation/federated-store/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/store-implementation/federated-store/pom.xml b/store-implementation/federated-store/pom.xml index 8da24f276b4..574c4bc52ba 100644 --- a/store-implementation/federated-store/pom.xml +++ b/store-implementation/federated-store/pom.xml @@ -162,6 +162,18 @@ hadoop-hdfs test + + com.clearspring.analytics + stream + ${clearspring.version} + test + + + org.apache.datasketches + datasketches-java + ${datasketches.version} + test + uk.gov.gchq.gaffer jcs-cache-service From de051a4ac44a2c6a013efb3500b399d4bdbe8df5 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:48:52 +0000 Subject: [PATCH 28/32] mockito dep --- pom.xml | 2 ++ store-implementation/accumulo-store/pom.xml | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 2e484dc8305..f805e59edf1 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,7 @@ 1.10.3 3.26.3 5.12.0 + 5.2.0 1.7.36 2.12 @@ -1681,6 +1682,7 @@ 1.9.3 3.24.2 4.11.0 + 4.11.0 2.5.2 diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index 701b4ed0b18..cebe1b1ff47 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -187,6 +187,12 @@ ${datasketches.version} test + + org.mockito + mockito-inline + ${mockito-inline.version} + test + From 7ca18e5aa2e2a8696c2e190162df14651488a57d Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:57:00 +0000 Subject: [PATCH 29/32] test dependency --- store-implementation/federated-store/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/store-implementation/federated-store/pom.xml b/store-implementation/federated-store/pom.xml index 574c4bc52ba..1a7b02977c0 100644 --- a/store-implementation/federated-store/pom.xml +++ b/store-implementation/federated-store/pom.xml @@ -157,6 +157,12 @@ test-jar test + + uk.gov.gchq.gaffer + hdfs-library + ${project.parent.version} + test + org.apache.hadoop hadoop-hdfs From d3786c332748948fd43ff5a887bff16819979bdd Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:41:50 +0000 Subject: [PATCH 30/32] store test fix --- .../src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java index a2ef1835a03..61f0a6e1260 100644 --- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java +++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java @@ -616,7 +616,8 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina expectedOperations.sort(Comparator.comparing(Class::getName)); supportedOperations.sort(Comparator.comparing(Class::getName)); - assertThat(supportedOperations).containsExactlyElementsOf(expectedOperations); + Set> dedupedExpected = new HashSet<>(expectedOperations); + assertThat(supportedOperations).containsExactlyInAnyOrderElementsOf(dedupedExpected); } @Test @@ -724,7 +725,8 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin expectedOperations.sort(Comparator.comparing(Class::getName)); supportedOperations.sort(Comparator.comparing(Class::getName)); - assertThat(supportedOperations).containsExactlyElementsOf(expectedOperations); + Set> dedupedExpected = new HashSet<>(expectedOperations); + assertThat(supportedOperations).containsExactlyInAnyOrderElementsOf(dedupedExpected); } @Test From d7c5d8ebad0bb828eec11c4daf576dc8498ceeb9 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Fri, 26 Jul 2024 09:55:25 +0000 Subject: [PATCH 31/32] fix data sketches shaded jar --- example/basic/basic-model/pom.xml | 17 ++++++++++++----- .../road-traffic-generators/pom.xml | 6 ------ example/road-traffic/road-traffic-model/pom.xml | 12 ------------ library/sketches-library/pom.xml | 7 +++---- library/tinkerpop/pom.xml | 12 ------------ rest-api/common-rest/pom.xml | 12 ------------ rest-api/core-rest/pom.xml | 12 ------------ rest-api/spring-rest/pom.xml | 12 ------------ store-implementation/accumulo-store/pom.xml | 12 ------------ store-implementation/federated-store/pom.xml | 12 ------------ store-implementation/map-store/pom.xml | 12 ------------ store-implementation/proxy-store/pom.xml | 12 ------------ 12 files changed, 15 insertions(+), 123 deletions(-) diff --git a/example/basic/basic-model/pom.xml b/example/basic/basic-model/pom.xml index 36284c047c3..c71751b4f21 100644 --- a/example/basic/basic-model/pom.xml +++ b/example/basic/basic-model/pom.xml @@ -31,11 +31,6 @@ data ${project.parent.version} - - uk.gov.gchq.gaffer - sketches-library - ${project.parent.version} - uk.gov.gchq.gaffer @@ -68,6 +63,18 @@ accumulo-minicluster test + + uk.gov.gchq.gaffer + sketches-library + ${project.parent.version} + test + + + uk.gov.gchq.gaffer + hdfs-library + ${project.parent.version} + test + org.apache.hadoop hadoop-hdfs diff --git a/example/road-traffic/road-traffic-generators/pom.xml b/example/road-traffic/road-traffic-generators/pom.xml index 10eae31d687..58ba7e38d1b 100644 --- a/example/road-traffic/road-traffic-generators/pom.xml +++ b/example/road-traffic/road-traffic-generators/pom.xml @@ -99,12 +99,6 @@ ${project.parent.version} test - - com.clearspring.analytics - stream - ${clearspring.version} - test - diff --git a/example/road-traffic/road-traffic-model/pom.xml b/example/road-traffic/road-traffic-model/pom.xml index e7214df08c1..3cab4031c4b 100644 --- a/example/road-traffic/road-traffic-model/pom.xml +++ b/example/road-traffic/road-traffic-model/pom.xml @@ -86,17 +86,5 @@ hadoop-hdfs test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - diff --git a/library/sketches-library/pom.xml b/library/sketches-library/pom.xml index 02738bb34bf..7b888bd8e87 100644 --- a/library/sketches-library/pom.xml +++ b/library/sketches-library/pom.xml @@ -89,10 +89,9 @@ shade - true - - deploy - + true + deploy + false com.clearspring.analytics:stream diff --git a/library/tinkerpop/pom.xml b/library/tinkerpop/pom.xml index 126c908846c..a96908a07ca 100644 --- a/library/tinkerpop/pom.xml +++ b/library/tinkerpop/pom.xml @@ -117,18 +117,6 @@ ${project.parent.version} test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - org.apache.tinkerpop diff --git a/rest-api/common-rest/pom.xml b/rest-api/common-rest/pom.xml index 5d8eba656ca..749c17cc4d4 100644 --- a/rest-api/common-rest/pom.xml +++ b/rest-api/common-rest/pom.xml @@ -43,18 +43,6 @@ ${project.parent.version} test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - uk.gov.gchq.koryphe core diff --git a/rest-api/core-rest/pom.xml b/rest-api/core-rest/pom.xml index 5deb569692f..040a0e76426 100644 --- a/rest-api/core-rest/pom.xml +++ b/rest-api/core-rest/pom.xml @@ -163,18 +163,6 @@ ${jersey.version} test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - diff --git a/rest-api/spring-rest/pom.xml b/rest-api/spring-rest/pom.xml index 60ed5878190..f3c2ea63dd9 100644 --- a/rest-api/spring-rest/pom.xml +++ b/rest-api/spring-rest/pom.xml @@ -165,18 +165,6 @@ ${tinkerpop.version} test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml index cebe1b1ff47..377ea31a5c1 100644 --- a/store-implementation/accumulo-store/pom.xml +++ b/store-implementation/accumulo-store/pom.xml @@ -175,18 +175,6 @@ hadoop-hdfs test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - org.mockito mockito-inline diff --git a/store-implementation/federated-store/pom.xml b/store-implementation/federated-store/pom.xml index 1a7b02977c0..627ccfdb4c4 100644 --- a/store-implementation/federated-store/pom.xml +++ b/store-implementation/federated-store/pom.xml @@ -168,18 +168,6 @@ hadoop-hdfs test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - uk.gov.gchq.gaffer jcs-cache-service diff --git a/store-implementation/map-store/pom.xml b/store-implementation/map-store/pom.xml index 00232f6cf05..975784988fb 100755 --- a/store-implementation/map-store/pom.xml +++ b/store-implementation/map-store/pom.xml @@ -108,17 +108,5 @@ ${project.parent.version} test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - diff --git a/store-implementation/proxy-store/pom.xml b/store-implementation/proxy-store/pom.xml index cc7b10a714c..527ad4f792e 100644 --- a/store-implementation/proxy-store/pom.xml +++ b/store-implementation/proxy-store/pom.xml @@ -121,17 +121,5 @@ junit-platform-suite test - - com.clearspring.analytics - stream - ${clearspring.version} - test - - - org.apache.datasketches - datasketches-java - ${datasketches.version} - test - From 808719f92aac0aa0572185c5ca78730d632c998b Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:16:59 +0000 Subject: [PATCH 32/32] code ql version --- .github/workflows/codeql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index afa74d3ed8c..aa3f904c19c 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '8' + java-version: '11' - name: Cache dependencies uses: actions/cache@v4