diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-09-14 17:16:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-14 17:16:03 +0200 |
commit | c38b60dbed06f02113b836be655c58e2514165ee (patch) | |
tree | 7d0e1a50fc74b79e00a8018b54f5891164a9b737 | |
parent | afd3b362a2756b5c6c25215c1e1e78d295693ac3 (diff) |
Revert "Install net.jpountz.lz4:lz4 as a bundle."
-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, 10 insertions, 57 deletions
diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index 922204a83ff..7121756ce68 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -16,13 +16,6 @@ <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> @@ -59,12 +52,6 @@ <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 fe1f74405ac..c608f35f26c 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -148,10 +148,6 @@ <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 2964809e63a..85f52bff5cc 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -93,12 +93,6 @@ <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 ebfe284c08b..81b21487314 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -39,6 +39,10 @@ <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 new file mode 100644 index 00000000000..25c41288d47 --- /dev/null +++ b/document/src/main/java/net/jpountz/lz4/package-info.java @@ -0,0 +1,5 @@ +// 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 18616369876..a0fb98a12ae 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -14,7 +14,6 @@ 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>${lz4.version}</version> + <version>1.3.0</version> </dependency> <dependency> <groupId>net.spy</groupId> @@ -903,7 +903,6 @@ <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 07423113438..18cdd294b87 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -62,10 +62,6 @@ <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 e19fd668e49..27e8d4020ae 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -77,14 +77,6 @@ <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> @@ -107,25 +99,6 @@ <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> |