clean up imports, remove unused dependencies, shrink uberjar size

bubble-server/pom.xml

@@ -23,16 +23,83 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>org.cobbzilla</groupId>
+            <artifactId>cobbzilla-utils</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>fr.opensagres.xdocreport</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.codeborne</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jtidy</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.saxon</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.opencsv</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.quartz-scheduler</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.pdfbox</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.atteo</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.github.bonigarcia</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.cobbzilla</groupId>
             <artifactId>wizard-server</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <exclusions>
-                <!-- need to bump version to latest, then refactor AbstractElasticSearchDAO -->
                 <exclusion>
                     <groupId>org.elasticsearch</groupId>
                     <artifactId>elasticsearch</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.mongodb</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.jmkgreen.morphia</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <!-- we imported cobbzilla-utils above ourselves, with our own exclusions -->
+                <exclusion>
+                    <groupId>org.cobbzilla</groupId>
+                    <artifactId>cobbzilla-utils</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -336,28 +403,9 @@
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
 
-                                        <!-- We don't use these whole dependencies, brought in by other dependencies -->
-                                        <exclude>org.mongodb:*</exclude>
-                                        <exclude>com.github.jmkgreen.morphia:*</exclude>
-                                        <exclude>org.elasticsearch:*</exclude>
-                                        <exclude>fr.opensagres.xdocreport:*</exclude>
-                                        <exclude>com.codeborne:*</exclude>
-                                        <exclude>jtidy:*</exclude>
-                                        <exclude>xalan:*</exclude>
-                                        <exclude>net.sf.saxon:*</exclude>
-                                        <exclude>org.apache.ant:*</exclude>
-
                                         <!-- Exclude other stuff by path -->
                                         <exclude>META-INF/maven/**</exclude>
-                                        <exclude>META-INF/services/fr.opensagres**</exclude>
                                         <exclude>aj/org/objectweb/**</exclude>
-                                        <exclude>com/ctc/wstx/api/EmptyElementHandler.class</exclude>
-                                        <exclude>com/ctc/wstx/api/InvalidCharHandler.class</exclude>
-                                        <exclude>com/ctc/wstx/api/ValidatorConfig.class</exclude>
-                                        <exclude>com/ctc/wstx/api/WstxOutputProperties.class</exclude>
-                                        <exclude>com/ctc/wstx/cfg/ErrorConsts.class</exclude>
-                                        <exclude>com/ctc/wstx/cfg/XmlConsts.class</exclude>
-                                        <exclude>com/ctc/wstx/compat/QNameCreator.class</exclude>
                                         <exclude>com/ctc/wstx/dom/**</exclude>
                                         <exclude>com/ctc/wstx/dtd/**</exclude>
                                         <exclude>com/ctc/wstx/msv/**</exclude>
@@ -381,11 +429,8 @@
                                         <exclude>com/ctc/wstx/shaded/msv_core/verifier/**</exclude>
                                         <exclude>com/ctc/wstx/shaded/msv_core/writer/**</exclude>
                                         <exclude>com/github/jmkgreen/**</exclude>
-                                        <exclude>com/google/common/collect/**</exclude>
-                                        <exclude>com/mongodb/**</exclude>
-                                        <exclude>com/opencsv/**</exclude>
+                                        <!-- <exclude>com/google/common/collect/**</exclude> needed during activation -->
                                         <exclude>com/twilio/rest/**</exclude>
-                                        <exclude>fr/opensagres/**</exclude>
                                         <exclude>io/jsonwebtoken/**</exclude>
                                         <exclude>javax/servlet/descriptor/**</exclude>
                                         <exclude>javax/servlet/http/**</exclude>

bubble-server/src/main/java/bubble/cloud/storage/StorageServiceDriverBase.java

@@ -6,7 +6,7 @@ package bubble.cloud.storage;
 
 import bubble.cloud.CloudServiceDriverBase;
 import bubble.model.cloud.StorageMetadata;
-import fr.opensagres.xdocreport.core.io.IOUtils;
+import org.apache.commons.io.IOUtils;
 import org.cobbzilla.util.io.TempDir;
 
 import java.io.*;

bubble-server/src/main/java/bubble/cloud/storage/s3/S3StorageDriver.java

@@ -19,11 +19,11 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.*;
-import fr.opensagres.xdocreport.core.io.IOUtils;
 import lombok.Cleanup;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
 import org.cobbzilla.util.io.FileUtil;
 import org.cobbzilla.util.io.TempDir;
 import org.cobbzilla.wizard.cache.redis.RedisService;
@@ -39,7 +39,8 @@ import static bubble.model.cloud.StorageMetadata.*;
 import static java.util.UUID.randomUUID;
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.cobbzilla.util.daemon.ZillaRuntime.*;
+import static org.cobbzilla.util.daemon.ZillaRuntime.die;
+import static org.cobbzilla.util.daemon.ZillaRuntime.now;
 import static org.cobbzilla.util.json.JsonUtil.json;
 import static org.cobbzilla.util.security.CryptStream.BUFFER_SIZE;
 import static org.cobbzilla.util.security.ShaUtil.sha256_file;

bubble-server/src/main/java/bubble/resources/message/MessagesResource.java

@@ -14,7 +14,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.cobbzilla.util.string.StringUtil;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.springframework.beans.factory.annotation.Autowired;

bubble-server/src/main/java/bubble/resources/stream/FilterConnCheckRequest.java

@@ -6,7 +6,7 @@ package bubble.resources.stream;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 import static org.cobbzilla.util.daemon.ZillaRuntime.empty;
 

bubble-server/src/main/java/bubble/server/BubbleConfiguration.java

@@ -34,7 +34,7 @@ import lombok.NonNull;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.map.DefaultedMap;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.cobbzilla.util.collection.MapBuilder;
 import org.cobbzilla.util.handlebars.HandlebarsUtil;
 import org.cobbzilla.util.handlebars.HasHandlebars;

bubble-server/src/main/java/bubble/service/cloud/GeoService.java

@@ -23,7 +23,7 @@ import bubble.model.cloud.NetLocation;
 import bubble.server.BubbleConfiguration;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.cobbzilla.util.cache.CacheLookupException;
 import org.cobbzilla.util.collection.ExpirationMap;
 import org.cobbzilla.wizard.cache.redis.RedisService;

bubble-server/src/main/java/bubble/service/message/MessageService.java

@@ -5,7 +5,7 @@
 package bubble.service.message;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.cobbzilla.util.collection.ArrayUtil;
 import org.springframework.stereotype.Service;
 

bubble-server/src/main/resources/META-INF/bubble/bubble.properties

@@ -1 +1 @@
-bubble.version=Adventure 1.4.38
+bubble.version=Adventure 1.4.39

utils/cobbzilla-utils

@@ -1 +1 @@
-Subproject commit 8d6947849d8522613f6f4d85438a7caf573940dc
+Subproject commit 7d74b1907dabf0c2fea0cb83b26bbf75e67c67f4

utils/cobbzilla-wizard

@@ -1 +1 @@
-Subproject commit 36035cd8abd4254e1c44a8672fd61ec0d74380e0
+Subproject commit 129119fdab37b580d05b96acc9c8897d7ecffa47

utils/templated-mail-sender

@@ -1 +1 @@
-Subproject commit 760e480498aa598dd33686c9192c51a9ff6d3d59
+Subproject commit bc7edb7969d09da7e999bc7df49ca15613eb36b8