diff --git a/bubble-server/pom.xml b/bubble-server/pom.xml index e410e5d1..1d958084 100644 --- a/bubble-server/pom.xml +++ b/bubble-server/pom.xml @@ -190,12 +190,6 @@ ${aws.sdk.version} - - commons-codec - commons-codec - ${commons-codec.version} - - redis.clients jedis diff --git a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java index 58e6964e..45b5ed97 100644 --- a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java +++ b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java @@ -34,7 +34,6 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.map.DefaultedMap; import org.apache.commons.lang3.ArrayUtils; import org.cobbzilla.util.collection.MapBuilder; import org.cobbzilla.util.handlebars.HandlebarsUtil; @@ -51,7 +50,6 @@ import org.cobbzilla.wizard.server.RestServerHarness; import org.cobbzilla.wizard.server.config.HasDatabaseConfiguration; import org.cobbzilla.wizard.server.config.LegalInfo; import org.cobbzilla.wizard.server.config.PgRestServerConfiguration; -import org.cobbzilla.wizard.server.config.RecaptchaConfig; import org.cobbzilla.wizard.util.ClasspathScanner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -145,10 +143,6 @@ public class BubbleConfiguration extends PgRestServerConfiguration return redis; } - @Getter @Setter private Map threadPoolSizes = new DefaultedMap(2); - - @Getter @Setter private RecaptchaConfig recaptcha; - @JsonIgnore @Transient public synchronized BubbleNode getThisNode () { return getBean(StandardSelfNodeService.class).getThisNode(); } diff --git a/utils/cobbzilla-utils b/utils/cobbzilla-utils index d8cb733a..a449fdac 160000 --- a/utils/cobbzilla-utils +++ b/utils/cobbzilla-utils @@ -1 +1 @@ -Subproject commit d8cb733a4dbfe2d48881ecb6446b0ed4abbc8d04 +Subproject commit a449fdacc3066ab3724b7ea592be871eaa7c6bc8