Merge branch '229-google-guava-package' into 'master'

Resolve "Google guava package" See merge request SEAM/seamcat!131

Merge branch '229-google-guava-package' into 'master'
Resolve "Google guava package" See merge request SEAM/seamcat!131
e46f95f8 · Stephan Korsholm · ef8e6cb5 · 30d35e56 · e46f95f8 · e46f95f8
Commit e46f95f8 authored 6 months ago by Stephan Korsholm
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 14 deletions
+0 -14
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -121,13 +121,6 @@
 			<exclude>it/geosolutions/jaiext/scale/JaiI18N.class</exclude>
 		      </excludes>
 		    </filter>
-		    <filter>
-		      <artifact>com.google.guava:guava</artifact>
-		      <excludes>
-			<exclude>com/google/common/util/concurrent/internal/InternalFutureFailureAccess.class</exclude>
-			<exclude>com/google/common/util/concurrent/internal/InternalFutures.class</exclude>
-		      </excludes>
-		    </filter>
                  </filters>
                  <transformers>
 		    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

--- a/commandline/pom.xml
+++ b/commandline/pom.xml
@@ -49,13 +49,6 @@
 		  <exclude>it/geosolutions/jaiext/scale/JaiI18N.class</exclude>
 		</excludes>
 	      </filter>
-	      <filter>
-		<artifact>com.google.guava:guava</artifact>
-		<excludes>
-		  <exclude>com/google/common/util/concurrent/internal/InternalFutureFailureAccess.class</exclude>
-		  <exclude>com/google/common/util/concurrent/internal/InternalFutures.class</exclude>
-		</excludes>
-	      </filter>
            </filters>
            <transformers>
              <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">