diff options
| -rw-r--r-- | config-bundle/pom.xml | 13 | ||||
| -rw-r--r-- | container-core/pom.xml | 4 | ||||
| -rw-r--r-- | container-disc/pom.xml | 6 | ||||
| -rw-r--r-- | document/pom.xml | 4 | ||||
| -rw-r--r-- | document/src/main/java/net/jpountz/lz4/package-info.java | 5 | ||||
| -rw-r--r-- | install_java.cmake | 1 | ||||
| -rw-r--r-- | pom.xml | 3 | ||||
| -rwxr-xr-x | provided-dependencies/pom.xml | 4 | ||||
| -rw-r--r-- | vespajlib/pom.xml | 27 |
9 files changed, 57 insertions, 10 deletions
diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index 7121756ce68..922204a83ff 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -16,6 +16,13 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>config</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <artifactId>lz4</artifactId> + <groupId>net.jpountz.lz4</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -52,6 +59,12 @@ <artifactId>vespajlib</artifactId> <version>${project.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>lz4</artifactId> + <groupId>net.jpountz.lz4</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/container-core/pom.xml b/container-core/pom.xml index c608f35f26c..fe1f74405ac 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -148,6 +148,10 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>net.jpountz.lz4</groupId> + <artifactId>lz4</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 85f52bff5cc..2964809e63a 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -93,6 +93,12 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <artifactId>lz4</artifactId> + <groupId>net.jpountz.lz4</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/document/pom.xml b/document/pom.xml index 81b21487314..ebfe284c08b 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -39,10 +39,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>net.jpountz.lz4</groupId> - <artifactId>lz4</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/document/src/main/java/net/jpountz/lz4/package-info.java b/document/src/main/java/net/jpountz/lz4/package-info.java deleted file mode 100644 index 25c41288d47..00000000000 --- a/document/src/main/java/net/jpountz/lz4/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 1, minor = 3, micro = 0)) -package net.jpountz.lz4; -import com.yahoo.osgi.annotation.ExportPackage; -import com.yahoo.osgi.annotation.Version; diff --git a/install_java.cmake b/install_java.cmake index 79aa927df24..5d60045f6f2 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -14,6 +14,7 @@ endfunction() install_java_artifact(config-model-fat) install_java_artifact(document) install_java_artifact(jdisc_jetty) +install_java_artifact_dependencies(vespajlib) install_java_artifact_dependencies(jdisc_jetty) install_java_artifact_dependencies(vespa_jersey2) install_java_artifact(searchlib) @@ -836,7 +836,7 @@ <dependency> <groupId>net.jpountz.lz4</groupId> <artifactId>lz4</artifactId> - <version>1.3.0</version> + <version>${lz4.version}</version> </dependency> <dependency> <groupId>net.spy</groupId> @@ -903,6 +903,7 @@ <jackson2.version>2.8.3</jackson2.version> <jersey2.version>2.23.2</jersey2.version> <jetty.version>9.4.6.v20170531</jetty.version> + <lz4.version>1.3.0</lz4.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <test.hide>true</test.hide> diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 18cdd294b87..07423113438 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -62,6 +62,10 @@ <classifier>no_aop</classifier> </dependency> <dependency> + <groupId>net.jpountz.lz4</groupId> + <artifactId>lz4</artifactId> + </dependency> + <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.main</artifactId> </dependency> diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index 27e8d4020ae..e19fd668e49 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -77,6 +77,14 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> + <configuration> + <Import-Package> + net.jpountz.lz4;version=${lz4.version} + </Import-Package> + <discPreInstallBundle> + lz4-${lz4.version}.jar + </discPreInstallBundle> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -99,6 +107,25 @@ <updateReleaseInfo>true</updateReleaseInfo> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + <configuration> + <includeGroupIds>net.jpountz.lz4</includeGroupIds> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <excludeTransitive>true</excludeTransitive> + </configuration> + </plugin> </plugins> </build> </project> |