aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2023-01-03 10:37:27 +0100
committergjoranv <gv@verizonmedia.com>2023-01-03 13:05:55 +0100
commit4ec77f142cb80f27c392944152407d2984f37857 (patch)
tree5f2357fc19ec113cc8beddc52ea03cd4be10ede5
parentc5e7d984d15d52e7d8d2239ef9031bc3994d1169 (diff)
Remove all dependencies to io.airlift:aircompressor
- Replaced by vespa/airlift-zstd
-rw-r--r--application/pom.xml6
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml1
-rw-r--r--config-model-fat/pom.xml1
-rw-r--r--container-dev/pom.xml4
-rw-r--r--container-test/pom.xml5
-rw-r--r--parent/pom.xml6
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt1
-rw-r--r--vespajlib/pom.xml4
8 files changed, 0 insertions, 28 deletions
diff --git a/application/pom.xml b/application/pom.xml
index 8f9dc7999a0..d1aea1d6a78 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -53,7 +53,6 @@
<groupId>com.yahoo.vespa</groupId>
<artifactId>vespajlib</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<!-- All dependencies that should be visible in test classpath, but not compile classpath,
@@ -64,11 +63,6 @@
<artifactId>icu4j</artifactId>
</dependency>
<dependency>
- <groupId>io.airlift</groupId>
- <artifactId>aircompressor</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
</dependency>
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 23af7baf4b7..74339e33467 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -179,7 +179,6 @@
<include>com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.version}:test</include>
<include>com.thaiopensource:jing:20091111:test</include>
<include>commons-codec:commons-codec:${commons-codec.version}:test</include>
- <include>io.airlift:aircompressor:0.21:test</include>
<include>io.airlift:airline:0.9:test</include>
<include>io.prometheus:simpleclient:0.6.0:test</include>
<include>io.prometheus:simpleclient_common:0.6.0:test</include>
diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml
index 380c0de4225..fa1a7558745 100644
--- a/config-model-fat/pom.xml
+++ b/config-model-fat/pom.xml
@@ -205,7 +205,6 @@
<i>com.sun.xml.bind:jaxb-core:*:*</i>
<i>com.sun.xml.bind:jaxb-impl:*:*</i>
<i>com.thaiopensource:jing:*:*</i>
- <i>io.airlift:aircompressor:*:*</i>
<i>io.prometheus:simpleclient:*:*</i>
<i>io.prometheus:simpleclient_common:*:*</i>
<i>javax.inject:javax.inject:*:*</i>
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index e088c40e20b..f62cc69a428 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -163,10 +163,6 @@
<artifactId>jna</artifactId>
</exclusion>
<exclusion>
- <groupId>io.airlift</groupId>
- <artifactId>aircompressor</artifactId>
- </exclusion>
- <exclusion>
<groupId>net.openhft</groupId>
<artifactId>zero-allocation-hashing</artifactId>
</exclusion>
diff --git a/container-test/pom.xml b/container-test/pom.xml
index 88307969d8a..d2806bb0330 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -103,11 +103,6 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
- <dependency>
- <groupId>io.airlift</groupId>
- <artifactId>aircompressor</artifactId>
- <scope>compile</scope>
- </dependency>
<dependency> <!-- TODO: Remove on Vespa 9 -->
<!-- not used by Vespa, but was historically on test classpath -->
<groupId>org.json</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 2f61600424d..79e0ed91ab9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -653,11 +653,6 @@
</dependency>
<dependency>
<groupId>io.airlift</groupId>
- <artifactId>aircompressor</artifactId>
- <version>${aircompressor.version}</version>
- </dependency>
- <dependency>
- <groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
<version>${airline.version}</version>
</dependency>
@@ -1092,7 +1087,6 @@
</dependencyManagement>
<properties>
- <aircompressor.version>0.21</aircompressor.version>
<airline.version>0.9</airline.version>
<antlr.version>3.5.2</antlr.version>
<antlr4.version>4.9.3</antlr4.version>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 030c51b93dc..2905d4ba67d 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -52,7 +52,6 @@ commons-codec:commons-codec:1.15
commons-fileupload:commons-fileupload:1.4
commons-io:commons-io:2.11.0
commons-logging:commons-logging:1.2
-io.airlift:aircompressor:0.21
io.airlift:airline:0.9
io.dropwizard.metrics:metrics-core:3.2.5
io.jsonwebtoken:jjwt-api:0.11.2
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index d902486a849..ff244ad07f8 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -32,10 +32,6 @@
<artifactId>jna</artifactId>
</dependency>
<dependency>
- <groupId>io.airlift</groupId>
- <artifactId>aircompressor</artifactId>
- </dependency>
- <dependency>
<groupId>com.yahoo.vespa</groupId>
<artifactId>airlift-zstd</artifactId>
<version>${project.version}</version>