Stop providing org.lz4:lz4-java and exporting net.jpountz packages

- Not leaked from any public apis.
- Must be added to container-test for unit tests with application

9 files changed, 16 insertions, 23 deletions

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 67baeb9af8b..0253683f0e3 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -95,7 +95,6 @@
                                         <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include>
                                         <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include>
                                         <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include>
-                                        <include>org.lz4:lz4-java:[${org.lz4.version}]:jar:provided</include>
                                         <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include>
                                         <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include>
                                         <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include>
@@ -250,6 +249,7 @@
                                         <include>org.junit.platform:junit-platform-engine:[${junit5.platform.version}]:jar:test</include>
                                         <include>org.junit.vintage:junit-vintage-engine:[${junit5.version}]:jar:test</include>
                                         <include>org.kohsuke:libpam4j:1.11:jar:test</include>
+                                        <include>org.lz4:lz4-java:[${org.lz4.version}]:jar:test</include>
                                         <include>org.opentest4j:opentest4j:1.2.0:jar:test</include>
                                         <include>software.amazon.ion:ion-java:1.0.2:jar:test</include>
                                         <include>xerces:xercesImpl:2.12.1:jar:test</include>
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 605d33f1c82..e507bffa7dc 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -80,7 +80,6 @@
                                         <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include>
                                         <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include>
                                         <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include>
-                                        <include>org.lz4:lz4-java:[${org.lz4.version}]:jar:provided</include>
                                         <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include>
                                         <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include>
                                         <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 706ec1b437c..771451084c8 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -130,11 +130,6 @@
             <!-- jaxb end -->
 
             <dependency>
-                <groupId>org.lz4</groupId>
-                <artifactId>lz4-java</artifactId>
-                <version>${org.lz4.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.framework</artifactId>
                 <version>${felix.version}</version>
@@ -278,7 +273,6 @@
         <jaxb.version>2.3.0</jaxb.version>
         <jetty.version>9.4.46.v20220331</jetty.version>
         <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version>
-        <org.lz4.version>1.8.0</org.lz4.version>
         <org.json.version>20090211</org.json.version>
         <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom -->
         <xml-apis.version>1.4.01</xml-apis.version>
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 844fc26a6ef..39276b888b1 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -125,6 +125,10 @@
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-compress</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.lz4</groupId>
+          <artifactId>lz4-java</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/container-test/pom.xml b/container-test/pom.xml
index 438a2ca5024..c6474730f42 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -103,5 +103,10 @@
       <artifactId>json</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <!-- TODO: this, and probably others, could be removed from here if we make the fat jar the default artifact for jdisc_core -->
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index c1650d96ca7..c23b19a64bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -877,6 +877,11 @@
                 <version>1.9.6</version>
             </dependency>
             <dependency>
+                <groupId>org.lz4</groupId>
+                <artifactId>lz4-java</artifactId>
+                <version>${org.lz4.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>${mockito.version}</version>
@@ -992,6 +997,7 @@
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <mockito.version>4.0.0</mockito.version>
         <onnxruntime.version>1.8.0</onnxruntime.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
+        <org.lz4.version>1.8.0</org.lz4.version>
         <prometheus.client.version>0.6.0</prometheus.client.version>
         <protobuf.version>3.19.2</protobuf.version>
         <spifly.version>1.3.3</spifly.version>
diff --git a/vespajlib/src/main/java/net/jpountz/lz4/package-info.java b/vespajlib/src/main/java/net/jpountz/lz4/package-info.java
deleted file mode 100644
index 478f666dab4..00000000000
--- a/vespajlib/src/main/java/net/jpountz/lz4/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 7, micro = 1))
-package net.jpountz.lz4;
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
diff --git a/vespajlib/src/main/java/net/jpountz/util/package-info.java b/vespajlib/src/main/java/net/jpountz/util/package-info.java
deleted file mode 100644
index 66089785785..00000000000
--- a/vespajlib/src/main/java/net/jpountz/util/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 7, micro = 1))
-package net.jpountz.util;
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
diff --git a/vespajlib/src/main/java/net/jpountz/xxhash/package-info.java b/vespajlib/src/main/java/net/jpountz/xxhash/package-info.java
deleted file mode 100644
index e9ceccb9a34..00000000000
--- a/vespajlib/src/main/java/net/jpountz/xxhash/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 7, micro = 1))
-package net.jpountz.xxhash;
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;