diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-27 11:52:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-27 11:52:17 +0100 |
commit | 22ba7380e8da6217fae038493dec7d049a347cbf (patch) | |
tree | 0b157621b91c0d883fb9bda4991fdf7c525d751e | |
parent | b36cb57248dfc02bae9dfe7b2cca0ddd551881c6 (diff) | |
parent | 37ca3594cac5c18c17157a77d8adbcd460ed1a10 (diff) |
Merge pull request #25008 from vespa-engine/balder/cleanup-remains-after-commons-collectionsv8.91.2v8.90.59
Cleanup after we no longer use commons-collections
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java | 3 | ||||
-rw-r--r-- | container-dev/pom.xml | 23 | ||||
-rw-r--r-- | docprocs/pom.xml | 4 | ||||
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java | 1 | ||||
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java | 2 | ||||
-rw-r--r-- | tenant-base/pom.xml | 18 | ||||
-rw-r--r-- | vespaclient-java/pom.xml | 6 |
7 files changed, 7 insertions, 50 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index f7d9c2f4a0d..93b67407933 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -226,8 +226,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC private Optional<Admin> getAdmin() { if (parent != null) { AbstractConfigProducerRoot r = parent.getRoot(); - if (r instanceof VespaModel) { - VespaModel model = (VespaModel) r; + if (r instanceof VespaModel model) { return Optional.ofNullable(model.getAdmin()); } } diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 85c6371d59c..6847668404b 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -84,10 +84,6 @@ <version>${project.version}</version> <exclusions> <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> @@ -188,14 +184,6 @@ <artifactId>icu4j</artifactId> </exclusion> <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - <exclusion> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> </exclusion> @@ -244,17 +232,6 @@ Excluded artifacts should be added explicitly to the application module to make then visible in users' test classpath. --> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>document</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>linguistics</artifactId> <version>${project.version}</version> <exclusions> diff --git a/docprocs/pom.xml b/docprocs/pom.xml index e001d83a00f..6d654deea44 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -57,10 +57,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> </exclusions> <!-- End Workaround --> diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java index f9ecaa29153..67c888a8d77 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import static ai.vespa.metricsproxy.metric.ExternalMetrics.extractConfigserverDimensions; -import static ai.vespa.metricsproxy.metric.model.processing.MetricsProcessor.applyProcessors; import static java.util.logging.Level.FINE; import static java.util.stream.Collectors.toList; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java index def61006f15..0c25f31f266 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/ExternalMetrics.java @@ -62,7 +62,7 @@ public class ExternalMetrics { private Set<MetricId> metricsToRetain() { return consumers.getConsumersByMetric().keySet().stream() - .map(configuredMetric -> configuredMetric.id()) + .map(ConfiguredMetric::id) .collect(toCollection(LinkedHashSet::new)); } diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index b50f14558d6..cf7898f6951 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -84,15 +84,11 @@ <version>${vespaversion}</version> <scope>test</scope> <exclusions> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-exec</artifactId> - </exclusion> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - </exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -115,10 +111,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> </exclusion> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 3e5e7ca8025..230ddc5c7d3 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -46,12 +46,6 @@ </exclusions> </dependency> <dependency> - <!-- Added explicitly to get commons-collections, which is excluded from container-dev --> - <groupId>com.yahoo.vespa</groupId> - <artifactId>document</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>documentapi</artifactId> <version>${project.version}</version> |