Merge branch 'v2-alpha' into gh-963-remove-schema-builder

gchq · Mar 8, 2022 · 99b6418 · 99b6418
2 parents fdd403c + e939cbe
commit 99b6418
Show file tree

Hide file tree

Showing 216 changed files with 0 additions and 30,634 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -77,8 +77,6 @@ jobs:
         - 10
         - 12
         - 14
-        module:
-        - analytics/analytics-ui
 
     steps:
     - uses: actions/checkout@v2
@@ -131,9 +129,7 @@ jobs:
       matrix:
         modules:
         - :gaffer-tools,:mini-accumulo-cluster
-        - :slider
         - :random-element-generation,:performance-testing,:performance-testing-core,:performance-testing-accumulo-store,:performance-testing-aws
-        - :analytics,:analytics-functions,:analytics-operations,:analytics-rest
 
     env:
       MAVEN_OPTS: -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25

diff --git a/analytics/analytics-functions/pom.xml b/analytics/analytics-functions/pom.xml
diff --git a/analytics/analytics-functions/src/main/java/uk/gov/gchq/gaffer/analytic/function/ToMap.java b/analytics/analytics-functions/src/main/java/uk/gov/gchq/gaffer/analytic/function/ToMap.java
diff --git a/...ics/analytics-functions/src/test/java/uk/gov/gchq/gaffer/analytic/function/ToMapTest.java b/...ics/analytics-functions/src/test/java/uk/gov/gchq/gaffer/analytic/function/ToMapTest.java
diff --git a/analytics/analytics-functions/src/test/resources/log4j.xml b/analytics/analytics-functions/src/test/resources/log4j.xml
diff --git a/analytics/analytics-operations/pom.xml b/analytics/analytics-operations/pom.xml