From 81052288d79dcaad49d798b1fe4384232d8fdac5 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Wed, 2 Dec 2020 20:58:23 -0500 Subject: [PATCH] clean up imports, remove unused dependencies, shrink uberjar size --- bubble-server/pom.xml | 93 ++++++++++++++----- .../storage/StorageServiceDriverBase.java | 2 +- .../cloud/storage/s3/S3StorageDriver.java | 5 +- .../resources/message/MessagesResource.java | 2 +- .../stream/FilterConnCheckRequest.java | 2 +- .../bubble/server/BubbleConfiguration.java | 2 +- .../java/bubble/service/cloud/GeoService.java | 2 +- .../service/message/MessageService.java | 2 +- .../META-INF/bubble/bubble.properties | 2 +- utils/cobbzilla-utils | 2 +- utils/cobbzilla-wizard | 2 +- utils/templated-mail-sender | 2 +- 12 files changed, 82 insertions(+), 36 deletions(-) diff --git a/bubble-server/pom.xml b/bubble-server/pom.xml index b8f21394..785d5ad9 100644 --- a/bubble-server/pom.xml +++ b/bubble-server/pom.xml @@ -23,16 +23,83 @@ + + org.cobbzilla + cobbzilla-utils + 1.0.0-SNAPSHOT + + + fr.opensagres.xdocreport + * + + + com.codeborne + * + + + jtidy + * + + + xalan + * + + + net.sf.saxon + * + + + org.apache.ant + * + + + com.opencsv + * + + + org.apache.poi + * + + + org.quartz-scheduler + * + + + org.apache.pdfbox + * + + + org.atteo + * + + + io.github.bonigarcia + * + + + org.cobbzilla wizard-server 1.0.0-SNAPSHOT - org.elasticsearch elasticsearch + + org.mongodb + * + + + com.github.jmkgreen.morphia + * + + + + org.cobbzilla + cobbzilla-utils + @@ -336,28 +403,9 @@ META-INF/*.DSA META-INF/*.RSA - - org.mongodb:* - com.github.jmkgreen.morphia:* - org.elasticsearch:* - fr.opensagres.xdocreport:* - com.codeborne:* - jtidy:* - xalan:* - net.sf.saxon:* - org.apache.ant:* - META-INF/maven/** - META-INF/services/fr.opensagres** aj/org/objectweb/** - com/ctc/wstx/api/EmptyElementHandler.class - com/ctc/wstx/api/InvalidCharHandler.class - com/ctc/wstx/api/ValidatorConfig.class - com/ctc/wstx/api/WstxOutputProperties.class - com/ctc/wstx/cfg/ErrorConsts.class - com/ctc/wstx/cfg/XmlConsts.class - com/ctc/wstx/compat/QNameCreator.class com/ctc/wstx/dom/** com/ctc/wstx/dtd/** com/ctc/wstx/msv/** @@ -381,11 +429,8 @@ com/ctc/wstx/shaded/msv_core/verifier/** com/ctc/wstx/shaded/msv_core/writer/** com/github/jmkgreen/** - com/google/common/collect/** - com/mongodb/** - com/opencsv/** + com/twilio/rest/** - fr/opensagres/** io/jsonwebtoken/** javax/servlet/descriptor/** javax/servlet/http/** diff --git a/bubble-server/src/main/java/bubble/cloud/storage/StorageServiceDriverBase.java b/bubble-server/src/main/java/bubble/cloud/storage/StorageServiceDriverBase.java index 6c66a812..9cd673be 100644 --- a/bubble-server/src/main/java/bubble/cloud/storage/StorageServiceDriverBase.java +++ b/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.*; diff --git a/bubble-server/src/main/java/bubble/cloud/storage/s3/S3StorageDriver.java b/bubble-server/src/main/java/bubble/cloud/storage/s3/S3StorageDriver.java index b1119009..953dba66 100644 --- a/bubble-server/src/main/java/bubble/cloud/storage/s3/S3StorageDriver.java +++ b/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; diff --git a/bubble-server/src/main/java/bubble/resources/message/MessagesResource.java b/bubble-server/src/main/java/bubble/resources/message/MessagesResource.java index 18fae134..a46ad543 100644 --- a/bubble-server/src/main/java/bubble/resources/message/MessagesResource.java +++ b/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; diff --git a/bubble-server/src/main/java/bubble/resources/stream/FilterConnCheckRequest.java b/bubble-server/src/main/java/bubble/resources/stream/FilterConnCheckRequest.java index 9016d9c7..b294bb0f 100644 --- a/bubble-server/src/main/java/bubble/resources/stream/FilterConnCheckRequest.java +++ b/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; diff --git a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java index 1578c96c..26198b5d 100644 --- a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java +++ b/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; diff --git a/bubble-server/src/main/java/bubble/service/cloud/GeoService.java b/bubble-server/src/main/java/bubble/service/cloud/GeoService.java index 1f6e2b30..325fb2d2 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/GeoService.java +++ b/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; diff --git a/bubble-server/src/main/java/bubble/service/message/MessageService.java b/bubble-server/src/main/java/bubble/service/message/MessageService.java index c05cb145..e0953342 100644 --- a/bubble-server/src/main/java/bubble/service/message/MessageService.java +++ b/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; diff --git a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties index ed9d380d..39dbb8d9 100644 --- a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties +++ b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties @@ -1 +1 @@ -bubble.version=Adventure 1.4.38 +bubble.version=Adventure 1.4.39 diff --git a/utils/cobbzilla-utils b/utils/cobbzilla-utils index 8d694784..7d74b190 160000 --- a/utils/cobbzilla-utils +++ b/utils/cobbzilla-utils @@ -1 +1 @@ -Subproject commit 8d6947849d8522613f6f4d85438a7caf573940dc +Subproject commit 7d74b1907dabf0c2fea0cb83b26bbf75e67c67f4 diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard index 36035cd8..129119fd 160000 --- a/utils/cobbzilla-wizard +++ b/utils/cobbzilla-wizard @@ -1 +1 @@ -Subproject commit 36035cd8abd4254e1c44a8672fd61ec0d74380e0 +Subproject commit 129119fdab37b580d05b96acc9c8897d7ecffa47 diff --git a/utils/templated-mail-sender b/utils/templated-mail-sender index 760e4804..bc7edb79 160000 --- a/utils/templated-mail-sender +++ b/utils/templated-mail-sender @@ -1 +1 @@ -Subproject commit 760e480498aa598dd33686c9192c51a9ff6d3d59 +Subproject commit bc7edb7969d09da7e999bc7df49ca15613eb36b8