diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-06-05 16:04:32 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:29 +0200 |
| commit | 622438d94aba9802bcd4daf719b3e283adc2fd52 (patch) | |
| tree | 89241787251b332f52e89ff7dbe582229fb398cd | |
| parent | 0329d09e0b7cf99ab0009308bfef2c09ad7d7123 (diff) | |
Add missing deps to lz4-java, and exclude in container-dev
(no longer provided by jdisc)
| -rw-r--r-- | config-model/pom.xml | 4 | ||||
| -rwxr-xr-x | config/pom.xml | 4 | ||||
| -rw-r--r-- | configserver/pom.xml | 4 | ||||
| -rw-r--r-- | container-dev/pom.xml | 16 | ||||
| -rw-r--r-- | model-evaluation/pom.xml | 4 | ||||
| -rw-r--r-- | searchlib/pom.xml | 4 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 4 |
7 files changed, 40 insertions, 0 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml index e5cca83e931..7e705cfa0aa 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -300,6 +300,10 @@ <scope>test</scope> <version>${jetty.version}</version> </dependency> + <dependency> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </dependency> </dependencies> <build> diff --git a/config/pom.xml b/config/pom.xml index 4eceef8c748..f7098bfa6ce 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -73,6 +73,10 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> </dependency> + <dependency> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </dependency> <!-- test scope --> <dependency> diff --git a/configserver/pom.xml b/configserver/pom.xml index 268bfbdfc00..a307772376a 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -280,6 +280,10 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </dependency> + <dependency> <!-- TODO Remove when Jetty is embedded inside container-core --> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index fbea41e94a4..f531ba9fece 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -78,6 +78,12 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>model-evaluation</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -177,12 +183,22 @@ <groupId>org.json</groupId> <artifactId>json</artifactId> </exclusion> + <exclusion> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-bundle</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml index 5064d88ae63..4da293a1aab 100644 --- a/model-evaluation/pom.xml +++ b/model-evaluation/pom.xml @@ -84,6 +84,10 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </dependency> </dependencies> <build> <plugins> diff --git a/searchlib/pom.xml b/searchlib/pom.xml index d1a167b14c8..69bc88b18f3 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -68,6 +68,10 @@ <artifactId>protobuf-java</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </dependency> </dependencies> <build> <plugins> diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index b9b58f37c00..ffdfaf469a2 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -77,6 +77,10 @@ <artifactId>org.apache.felix.framework</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.lz4</groupId> + <artifactId>lz4-java</artifactId> + </dependency> </dependencies> <build> |