Skip to content

Commit 1c0555a

Browse files
authored
GEOMESA-3533 Remove deprecated methods for 6.0.0 release (#3448)
* See 'docs/user/upgrade.rst' for details
1 parent 0ba2275 commit 1c0555a

File tree

401 files changed

+3239
-7552
lines changed

Some content is hidden

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

401 files changed

+3239
-7552
lines changed

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

Lines changed: 133 additions & 194 deletions
Large diffs are not rendered by default.

.github/workflows/codacy.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,9 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
tool:
40-
- bandit
4140
- csslint
42-
- jacksonlinter
43-
- jshint
44-
- prospector
45-
- pylint
46-
- pylintpython3
4741
- remark-lint
48-
- SQLint
4942
- shellcheck
50-
- stylelint
5143
steps:
5244
# Checkout the repository to the GitHub Actions runner
5345
- name: Checkout code

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ cd geomesa
198198
The project is built using Maven. To build, run:
199199

200200
```bash
201-
mvn clean install -DskipTests
201+
mvn clean install -Dmaven.test.skip
202202
```
203203

204204
The full build takes quite a while. To speed it up, you may use multiple threads (`-T 1.5C`).
205205

206-
To run unit tests, omit the `-DskipTests` (note: requires `docker` to be available).
206+
To run unit tests, omit the `-Dmaven.test.skip` (note: requires `docker` to be available).
207207

208208
### Build with Bloop Compile Server
209209

build/cqs.tsv

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
com.amazonaws:aws-java-sdk-cloudwatch 1.12.735 compile
2-
com.amazonaws:aws-java-sdk-core 1.12.735 compile
3-
com.amazonaws:jmespath-java 1.12.735 compile
41
com.beust:jcommander 1.82 compile
52
com.chuusai:shapeless_2.12 2.3.10 compile
63
com.clearspring.analytics:stream 2.9.8 compile
@@ -10,7 +7,6 @@ com.facebook:nailgun-server 1.0.1 compile
107
com.fasterxml.jackson.core:jackson-annotations 2.19.0 compile
118
com.fasterxml.jackson.core:jackson-core 2.19.0 compile
129
com.fasterxml.jackson.core:jackson-databind 2.19.0 compile
13-
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor 2.19.0 compile
1410
com.fasterxml.jackson.datatype:jackson-datatype-jsr310 2.19.0 compile
1511
com.github.ben-manes.caffeine:caffeine 3.1.8 compile
1612
com.github.luben:zstd-jni 1.5.5-11 compile
@@ -47,9 +43,6 @@ commons-logging:commons-logging 1.3.3 compile
4743
commons-pool:commons-pool 1.6 compile
4844
io.airlift:aircompressor 0.27 compile
4945
io.dropwizard.metrics:metrics-core 3.2.6 compile
50-
io.dropwizard.metrics:metrics-graphite 3.2.6 compile
51-
io.dropwizard.metrics:metrics-jvm 3.2.6 compile
52-
io.github.azagniotov:dropwizard-metrics-cloudwatch 1.0.13 compile
5346
io.micrometer:micrometer-commons 1.15.4 compile
5447
io.micrometer:micrometer-core 1.15.4 compile
5548
io.micrometer:micrometer-observation 1.15.4 compile
@@ -95,14 +88,6 @@ io.prometheus:prometheus-metrics-exporter-httpserver 1.4.1 compile
9588
io.prometheus:prometheus-metrics-exposition-textformats 1.4.1 compile
9689
io.prometheus:prometheus-metrics-model 1.4.1 compile
9790
io.prometheus:prometheus-metrics-tracer-common 1.4.1 compile
98-
io.prometheus:simpleclient 0.16.0 compile
99-
io.prometheus:simpleclient_common 0.16.0 compile
100-
io.prometheus:simpleclient_dropwizard 0.16.0 compile
101-
io.prometheus:simpleclient_httpserver 0.16.0 compile
102-
io.prometheus:simpleclient_pushgateway 0.16.0 compile
103-
io.prometheus:simpleclient_tracer_common 0.16.0 compile
104-
io.prometheus:simpleclient_tracer_otel 0.16.0 compile
105-
io.prometheus:simpleclient_tracer_otel_agent 0.16.0 compile
10691
it.geosolutions.imageio-ext:imageio-ext-geocore 2.0.0 compile
10792
it.geosolutions.imageio-ext:imageio-ext-streams 2.0.0 compile
10893
it.geosolutions.imageio-ext:imageio-ext-tiff 2.0.0 compile
@@ -117,7 +102,6 @@ javax.annotation:javax.annotation-api 1.2 compile
117102
javax.annotation:javax.annotation-api 1.3.2 compile
118103
javax.measure:unit-api 2.2 compile
119104
javax.xml.bind:jaxb-api 2.4.0-b180830.0359 compile
120-
joda-time:joda-time 2.12.6 compile
121105
net.java.dev.jna:jna 5.14.0 compile
122106
net.java.dev.jna:jna-platform 5.14.0 compile
123107
net.jodah:typetools 0.6.1 compile
@@ -128,9 +112,7 @@ net.sf.saxon:Saxon-HE 12.4 compile
128112
org.antlr:antlr4-runtime 4.7.2 compile
129113
org.antlr:antlr4-runtime 4.9.3 compile
130114
org.apache.accumulo:accumulo-access 1.0.0-beta compile
131-
org.apache.accumulo:accumulo-core 2.0.1 compile
132115
org.apache.accumulo:accumulo-core 2.1.4 compile
133-
org.apache.accumulo:accumulo-hadoop-mapreduce 2.0.1 compile
134116
org.apache.accumulo:accumulo-hadoop-mapreduce 2.1.4 compile
135117
org.apache.arrow:arrow-format 18.3.0 compile
136118
org.apache.arrow:arrow-memory-core 18.3.0 compile
@@ -170,9 +152,6 @@ org.apache.hbase:hbase-protocol 2.6.3-hadoop3 compile
170152
org.apache.hbase:hbase-protocol-shaded 2.6.3-hadoop3 compile
171153
org.apache.hbase:hbase-replication 2.6.3-hadoop3 compile
172154
org.apache.hbase:hbase-zookeeper 2.6.3-hadoop3 compile
173-
org.apache.htrace:htrace-core 3.2.0-incubating compile
174-
org.apache.httpcomponents:httpclient 4.5.14 compile
175-
org.apache.httpcomponents:httpcore 4.4.16 compile
176155
org.apache.orc:orc-core nohive:1.9.7 compile
177156
org.apache.orc:orc-mapreduce nohive:1.9.7 compile
178157
org.apache.orc:orc-shims 1.9.7 compile
@@ -182,7 +161,6 @@ org.apache.parquet:parquet-common 1.15.2 compile
182161
org.apache.parquet:parquet-encoding 1.15.2 compile
183162
org.apache.parquet:parquet-format-structures 1.15.2 compile
184163
org.apache.parquet:parquet-hadoop 1.15.2 compile
185-
org.apache.thrift:libthrift 0.12.0 compile
186164
org.apache.thrift:libthrift 0.17.0 compile
187165
org.apache.xml:xml-commons-resolver 1.2 compile
188166
org.apache.yetus:audience-annotations 0.12.0 compile
@@ -262,7 +240,6 @@ org.geotools:gt-process 34.0 compile
262240
org.geotools:gt-process-feature 34.0 compile
263241
org.geotools:gt-referencing 34.0 compile
264242
org.geotools:gt-shapefile 34.0 compile
265-
org.geotools:gt-transform 34.0 compile
266243
org.geotools:gt-xml 34.0 compile
267244
org.huldra.math:bigint 0.7.1 compile
268245
org.jetbrains:annotations 17.0.0 compile
@@ -284,7 +261,6 @@ org.objenesis:objenesis 3.3 compile
284261
org.parboiled:parboiled-core 1.4.1 compile
285262
org.parboiled:parboiled-scala_2.12 1.3.1 compile
286263
org.postgresql:postgresql 42.7.7 compile
287-
org.scala-lang.modules:scala-parser-combinators_2.12 2.3.0 compile
288264
org.scala-lang.modules:scala-xml_2.12 2.2.0 compile
289265
org.scala-lang:scala-library 2.12.20 compile
290266
org.scala-lang:scala-reflect 2.12.20 compile
@@ -337,6 +313,7 @@ software.amazon.awssdk:s3 2.25.64 provided
337313
com.github.erosb:everit-json-schema 1.14.4 test
338314
com.uber:h3 4.1.1 test
339315
commons-lang:commons-lang 2.6 test
316+
joda-time:joda-time 2.12.6 test
340317
junit:junit 4.13.2 test
341318
org.apache.arrow:arrow-vector tests:18.3.0 test
342319
org.apache.curator:curator-test 5.6.0 test
@@ -347,6 +324,7 @@ org.codehaus.groovy:groovy-jsr223 3.0.20 test
347324
org.duckdb:duckdb_jdbc 1.2.2.0 test
348325
org.geomesa.testcontainers:testcontainers-accumulo 1.5.0 test
349326
org.geomesa.testcontainers:testcontainers-hbase 1.1.0 test
327+
org.geomesa.testcontainers:testcontainers-spark 1.0.0 test
350328
org.geotools:gt-epsg-hsql 34.0 test
351329
org.geotools:gt-render 34.0 test
352330
org.jruby:jruby 9.4.5.0 test

build/scripts/do-release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ BRANCH="$(git branch --show-current)"
6060
mvn release:prepare \
6161
-DdryRun=true \
6262
-DautoVersionSubmodules=true \
63-
-Darguments="-DskipTests -Dmaven.javadoc.skip=true"
63+
-Darguments="-Dmaven.test.skip -Dmaven.javadoc.skip=true"
6464

6565
RELEASE="$(readPomVersion pom.xml.tag)"
6666
TAG="$(readReleaseProp scm.tag)"
@@ -89,11 +89,11 @@ mvn release:clean
8989
git checkout "$TAG"
9090
mkdir -p "$RELEASE"
9191

92-
mvn clean deploy -Pcentral,python -DskipTests | tee "$RELEASE"/build_2.12.log
92+
mvn clean deploy -Pcentral,python -Dmaven.test.skip | tee "$RELEASE"/build_2.12.log
9393
copyReleaseArtifacts
9494

9595
./build/scripts/change-scala-version.sh 2.13
96-
mvn clean deploy -Pcentral,python -DskipTests | tee "$RELEASE"/build_2.13.log
96+
mvn clean deploy -Pcentral,python -Dmaven.test.skip | tee "$RELEASE"/build_2.13.log
9797
copyReleaseArtifacts
9898

9999
# reset pom changes

build/templates/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ cd geomesa
198198
The project is built using Maven. To build, run:
199199

200200
```bash
201-
mvn clean install -DskipTests
201+
mvn clean install -Dmaven.test.skip
202202
```
203203

204204
The full build takes quite a while. To speed it up, you may use multiple threads (`-T 1.5C`).
205205

206-
To run unit tests, omit the `-DskipTests` (note: requires `docker` to be available).
206+
To run unit tests, omit the `-Dmaven.test.skip` (note: requires `docker` to be available).
207207

208208
### Build with Bloop Compile Server
209209

docs/_static/css/theme_custom.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,13 @@ div.admonition.warning, div.admonition.note {
272272
border-right: 2px solid #c9c9c9;
273273
}
274274

275-
.wy-table-responsive th.head {
275+
.wy-table-responsive th.head, .wy-table-responsive th.stub {
276276
background-color: #c9c9c9 !important;
277+
color: #000;
278+
}
279+
280+
.wy-table-responsive.centered-cells th, .wy-table-responsive.centered-cells td {
281+
text-align: center;
277282
}
278283

279284
.wy-table-responsive table td, .wy-table-responsive table th {

docs/_templates/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<div role="contentinfo">
66
<p>
7-
&copy; Copyright {{copyright}} <a href="https://www.ga-ccri.com/">General Atomics</a>
7+
&copy; Copyright {{copyright}} <a href="https://www.ga-intelligence.com/">General Atomics</a>
88
<br/>
99
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
1010
</p>

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def ultimateReplace(app, docname, source):
2929

3030

3131
ultimate_replacements = {
32-
"{{accumulo_supported_versions}}": target.versions.accumulo_version,
32+
"{{accumulo_supported_versions}}": "version " + target.versions.accumulo_version,
3333
"{{accumulo_required_version}}": target.versions.accumulo_version,
3434
"{{cassandra_supported_versions}}": "version " + target.versions.cassandra_version,
3535
"{{cassandra_required_version}}": target.versions.cassandra_version,
-1.63 KB
Binary file not shown.

0 commit comments

Comments
 (0)