Merge branch 'main' into GEOMESA-3259

locationtech · Mar 30, 2024 · 9a66066 · 9a66066
2 parents 0ea8bff + 89c0681
commit 9a66066
Show file tree

Hide file tree

Showing 40 changed files with 331 additions and 247 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"
diff --git a/.github/workflows/build-and-test-2.12.yml b/.github/workflows/build-and-test-2.12.yml
@@ -18,8 +18,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -28,12 +28,25 @@ jobs:
         run: ./build/mvn clean install $MAVEN_CLI_OPTS -DskipTests -T4
       - name: Unit tests
         id: test
-        run: (set -o pipefail && mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS | tee test.log)
         continue-on-error: true
+        run: |
+          set -o pipefail
+          mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS | tee -a test.log
       - name: Unit tests (retry)
         id: test-retry
         if: steps.test.outcome=='failure'
-        run: mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS $(tail -n2 test.log | grep 'rf' | sed 's/.*-rf/-rf/')
+        continue-on-error: true
+        run: |
+          set -o pipefail
+          RESUME_FROM="$(grep --text 'mvn <args> -rf ' test.log | tail -n1 | sed 's/.*-rf/-rf/')"
+          mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS $RESUME_FROM | tee -a test.log
+      - name: Unit tests (retry)
+        id: test-retry-retry
+        if: steps.test-retry.outcome=='failure'
+        run: |
+          set -o pipefail
+          RESUME_FROM="$(grep --text 'mvn <args> -rf ' test.log | tail -n1 | sed 's/.*-rf/-rf/')"
+          mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS $RESUME_FROM | tee -a test.log
       - name: Remove geomesa artifacts
         if: success() || failure()
         run: rm -rf ~/.m2/repository/org/locationtech/geomesa
diff --git a/.github/workflows/build-and-test-2.13.yml b/.github/workflows/build-and-test-2.13.yml
@@ -18,8 +18,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -30,12 +30,25 @@ jobs:
         run: ./build/mvn clean install $MAVEN_CLI_OPTS -DskipTests -T4
       - name: Unit tests
         id: test
-        run: (set -o pipefail && mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS | tee test.log)
         continue-on-error: true
+        run: |
+          set -o pipefail
+          mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS | tee -a test.log
       - name: Unit tests (retry)
         id: test-retry
         if: steps.test.outcome=='failure'
-        run: mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS $(tail -n2 test.log | grep 'rf' | sed 's/.*-rf/-rf/')
+        continue-on-error: true
+        run: |
+          set -o pipefail
+          RESUME_FROM="$(grep --text 'mvn <args> -rf ' test.log | tail -n1 | sed 's/.*-rf/-rf/')"
+          mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS $RESUME_FROM | tee -a test.log
+      - name: Unit tests (retry)
+        id: test-retry-retry
+        if: steps.test-retry.outcome=='failure'
+        run: |
+          set -o pipefail
+          RESUME_FROM="$(grep --text 'mvn <args> -rf ' test.log | tail -n1 | sed 's/.*-rf/-rf/')"
+          mvn surefire:test $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS $RESUME_FROM | tee -a test.log
       - name: Remove geomesa artifacts
         if: success() || failure()
         run: rm -rf ~/.m2/repository/org/locationtech/geomesa
diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
@@ -32,14 +32,30 @@ jobs:
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
     name: Codacy Security Scan
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tool:
+          - bandit
+          - csslint
+          - jacksonlinter
+          - jshint
+          - prospector
+          - pylint
+          - pylintpython3
+          - remark-lint
+          - SQLint
+          - shellcheck
+          - stylelint
+          - tsqllint
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
+        uses: codacy/codacy-analysis-cli-action@33d455949345bddfdb845fba76b57b70cc83754b
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
@@ -52,9 +68,11 @@ jobs:
           # Force 0 exit code to allow SARIF file generation
           # This will handover control about PR rejection to the GitHub side
           max-allowed-issues: 2147483647
+          tool: ${{ matrix.tool }}
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
         with:
           sarif_file: results.sarif
+          category: codacy-${{ matrix.tool }}
diff --git a/.github/workflows/eclipse-dash.yml b/.github/workflows/eclipse-dash.yml
@@ -17,8 +17,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.github/workflows/integration-tests-2.12.yml b/.github/workflows/integration-tests-2.12.yml
@@ -18,8 +18,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.github/workflows/integration-tests-2.13.yml b/.github/workflows/integration-tests-2.13.yml
@@ -18,8 +18,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
@@ -18,8 +18,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-      - uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -59,14 +59,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
         with:
           sarif_file: results.sarif
diff --git a/build/cqs.tsv b/build/cqs.tsv
@@ -117,8 +117,8 @@ jakarta.transaction:jakarta.transaction-api	1.3.3	compile
 javax.annotation:javax.annotation-api	1.2	compile
 javax.measure:unit-api	2.1.2	compile
 joda-time:joda-time	2.12.6	compile
-net.java.dev.jna:jna	4.5.2	compile
-net.java.dev.jna:jna-platform	4.5.2	compile
+net.java.dev.jna:jna	5.14.0	compile
+net.java.dev.jna:jna-platform	5.14.0	compile
 net.jodah:typetools	0.6.1	compile
 net.sf.geographiclib:GeographicLib-Java	1.49	compile
 net.sf.saxon:Saxon-HE	12.4	compile
@@ -135,7 +135,7 @@ org.apache.arrow:arrow-vector	15.0.2	compile
 org.apache.avro:avro	1.11.3	compile
 org.apache.commons:commons-collections4	4.4	compile
 org.apache.commons:commons-compress	1.26.0	compile
-org.apache.commons:commons-configuration2	2.9.0	compile
+org.apache.commons:commons-configuration2	2.10.1	compile
 org.apache.commons:commons-crypto	1.1.0	compile
 org.apache.commons:commons-csv	1.10.0	compile
 org.apache.commons:commons-dbcp2	2.11.0	compile
@@ -152,23 +152,25 @@ org.apache.hbase.thirdparty:hbase-shaded-miscellaneous	4.1.5	compile
 org.apache.hbase.thirdparty:hbase-shaded-netty	4.1.5	compile
 org.apache.hbase.thirdparty:hbase-shaded-protobuf	4.1.5	compile
 org.apache.hbase.thirdparty:hbase-unsafe	4.1.5	compile
-org.apache.hbase:hbase-asyncfs	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-client	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-common	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-logging	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-mapreduce	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-metrics	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-metrics-api	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-protocol	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-protocol-shaded	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-replication	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-zookeeper	2.5.7-hadoop3	compile
+org.apache.hbase:hbase-asyncfs	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-client	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-common	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-hadoop-compat	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-hadoop2-compat	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-logging	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-mapreduce	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-metrics	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-metrics-api	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-protocol	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-protocol-shaded	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-replication	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-zookeeper	2.5.8-hadoop3	compile
 org.apache.htrace:htrace-core	3.2.0-incubating	compile
 org.apache.httpcomponents:httpclient	4.5.14	compile
 org.apache.httpcomponents:httpcore	4.4.16	compile
-org.apache.orc:orc-core	nohive:1.9.2	compile
-org.apache.orc:orc-mapreduce	nohive:1.9.2	compile
-org.apache.orc:orc-shims	1.9.2	compile
+org.apache.orc:orc-core	nohive:1.9.3	compile
+org.apache.orc:orc-mapreduce	nohive:1.9.3	compile
+org.apache.orc:orc-shims	1.9.3	compile
 org.apache.parquet:parquet-column	1.13.1	compile
 org.apache.parquet:parquet-common	1.13.1	compile
 org.apache.parquet:parquet-encoding	1.13.1	compile
@@ -179,8 +181,8 @@ org.apache.thrift:libthrift	0.17.0	compile
 org.apache.xml:xml-commons-resolver	1.2	compile
 org.apache.yetus:audience-annotations	0.12.0	compile
 org.apache.yetus:audience-annotations	0.13.0	compile
-org.apache.zookeeper:zookeeper	3.9.1	compile
-org.apache.zookeeper:zookeeper-jute	3.9.1	compile
+org.apache.zookeeper:zookeeper	3.9.2	compile
+org.apache.zookeeper:zookeeper-jute	3.9.2	compile
 org.apiguardian:apiguardian-api	1.1.2	compile
 org.calrissian.mango:mango-core	3.0.0	compile
 org.checkerframework:checker-qual	3.37.0	compile
@@ -275,11 +277,11 @@ org.apache.hadoop:hadoop-client	3.3.6	provided
 org.apache.hadoop:hadoop-common	3.3.6	provided
 org.apache.hadoop:hadoop-distcp	3.3.6	provided
 org.apache.hadoop:hadoop-hdfs	3.3.6	provided
-org.apache.hadoop:hadoop-mapreduce-client-common	3.3.6	provided
 org.apache.hadoop:hadoop-mapreduce-client-core	3.3.6	provided
+org.apache.hadoop:hadoop-mapreduce-client-jobclient	3.3.6	provided
 org.apache.hadoop:hadoop-yarn-api	3.3.6	provided
 org.apache.hadoop:hadoop-yarn-common	3.3.6	provided
-org.apache.hbase:hbase-server	2.5.7-hadoop3	provided
+org.apache.hbase:hbase-server	2.5.8-hadoop3	provided
 org.apache.htrace:htrace-core4	4.1.0-incubating	provided
 org.apache.kafka:kafka-clients	3.7.0	provided
 org.apache.kafka:kafka-streams-scala_2.12	3.7.0	provided
@@ -291,7 +293,7 @@ org.apache.spark:spark-core_2.12	3.5.0	provided
 org.apache.spark:spark-sql_2.12	3.5.0	provided
 org.scala-lang:scala-compiler	2.12.19	provided
 org.slf4j:slf4j-reload4j	1.7.36	provided
-org.springframework.security:spring-security-core	5.8.9	provided
+org.springframework.security:spring-security-core	5.8.11	provided
 
 com.sun.xml.bind:jaxb-impl	2.2.3	test
 com.uber:h3	4.1.1	test
@@ -302,16 +304,15 @@ org.apache.arrow:arrow-vector	tests:15.0.2	test
 org.apache.cassandra:cassandra-all	3.11.14	test
 org.apache.cassandra:cassandra-thrift	3.11.14	test
 org.apache.curator:curator-test	5.6.0	test
-org.apache.hadoop:hadoop-minicluster	3.3.6	test
-org.apache.hbase:hbase-testing-util	2.5.7-hadoop3	test
+org.apache.hbase:hbase-testing-util	2.5.8-hadoop3	test
 org.apache.kafka:kafka-clients	test:3.7.0	test
 org.apache.kafka:kafka-streams-test-utils	3.7.0	test
 org.apache.logging.log4j:log4j-api	2.22.1	test
 org.apache.logging.log4j:log4j-core	2.22.1	test
 org.apache.sedona:sedona-common	1.5.0	test
 org.cassandraunit:cassandra-unit	3.7.1.0	test
 org.codehaus.groovy:groovy-jsr223	3.0.20	test
-org.geomesa.testcontainers:testcontainers-accumulo	1.1.0	test
+org.geomesa.testcontainers:testcontainers-accumulo	1.3.0	test
 org.geotools:gt-epsg-hsql	30.2	test
 org.jruby:jruby	9.4.5.0	test
 org.mockito:mockito-core	2.28.2	test

diff --git a/docs/user/upgrade.rst b/docs/user/upgrade.rst
@@ -151,7 +151,7 @@ The following dependencies have been upgraded:
 * commons-cli ``1.2`` -> ``1.6.0``
 * commons-codec ``1.15`` -> ``1.16.0``
 * commons-compress ``1.22`` -> ``1.26.0``
-* commons-configuration2 ``2.5`` -> ``2.9.0``
+* commons-configuration2 ``2.5`` -> ``2.10.1``
 * commons-csv ``1.9.0`` -> ``1.10.0``
 * commons-dbcp2 ``2.6.0`` -> ``2.11.0``
 * commons-io ``2.8.0`` -> ``2.15.1``
@@ -165,7 +165,7 @@ The following dependencies have been upgraded:
 * gson ``2.10`` -> ``2.10.1``
 * guava ``30.1-jre`` -> ``32.0.0-jre``
 * hadoop ``2.10.2`` -> ``3.3.6``
-* hbase ``2.5.2`` -> ``2.5.7``
+* hbase ``2.5.2`` -> ``2.5.8-hadoop3``
 * httpclient ``4.5.13`` -> ``4.5.14``
 * httpcore ``4.4.15`` -> ``4.4.16``
 * io.netty ``4.1.85.Final`` -> ``4.1.106.Final``
@@ -174,7 +174,7 @@ The following dependencies have been upgraded:
 * jedis ``4.3.1`` -> ``5.1.0``
 * kafka ``2.8.2`` -> ``3.7.0``
 * kryo ``4.0.2`` -> ``4.0.3``
-* orc ``1.8.2`` -> ``1.9.2``
+* orc ``1.8.2`` -> ``1.9.3``
 * org.eclipse.emf.common ``2.15.0`` -> ``2.29.0``
 * org.eclipse.emf.ecore ``2.15.0`` -> ``2.35.0``
 * org.eclipse.emf.ecore.xmi ``2.15.0`` -> ``2.36.0``
@@ -190,12 +190,12 @@ The following dependencies have been upgraded:
 * sedona ``1.3.1-incubating`` -> ``1.5.0``
 * si.uom ``2.0.1`` -> ``2.1``
 * spark ``3.3.1`` -> ``3.5.0``
-* spring-security ``5.8.0`` -> ``5.8.9``
+* spring-security ``5.8.0`` -> ``5.8.11``
 * systems.uom ``2.0.2`` -> ``2.1``
 * tech.units:indriya ``2.0.2`` -> ``2.2``
 * tech.uom.lib ``2.0`` -> ``2.1``
 * xmlresolver ``4.4.3`` -> ``5.2.2``
-* zookeeper ``3.5.10`` -> ``3.9.1``
+* zookeeper ``3.5.10`` -> ``3.9.2``
 
 Deprecated Classes and Methods
 ------------------------------

diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml
@@ -82,20 +82,6 @@
             <groupId>org.geomesa.testcontainers</groupId>
             <artifactId>testcontainers-accumulo</artifactId>
         </dependency>
-        <dependency>
-            <!-- 'works with' due to license issues -->
-            <groupId>org.xerial.snappy</groupId>
-            <artifactId>snappy-java</artifactId>
-            <version>${snappy.java.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- used by hadoop-minicluster -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${hadoop.minicluster.mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/avro/ingest_avro.sh b/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/avro/ingest_avro.sh
diff --git a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/csv/ingest_csv.sh b/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/csv/ingest_csv.sh