Skip to content

Commit b0f456e

Browse files
elahrvivazelahrvivaz
authored
GEOMESA-3537 Remove deprecated modules for 6.0.0 release (#3446)
* geomesa-metrics-core * geomesa-metrics-cloudwatch * geomesa-metrics-graphite * geomesa-metrics-prometheus * geomesa-zk-utils
1 parent 025fb64 commit b0f456e

File tree

73 files changed

+222
-1816
lines changed

Some content is hidden

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

73 files changed

+222
-1816
lines changed

‎build/scripts/change-scala-version.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,3 @@ sed "${sed_no_backup[@]}" "1,/<scala\.version>[0-9]\.[0-9][0-9]*\.[0-9][0-9]*</s
7979

8080
# Update enforcer rules
8181
sed "${sed_no_backup[@]}" "s|<exclude>\*:\*_$TO_VERSION</exclude>|<exclude>*:*_$FROM_VERSION</exclude>|" "$BASEDIR/pom.xml"
82-
sed "${sed_no_backup[@]}" "s|<regex>$FROM_VERSION\.\*</regex>|<regex>$TO_VERSION.*</regex>|" "$BASEDIR/pom.xml"
83-
sed "${sed_no_backup[@]}" "s|<regex>$FROM_VERSION</regex>|<regex>$TO_VERSION</regex>|" "$BASEDIR/pom.xml"

‎docs/user/appendix/metrics_dropwizard.rst‎

Lines changed: 0 additions & 184 deletions
This file was deleted.

‎docs/user/index.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ Appendix
4040
appendix/utils
4141
appendix/memory
4242
appendix/metrics
43-
appendix/metrics_dropwizard
4443
appendix/site

‎docs/user/upgrade.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,12 @@ Removed Modules
113113

114114
The following modules have been removed:
115115

116+
* ``geomesa-metrics-core``
117+
* ``geomesa-metrics-cloudwatch``
118+
* ``geomesa-metrics-graphite``
119+
* ``geomesa-metrics-prometheus``
116120
* ``geomesa-process-wps``
121+
* ``geomesa-zk-utils``
117122

118123
The following JAR classifiers are no longer published:
119124

‎geomesa-accumulo/geomesa-accumulo-datastore/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</dependency>
4343
<dependency>
4444
<groupId>org.locationtech.geomesa</groupId>
45-
<artifactId>geomesa-feature-all_${scala.binary.version}</artifactId>
45+
<artifactId>geomesa-feature-common_${scala.binary.version}</artifactId>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.locationtech.geomesa</groupId>
@@ -52,10 +52,6 @@
5252
<groupId>org.locationtech.geomesa</groupId>
5353
<artifactId>geomesa-z3_${scala.binary.version}</artifactId>
5454
</dependency>
55-
<dependency>
56-
<groupId>org.locationtech.geomesa</groupId>
57-
<artifactId>geomesa-zk-utils_${scala.binary.version}</artifactId>
58-
</dependency>
5955
<dependency>
6056
<groupId>org.geotools</groupId>
6157
<artifactId>gt-main</artifactId>
@@ -76,10 +72,6 @@
7672
<groupId>org.locationtech.jts</groupId>
7773
<artifactId>jts-core</artifactId>
7874
</dependency>
79-
<dependency>
80-
<groupId>commons-io</groupId>
81-
<artifactId>commons-io</artifactId>
82-
</dependency>
8375
<dependency>
8476
<groupId>org.apache.curator</groupId>
8577
<artifactId>curator-recipes</artifactId>
@@ -133,11 +125,6 @@
133125
<artifactId>geomesa-accumulo-distributed-runtime_${scala.binary.version}</artifactId>
134126
<scope>test</scope>
135127
</dependency>
136-
<dependency>
137-
<groupId>io.dropwizard.metrics</groupId>
138-
<artifactId>metrics-core</artifactId>
139-
<scope>test</scope>
140-
</dependency>
141128
<dependency>
142129
<groupId>org.apache.arrow</groupId>
143130
<artifactId>arrow-vector</artifactId>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import org.locationtech.geomesa.index.index.z2.{XZ2Index, Z2Index}
3333
import org.locationtech.geomesa.index.index.z3.{XZ3Index, Z3Index}
3434
import org.locationtech.geomesa.index.metadata.{GeoMesaMetadata, MetadataStringSerializer}
3535
import org.locationtech.geomesa.index.utils.Explainer
36+
import org.locationtech.geomesa.index.zk.ZookeeperLocking
3637
import org.locationtech.geomesa.utils.conf.FeatureExpiration.{FeatureTimeExpiration, IngestTimeExpiration}
3738
import org.locationtech.geomesa.utils.conf.{FeatureExpiration, IndexId}
3839
import org.locationtech.geomesa.utils.geotools.RichSimpleFeatureType.RichSimpleFeatureType
@@ -43,7 +44,6 @@ import org.locationtech.geomesa.utils.hadoop.HadoopUtils
4344
import org.locationtech.geomesa.utils.index.{GeoMesaSchemaValidator, IndexMode, VisibilityLevel}
4445
import org.locationtech.geomesa.utils.io.{CloseWithLogging, WithClose}
4546
import org.locationtech.geomesa.utils.stats.{IndexCoverage, Stat}
46-
import org.locationtech.geomesa.utils.zk.ZookeeperLocking
4747

4848
import java.util.Locale
4949
import scala.util.control.NonFatal
@@ -131,8 +131,6 @@ class AccumuloDataStore(val connector: AccumuloClient, override val config: Accu
131131
}
132132

133133
override protected def loadIteratorVersions: Set[String] = {
134-
import org.locationtech.geomesa.utils.conversions.ScalaImplicits.RichIterator
135-
136134
// just check the first table available
137135
val versions = getTypeNames.iterator.flatMap { typeName =>
138136
getAllIndexTableNames(typeName).iterator.flatMap { table =>
@@ -149,7 +147,7 @@ class AccumuloDataStore(val connector: AccumuloClient, override val config: Accu
149147
}
150148
}
151149
}
152-
versions.headOption.toSet
150+
versions.find(_ != null).toSet
153151
}
154152

155153
override protected def preSchemaCreate(sft: SimpleFeatureType): Unit = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import org.apache.accumulo.core.conf.ClientProperty
1212
import org.geotools.api.feature.simple.SimpleFeatureType
1313
import org.locationtech.geomesa.accumulo.data.AccumuloDataStore
1414
import org.locationtech.geomesa.index.metadata.GeoMesaMetadata
15+
import org.locationtech.geomesa.index.zk.ZookeeperLocking
1516
import org.locationtech.geomesa.utils.geotools._
1617
import org.locationtech.geomesa.utils.text.StringSerialization
17-
import org.locationtech.geomesa.utils.zk.ZookeeperLocking
1818

1919
import java.io.Closeable
2020
import java.time.temporal.ChronoUnit

‎geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/util/TableManager.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import org.locationtech.geomesa.accumulo.util.TableManager._
1818
import org.locationtech.geomesa.index.DistributedLockTimeout
1919
import org.locationtech.geomesa.index.utils.DistributedLocking
2020
import org.locationtech.geomesa.index.utils.DistributedLocking.LocalLocking
21+
import org.locationtech.geomesa.index.zk.ZookeeperLocking
2122
import org.locationtech.geomesa.utils.text.StringSerialization
22-
import org.locationtech.geomesa.utils.zk.ZookeeperLocking
2323

2424
import java.io.Closeable
2525
import java.util.concurrent.TimeUnit

‎geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
<groupId>com.github.ben-manes.caffeine</groupId>
5757
<artifactId>caffeine</artifactId>
5858
</dependency>
59-
<dependency>
60-
<groupId>org.locationtech.geomesa</groupId>
61-
<artifactId>geomesa-feature-all_${scala.binary.version}</artifactId>
62-
</dependency>
6359
<dependency>
6460
<groupId>org.locationtech.geomesa</groupId>
6561
<artifactId>geomesa-convert-common_${scala.binary.version}</artifactId>

‎geomesa-convert/geomesa-convert-avro/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
</dependency>
2727
<dependency>
2828
<groupId>org.locationtech.geomesa</groupId>
29-
<artifactId>geomesa-feature-all_${scala.binary.version}</artifactId>
29+
<artifactId>geomesa-feature-avro_${scala.binary.version}</artifactId>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.locationtech.geomesa</groupId>
3333
<artifactId>geomesa-convert-common_${scala.binary.version}</artifactId>
34-
<version>${project.version}</version>
3534
</dependency>
3635

3736
<dependency>

0 commit comments

Comments
 (0)