Skip to content

Commit 9b6f84e

Browse files
elahrvivazelahrvivaz
authored
Archetype for Spark runtime modules (#3457)
* Add new geomesa-archetypes-spark-runtime parent module * Use jackson for geomesa-convert-json parsing * Split up spark tests and remove spark-test module * Move javadocs CI to weekly job
1 parent b0cbc62 commit 9b6f84e

File tree

59 files changed

+857
-1068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+857
-1068
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ env:
1616
JAVA_VERSION: 17
1717
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
1818
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -T4
19-
MAVEN_COMPILE_SPARK_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -T4
2019
MAVEN_TEST_ARGS: test -Dmaven.main.skip
21-
MAVEN_TEST_IT_ARGS: test failsafe:integration-test failsafe:verify -Dmaven.main.skip -DskipTests
22-
MAVEN_TEST_SPARK_ARGS: test -Dmaven.main.skip -Dtest.fork.count=2
2320

2421
jobs:
2522
build:
@@ -82,11 +79,9 @@ jobs:
8279
with:
8380
distribution: temurin
8481
java-version: "${{ env.JAVA_VERSION }}"
85-
- name: Generate cache key
86-
run: echo "MOD_SELECTOR=$(echo '${{ matrix.projects.list }}' | sed 's/[^a-zA-Z0-9_.-]/-/g' | head -c 256)" >> "$GITHUB_ENV"
8782
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
8883
with:
89-
key: ${{ hashFiles('**/pom.xml') }}-build-${{ matrix.scala-version }}-${{ env.MOD_SELECTOR }}
84+
key: ${{ hashFiles('**/pom.xml') }}-build-${{ matrix.scala-version }}-${{ matrix.projects.name }}
9085
path: ~/.m2/repository/
9186
- name: Set Scala version
9287
run: ./build/scripts/change-scala-version.sh ${{ matrix.scala-version }}
@@ -116,36 +111,6 @@ jobs:
116111
- name: Remove geomesa artifacts
117112
if: success() || failure()
118113
run: rm -rf ~/.m2/repository/org/locationtech/geomesa
119-
integration-tests:
120-
name: integration-tests / ${{ matrix.scala-version }}
121-
runs-on: ubuntu-latest
122-
strategy:
123-
fail-fast: false
124-
matrix:
125-
scala-version: [ "2.12", "2.13" ]
126-
steps:
127-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
128-
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
129-
with:
130-
distribution: temurin
131-
java-version: "${{ env.JAVA_VERSION }}"
132-
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
133-
with:
134-
key: ${{ hashFiles('**/pom.xml') }}-it-${{ matrix.scala-version }}
135-
path: ~/.m2/repository/
136-
- name: Set Scala version
137-
run: ./build/scripts/change-scala-version.sh ${{ matrix.scala-version }}
138-
- name: Find tests
139-
run: |
140-
export IT_MODULES="$(find . -path '*/src/test/*' -name '*IT.scala' -o -name '*IT.java' | sed 's|\(.*\)src/test.*|\1|' | sort -u | tr '\n' ',')"
141-
echo "IT_MODULES=$IT_MODULES" >> "$GITHUB_ENV"
142-
- name: Build with Maven
143-
run: mvn $MAVEN_COMPILE_ARGS $MAVEN_CLI_OPTS -am -pl "$IT_MODULES"
144-
- name: Integration Tests
145-
run: mvn $MAVEN_TEST_IT_ARGS $MAVEN_CLI_OPTS -pl "$IT_MODULES"
146-
- name: Remove geomesa artifacts
147-
if: success() || failure()
148-
run: rm -rf ~/.m2/repository/org/locationtech/geomesa
149114
validate-ci:
150115
# validates that we haven't missed any projects in our build matrix
151116
name: validate-ci
@@ -159,7 +124,7 @@ jobs:
159124
grep -q 'packaging>pom' "$pom" || {
160125
module="${pom%/pom.xml}"
161126
module="${module#./}"
162-
if [[ $module != *distributed-runtime* && $module != geomesa-spark/geomesa-spark-test ]]; then
127+
if [[ $module != *distributed-runtime* ]]; then
163128
echo "Checking $module"
164129
yq -e '.jobs.build.strategy.matrix.projects[].list | select(test("(^|[, ])'"${module}"'($|[, ])"))' .github/workflows/build-and-test.yml >/dev/null 2>&1 || exit 1
165130
fi

‎.github/workflows/integration-tests.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: integration-tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- '[0-9]+.[0-9]+.x'
8+
tags:
9+
- '**'
10+
pull_request:
11+
12+
permissions: # added using https://github.com/step-security/secure-repo
13+
contents: read
14+
15+
env:
16+
JAVA_VERSION: 17
17+
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
18+
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -T4
19+
MAVEN_IT_COMPILE_ARGS: test -Dmaven.main.skip -DskipTests
20+
MAVEN_IT_TEST_ARGS: failsafe:integration-test failsafe:verify
21+
22+
jobs:
23+
integration-tests:
24+
name: test / ${{ matrix.projects.name }} / ${{ matrix.scala-version }}
25+
runs-on: ubuntu-latest
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
scala-version: [ "2.12", "2.13" ]
30+
projects:
31+
- name: accumulo-ds
32+
list: geomesa-accumulo/geomesa-accumulo-datastore
33+
steps:
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
35+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
36+
with:
37+
distribution: temurin
38+
java-version: "${{ env.JAVA_VERSION }}"
39+
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
40+
with:
41+
key: ${{ hashFiles('**/pom.xml') }}-it-${{ matrix.scala-version }}-${{ matrix.projects.name }}
42+
path: ~/.m2/repository/
43+
- name: Set Scala version
44+
run: ./build/scripts/change-scala-version.sh ${{ matrix.scala-version }}
45+
- name: Build with Maven
46+
run: |
47+
mvn $MAVEN_COMPILE_ARGS $MAVEN_CLI_OPTS -am -pl ${{ matrix.projects.list }}
48+
mvn $MAVEN_IT_COMPILE_ARGS $MAVEN_CLI_OPTS -pl ${{ matrix.projects.list }}
49+
- name: Integration tests
50+
run: mvn $MAVEN_IT_TEST_ARGS $MAVEN_CLI_OPTS -pl ${{ matrix.projects.list }}
51+
- name: Remove geomesa artifacts
52+
if: success() || failure()
53+
run: rm -rf ~/.m2/repository/org/locationtech/geomesa
54+
validate-ci:
55+
# validates that we haven't missed any projects in our build matrix
56+
name: validate-ci
57+
runs-on: ubuntu-latest
58+
if: github.event_name == 'pull_request'
59+
steps:
60+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
61+
- name: Validate project list
62+
run: |
63+
while IFS= read -r -d '' test_class; do
64+
module="${test_class%/src/test/*}"
65+
module="${module#./}"
66+
if [[ $module != *spark ]]; then
67+
echo "Checking $module"
68+
yq -e '.jobs.integration-tests.strategy.matrix.projects[].list | select(test("(^|[, ])'"${module}"'($|[, ])"))' .github/workflows/integration-tests.yml >/dev/null 2>&1 || exit 1
69+
fi
70+
done < <(find . -name '*IT.scala' -print0)
71+
echo "done"

‎.github/workflows/javadocs.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
name: javadocs
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- '[0-9]+.[0-9]+.x'
8-
tags:
9-
- '**'
10-
pull_request:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '40 21 * * 0'
117

128
permissions: # added using https://github.com/step-security/secure-repo
139
contents: read

‎.github/workflows/spark.yml‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,26 @@ env:
1616
JAVA_VERSION: 17
1717
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
1818
MAVEN_COMPILE_SPARK_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -T4
19-
MAVEN_TEST_SPARK_ARGS: test -Dmaven.main.skip -Dtest.fork.count=2
19+
MAVEN_TEST_SPARK_ARGS: test failsafe:integration-test failsafe:verify -Dmaven.main.skip -Dtest.fork.count=2
2020

2121
jobs:
2222
integration-tests:
23-
name: integration-tests / ${{ matrix.scala-version }}
23+
name: integration-tests / ${{ matrix.projects.name }} / ${{ matrix.scala-version }}
2424
runs-on: ubuntu-latest
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
scala-version: [ "2.12" ] # note: spark 3.x doesn't support scala 2.13
28+
scala-version: [ "2.12" ] # note: spark 3.x doesn't have dockers for scala 2.13
29+
projects:
30+
- name: accumulo
31+
list: geomesa-accumulo/geomesa-accumulo-spark
32+
- name: fs
33+
list: geomesa-fs/geomesa-fs-spark
34+
- name: gt
35+
list: geomesa-gt/geomesa-gt-spark
36+
# TODO we don't have any tests for hbase spark runtime
37+
- name: hbase
38+
list: geomesa-hbase/geomesa-hbase-spark
2939
steps:
3040
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3141
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -34,16 +44,32 @@ jobs:
3444
java-version: "${{ env.JAVA_VERSION }}"
3545
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
3646
with:
37-
key: ${{ hashFiles('**/pom.xml') }}-spark-integration-tests-${{ matrix.scala-version }}
47+
key: ${{ hashFiles('**/pom.xml') }}-spark-integration-tests-${{ matrix.scala-version }}-${{ matrix.projects.name }}
3848
path: ~/.m2/repository/
3949
- name: Set Scala version
4050
run: ./build/scripts/change-scala-version.sh ${{ matrix.scala-version }}
4151
- name: Build with Maven
42-
# TODO we don't have any tests for hbase spark runtime - maybe split up the test modules since this job is already slow
43-
run: mvn $MAVEN_COMPILE_SPARK_ARGS $MAVEN_CLI_OPTS -am -pl geomesa-spark/geomesa-spark-test
52+
run: mvn $MAVEN_COMPILE_SPARK_ARGS $MAVEN_CLI_OPTS -am -pl ${{ matrix.projects.list }}
4453
- name: Run Spark tests
45-
if: matrix.scala-version == '2.12' # there's no 2.13 spark docker container
46-
run: mvn $MAVEN_TEST_SPARK_ARGS $MAVEN_CLI_OPTS -pl geomesa-spark/geomesa-spark-test
54+
run: mvn $MAVEN_TEST_SPARK_ARGS $MAVEN_CLI_OPTS -pl ${{ matrix.projects.list }}
4755
- name: Remove geomesa artifacts
4856
if: success() || failure()
4957
run: rm -rf ~/.m2/repository/org/locationtech/geomesa
58+
validate-ci:
59+
# validates that we haven't missed any projects in our build matrix
60+
name: validate-ci
61+
runs-on: ubuntu-latest
62+
if: github.event_name == 'pull_request'
63+
steps:
64+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
65+
- name: Validate project list
66+
run: |
67+
while IFS= read -r -d '' test_class; do
68+
module="${test_class%/src/test/*}"
69+
module="${module#./}"
70+
if [[ $module =~ .*spark ]]; then
71+
echo "Checking $module"
72+
yq -e '.jobs.integration-tests.strategy.matrix.projects[].list | select(test("(^|[, ])'"${module}"'($|[, ])"))' .github/workflows/spark.yml >/dev/null 2>&1 || exit 1
73+
fi
74+
done < <(find . -name '*IT.scala' -print0)
75+
echo "done"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ Maven artifacts are published nightly to the Eclipse Maven repository:
172172
## Building from Source
173173

174174
&nbsp;&nbsp;
175-
[![Build Status](https://github.com/locationtech/geomesa/actions/workflows/main-build.yml/badge.svg?branch=main)](https://github.com/locationtech/geomesa/actions/workflows/main-build.yml?query=branch%3Amain) &nbsp;
175+
[![Build Status](https://github.com/locationtech/geomesa/actions/workflows/build-and-test.yml/badge.svg?branch=main)](https://github.com/locationtech/geomesa/actions/workflows/build-and-test.yml/badge.svg?branch=main) &nbsp;
176176
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/locationtech/geomesa/badge)](https://api.securityscorecards.dev/projects/github.com/locationtech/geomesa)
177177

178178
Requirements:

‎build/dependencies.txt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ com.github.pureconfig:pureconfig-generic-base_2.12:0.17.4:compile
1515
com.github.pureconfig:pureconfig-generic_2.12:0.17.4:compile
1616
com.github.pureconfig:pureconfig_2.12:0.17.4:compile
1717
com.google.code.gson:gson:2.10.1:compile
18+
com.google.errorprone:error_prone_annotations:2.26.1:compile
1819
com.google.flatbuffers:flatbuffers-java:25.2.10:compile
1920
com.google.guava:failureaccess:1.0.2:compile
2021
com.google.guava:failureaccess:1.0.3:compile
@@ -23,6 +24,9 @@ com.google.guava:guava:18.0:compile
2324
com.google.guava:guava:27.0-jre:compile
2425
com.google.guava:guava:33.2.1-jre:compile
2526
com.google.guava:guava:33.4.6-jre:compile
27+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:compile
28+
com.google.j2objc:j2objc-annotations:1.1:compile
29+
com.google.j2objc:j2objc-annotations:3.0.0:compile
2630
com.google.protobuf:protobuf-java:2.5.0:compile
2731
com.google.protobuf:protobuf-java:3.25.6:compile
2832
com.google.re2j:re2j:1.1:compile
@@ -31,7 +35,6 @@ com.googlecode.concurrent-trees:concurrent-trees:2.6.1:compile
3135
com.googlecode.cqengine:cqengine:3.6.0:compile
3236
com.googlecode.json-simple:json-simple:1.1.1:compile
3337
com.jayway.jsonpath:json-path:2.9.0:compile
34-
com.thoughtworks.paranamer:paranamer:2.8:compile
3538
com.typesafe.scala-logging:scala-logging_2.12:3.9.5:compile
3639
com.typesafe:config:1.4.3:compile
3740
commons-cli:commons-cli:1.6.0:compile
@@ -155,6 +158,7 @@ org.apache.hbase:hbase-zookeeper:2.6.3-hadoop3:compile
155158
org.apache.orc:orc-core:nohive:1.9.7:compile
156159
org.apache.orc:orc-mapreduce:nohive:1.9.7:compile
157160
org.apache.orc:orc-shims:1.9.7:compile
161+
org.apache.parquet:parquet-avro:1.13.1:compile
158162
org.apache.parquet:parquet-avro:1.15.2:compile
159163
org.apache.parquet:parquet-column:1.15.2:compile
160164
org.apache.parquet:parquet-common:1.15.2:compile
@@ -169,6 +173,9 @@ org.apache.zookeeper:zookeeper-jute:3.9.3:compile
169173
org.apache.zookeeper:zookeeper:3.9.3:compile
170174
org.apiguardian:apiguardian-api:1.1.2:compile
171175
org.calrissian.mango:mango-core:3.0.0:compile
176+
org.checkerframework:checker-qual:2.5.2:compile
177+
org.checkerframework:checker-qual:3.42.0:compile
178+
org.codehaus.mojo:animal-sniffer-annotations:1.17:compile
172179
org.datasyslab:s2-geometry-library:20250620-rc1:compile
173180
org.eclipse.emf:org.eclipse.emf.common:2.15.0:compile
174181
org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.15.0:compile
@@ -245,11 +252,6 @@ org.huldra.math:bigint:0.7.1:compile
245252
org.jetbrains:annotations:17.0.0:compile
246253
org.jruby.jcodings:jcodings:1.0.58:compile
247254
org.jruby.joni:joni:2.2.1:compile
248-
org.json4s:json4s-ast_2.12:4.0.7:compile
249-
org.json4s:json4s-core_2.12:4.0.7:compile
250-
org.json4s:json4s-native-core_2.12:4.0.7:compile
251-
org.json4s:json4s-native_2.12:4.0.7:compile
252-
org.json4s:json4s-scalap_2.12:4.0.7:compile
253255
org.jspecify:jspecify:1.0.0:compile
254256
org.locationtech.jts.io:jts-io-common:1.20.0:compile
255257
org.locationtech.jts:jts-core:1.20.0:compile
@@ -307,11 +309,8 @@ com.github.pjfanning:jersey-json:1.22.0:provided
307309
com.github.stephenc.jcip:jcip-annotations:1.0-1:provided
308310
com.google.code.findbugs:jsr305:3.0.2:provided
309311
com.google.crypto.tink:tink:1.9.0:provided
310-
com.google.errorprone:error_prone_annotations:2.26.1:provided
311-
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:provided
312312
com.google.inject.extensions:guice-servlet:4.2.3:provided
313313
com.google.inject:guice:4.2.3:provided
314-
com.google.j2objc:j2objc-annotations:3.0.0:provided
315314
com.jcraft:jsch:0.1.55:provided
316315
com.lmax:disruptor:3.4.4:provided
317316
com.nimbusds:nimbus-jose-jwt:9.37.2:provided
@@ -325,6 +324,7 @@ com.sun.jersey:jersey-servlet:1.19.4:provided
325324
com.sun.xml.bind:jaxb-core:4.0.4:provided
326325
com.sun.xml.bind:jaxb-impl:4.0.4:provided
327326
com.sun.xml.fastinfoset:FastInfoset:1.2.15:provided
327+
com.thoughtworks.paranamer:paranamer:2.8:provided
328328
com.twitter:chill-java:0.10.0:provided
329329
com.twitter:chill_2.12:0.10.0:provided
330330
com.univocity:univocity-parsers:2.9.1:provided
@@ -423,6 +423,12 @@ org.apache.logging.log4j:log4j-core:2.20.0:provided
423423
org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0:provided
424424
org.apache.orc:orc-core:shaded-protobuf:1.9.7:provided
425425
org.apache.orc:orc-mapreduce:shaded-protobuf:1.9.7:provided
426+
org.apache.parquet:parquet-column:1.13.1:provided
427+
org.apache.parquet:parquet-common:1.13.1:provided
428+
org.apache.parquet:parquet-encoding:1.13.1:provided
429+
org.apache.parquet:parquet-format-structures:1.13.1:provided
430+
org.apache.parquet:parquet-hadoop:1.13.1:provided
431+
org.apache.parquet:parquet-jackson:1.13.1:provided
426432
org.apache.parquet:parquet-jackson:1.15.2:provided
427433
org.apache.sedona:sedona-spark-3.5_2.12:1.8.0:provided
428434
org.apache.sedona:sedona-spark-common-3.5_2.12:1.8.0:provided
@@ -447,7 +453,6 @@ org.apache.tomcat:tomcat-util-scan:9.0.104:provided
447453
org.apache.tomcat:tomcat-util:9.0.104:provided
448454
org.apache.xbean:xbean-asm9-shaded:4.23:provided
449455
org.bouncycastle:bcprov-jdk18on:1.78.1:provided
450-
org.checkerframework:checker-qual:3.42.0:provided
451456
org.codehaus.janino:commons-compiler:3.1.9:provided
452457
org.codehaus.janino:janino:3.1.9:provided
453458
org.codehaus.jettison:jettison:1.5.4:provided
@@ -481,19 +486,15 @@ org.glassfish.jersey.core:jersey-client:2.40:provided
481486
org.glassfish.jersey.core:jersey-common:2.40:provided
482487
org.glassfish.jersey.core:jersey-server:2.40:provided
483488
org.glassfish.jersey.inject:jersey-hk2:2.40:provided
484-
org.hdrhistogram:HdrHistogram:2.2.2:provided
485489
org.jamon:jamon-runtime:2.4.1:provided
486490
org.javassist:javassist:3.29.2-GA:provided
487491
org.javassist:javassist:3.30.2-GA:provided
488492
org.jline:jline:3.9.0:provided
489-
org.json4s:json4s-ast_2.12:3.6.12:provided
490-
org.json4s:json4s-core_2.12:3.6.12:provided
491-
org.json4s:json4s-jackson-core_2.12:4.0.7:provided
492-
org.json4s:json4s-jackson_2.12:3.6.12:provided
493-
org.json4s:json4s-jackson_2.12:4.0.7:provided
494-
org.json4s:json4s-scalap_2.12:3.6.12:provided
493+
org.json4s:json4s-ast_2.12:3.7.0-M11:provided
494+
org.json4s:json4s-core_2.12:3.7.0-M11:provided
495+
org.json4s:json4s-jackson_2.12:3.7.0-M11:provided
496+
org.json4s:json4s-scalap_2.12:3.7.0-M11:provided
495497
org.jvnet.staxex:stax-ex:1.8:provided
496-
org.latencyutils:LatencyUtils:2.0.3:provided
497498
org.lz4:lz4-java:1.8.0:provided
498499
org.ow2.asm:asm-analysis:5.0.3:provided
499500
org.ow2.asm:asm-commons:5.0.3:provided
@@ -510,7 +511,6 @@ org.scala-lang.modules:scala-collection-compat_2.12:2.7.0:provided
510511
org.scala-lang.modules:scala-parser-combinators_2.12:2.3.0:provided
511512
org.scala-lang:scala-compiler:2.12.20:provided
512513
org.slf4j:jcl-over-slf4j:2.0.7:provided
513-
org.slf4j:slf4j-api:2.0.17:provided
514514
org.slf4j:slf4j-reload4j:1.7.36:provided
515515
org.springframework.security:spring-security-core:5.8.15:provided
516516
org.springframework.security:spring-security-crypto:5.8.15:provided

‎build/templates/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ Maven artifacts are published nightly to the Eclipse Maven repository:
172172
## Building from Source
173173

174174
&nbsp;&nbsp;
175-
[![Build Status](https://github.com/locationtech/geomesa/actions/workflows/main-build.yml/badge.svg?branch=main)](https://github.com/locationtech/geomesa/actions/workflows/main-build.yml?query=branch%3Amain) &nbsp;
175+
[![Build Status](https://github.com/locationtech/geomesa/actions/workflows/build-and-test.yml/badge.svg?branch=main)](https://github.com/locationtech/geomesa/actions/workflows/build-and-test.yml/badge.svg?branch=main) &nbsp;
176176
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/locationtech/geomesa/badge)](https://api.securityscorecards.dev/projects/github.com/locationtech/geomesa)
177177

178178
Requirements:

‎build/test/resources/log4j2-test.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<Logger name="org.apache.sedona.viz.core.Serde" level="warn"/>
1313
<Logger name="org.apache.sedona.core.joinJudgement" level="warn"/>
1414
<Logger name="org.apache.curator" level="warn"/>
15+
<Logger name="org.apache.hadoop" level="warn"/>
16+
<Logger name="org.apache.parquet.hadoop" level="warn"/>
1517
<Logger name="org.apache.zookeeper" level="warn"/>
1618
<Root level="info">
1719
<AppenderRef ref="Console"/>

‎geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreFactory.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class AccumuloDataStoreFactory extends DataStoreFactorySpi {
5959
AccumuloDataStoreFactory.ParameterInfo ++
6060
Array(AccumuloDataStoreParams.NamespaceParam, AccumuloDataStoreFactory.DeprecatedGeoServerPasswordParam)
6161

62-
override def canProcess(params: java.util.Map[String,_]): Boolean =
62+
override def canProcess(params: java.util.Map[String, _]): Boolean =
6363
AccumuloDataStoreFactory.canProcess(params)
6464

6565
override def getImplementationHints: java.util.Map[RenderingHints.Key, _] = null

0 commit comments

Comments
 (0)