aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@vespa.ai>2023-10-27 12:37:04 +0000
committerArne Juul <arnej@vespa.ai>2023-10-27 12:37:04 +0000
commit45ea4ebd9fb0b85fad59ee1913bfe8982d499b58 (patch)
tree7425a63c26efb79fba89e42d1d9f65f24ae258e4
parent38d8d0ffdb58b475854941a659f430b1ee5eea0d (diff)
aircompress -> aircompressor
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml2
-rw-r--r--container-dependencies-enforcer/pom.xml2
-rw-r--r--container/pom.xml2
-rw-r--r--dependency-versions/pom.xml2
-rw-r--r--parent/pom.xml2
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt2
-rw-r--r--vespajlib/pom.xml2
7 files changed, 7 insertions, 7 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 82c811baa98..ce673aea54e 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -47,7 +47,6 @@
<include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version}:provided</include>
<include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version}:provided</include>
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version}:provided</include>
- <include>io.airlift:aircompressor:${aircompress.vespa.version}:provided</include>
<!-- Guava with its internal dependencies -->
<include>com.google.guava:guava:${guava.vespa.version}:provided</include>
@@ -143,6 +142,7 @@
<include>com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.vespa.version}:test</include>
<include>com.thaiopensource:jing:20091111:test</include>
<include>commons-codec:commons-codec:${commons-codec.vespa.version}:test</include>
+ <include>io.airlift:aircompressor:${aircompressor.vespa.version}:test</include>
<include>io.airlift:airline:${airline.vespa.version}:test</include>
<include>io.prometheus:simpleclient:${prometheus.client.vespa.version}:test</include>
<include>io.prometheus:simpleclient_common:${prometheus.client.vespa.version}:test</include>
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 74805433669..a56cd148b66 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -66,7 +66,6 @@
<include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version}:provided</include>
<include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version}:provided</include>
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version}:provided</include>
- <include>io.airlift:aircompressor:${aircompress.vespa.version}:provided</include>
<!-- Guava with its internal dependencies -->
<include>com.google.guava:guava:${guava.vespa.version}:provided</include>
@@ -156,6 +155,7 @@
<include>com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version}:test</include>
<include>com.thaiopensource:jing:20091111:test</include>
<include>commons-codec:commons-codec:${commons-codec.vespa.version}:test</include>
+ <include>io.airlift:aircompressor:${aircompressor.vespa.version}:test</include>
<include>io.airlift:airline:${airline.vespa.version}:test</include>
<include>io.prometheus:simpleclient:${prometheus.client.vespa.version}:test</include>
<include>io.prometheus:simpleclient_common:${prometheus.client.vespa.version}:test</include>
diff --git a/container/pom.xml b/container/pom.xml
index 7dde2c25d4b..140a204bc83 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -36,7 +36,7 @@
</exclusion>
<exclusion>
<groupId>io.airlift</groupId>
- <artifactId>aircompress</artifactId>
+ <artifactId>aircompressor</artifactId>
</exclusion>
<exclusion>
<groupId>net.java.dev.jna</groupId>
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 3c53ddc5850..5a624b25f75 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -53,7 +53,7 @@
<!-- Dependencies used internally in Vespa, not visible for users, or only visible in test classpath -->
- <aircompress.vespa.version>0.25</aircompress.vespa.version>
+ <aircompressor.vespa.version>0.25</aircompressor.vespa.version>
<airline.vespa.version>0.9</airline.vespa.version>
<antlr.vespa.version>3.5.3</antlr.vespa.version>
<antlr4.vespa.version>4.13.1</antlr4.vespa.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8873949cfd0..8d2d765e907 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -676,7 +676,7 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
- <version>${aircompress.vespa.version}</version>
+ <version>${aircompressor.vespa.version}</version>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 6e031c70c32..44323a94655 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -51,7 +51,7 @@ commons-collections:commons-collections:${commons-collections.vespa.version}
commons-fileupload:commons-fileupload:1.5
commons-io:commons-io:${commons-io.vespa.version}
commons-logging:commons-logging:${commons-logging.vespa.version}
-io.airlift:aircompressor:${aircompress.vespa.version}
+io.airlift:aircompressor:${aircompressor.vespa.version}
io.airlift:airline:${airline.vespa.version}
io.dropwizard.metrics:metrics-core:${dropwizard.metrics.vespa.version}
io.jsonwebtoken:jjwt-api:${java-jjwt.vespa.version}
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index a0dea8b29fc..16ae251aa8b 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
- <version>${aircompress.vespa.version}</version>
+ <version>${aircompressor.vespa.version}</version>
</dependency>
<dependency>
<groupId>net.openhft</groupId>