fix data sketches shaded jar

gchq · Jul 26, 2024 · d7c5d8e · d7c5d8e
1 parent d3786c3
commit d7c5d8e
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 123 deletions.
diff --git a/example/basic/basic-model/pom.xml b/example/basic/basic-model/pom.xml
@@ -31,11 +31,6 @@
             <artifactId>data</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>uk.gov.gchq.gaffer</groupId>
-            <artifactId>sketches-library</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
@@ -68,6 +63,18 @@
             <artifactId>accumulo-minicluster</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>sketches-library</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>hdfs-library</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-hdfs</artifactId>

diff --git a/example/road-traffic/road-traffic-generators/pom.xml b/example/road-traffic/road-traffic-generators/pom.xml
@@ -99,12 +99,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 

diff --git a/example/road-traffic/road-traffic-model/pom.xml b/example/road-traffic/road-traffic-model/pom.xml
@@ -86,17 +86,5 @@
             <artifactId>hadoop-hdfs</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.datasketches</groupId>
-            <artifactId>datasketches-java</artifactId>
-            <version>${datasketches.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/library/sketches-library/pom.xml b/library/sketches-library/pom.xml
@@ -89,10 +89,9 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <shadedArtifactAttached>true
-                            </shadedArtifactAttached>
-                            <shadedClassifierName>deploy
-                            </shadedClassifierName>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>deploy</shadedClassifierName>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <artifactSet>
                                 <includes>
                                     <include>com.clearspring.analytics:stream</include>

diff --git a/library/tinkerpop/pom.xml b/library/tinkerpop/pom.xml
@@ -117,18 +117,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.datasketches</groupId>
-            <artifactId>datasketches-java</artifactId>
-            <version>${datasketches.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- For standard gremlin test suites -->
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>

diff --git a/rest-api/common-rest/pom.xml b/rest-api/common-rest/pom.xml
@@ -43,18 +43,6 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.clearspring.analytics</groupId>
-      <artifactId>stream</artifactId>
-      <version>${clearspring.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.datasketches</groupId>
-      <artifactId>datasketches-java</artifactId>
-      <version>${datasketches.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>uk.gov.gchq.koryphe</groupId>
       <artifactId>core</artifactId>

diff --git a/rest-api/core-rest/pom.xml b/rest-api/core-rest/pom.xml
@@ -163,18 +163,6 @@
             <version>${jersey.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.datasketches</groupId>
-            <artifactId>datasketches-java</artifactId>
-            <version>${datasketches.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/rest-api/spring-rest/pom.xml b/rest-api/spring-rest/pom.xml
@@ -165,18 +165,6 @@
             <version>${tinkerpop.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.datasketches</groupId>
-            <artifactId>datasketches-java</artifactId>
-            <version>${datasketches.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>

diff --git a/store-implementation/accumulo-store/pom.xml b/store-implementation/accumulo-store/pom.xml
@@ -175,18 +175,6 @@
             <artifactId>hadoop-hdfs</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.datasketches</groupId>
-            <artifactId>datasketches-java</artifactId>
-            <version>${datasketches.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>

diff --git a/store-implementation/federated-store/pom.xml b/store-implementation/federated-store/pom.xml
@@ -168,18 +168,6 @@
             <artifactId>hadoop-hdfs</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.datasketches</groupId>
-            <artifactId>datasketches-java</artifactId>
-            <version>${datasketches.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
             <artifactId>jcs-cache-service</artifactId>

diff --git a/store-implementation/map-store/pom.xml b/store-implementation/map-store/pom.xml
@@ -108,17 +108,5 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.datasketches</groupId>
-            <artifactId>datasketches-java</artifactId>
-            <version>${datasketches.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/store-implementation/proxy-store/pom.xml b/store-implementation/proxy-store/pom.xml
@@ -121,17 +121,5 @@
             <artifactId>junit-platform-suite</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clearspring.analytics</groupId>
-            <artifactId>stream</artifactId>
-            <version>${clearspring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.datasketches</groupId>
-            <artifactId>datasketches-java</artifactId>
-            <version>${datasketches.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>