From 3dc5f7c0b50fcb057fa54e95ddecae6c7e597414 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sat, 5 Dec 2020 12:03:55 -0500
Subject: [PATCH] have a full jar and a regular jar

---
 bin/bubble_common        |  7 +++++++
 bin/first_time_setup.sh  |  3 ++-
 bin/git_update_bubble.sh |  3 ++-
 bubble-server/pom.xml    | 13 +++++++------
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/bin/bubble_common b/bin/bubble_common
index 9c9f34c2..d0c98db0 100755
--- a/bin/bubble_common
+++ b/bin/bubble_common
@@ -106,6 +106,13 @@ if [[ -z "${BUBBLE_JAR}" ]] ; then
     BUBBLE_JAR="${BUBBLE_SCRIPTS}/../bubble.jar"
   else
     BUBBLE_JAR="$(find "${BUBBLE_SCRIPTS}/../bubble-server/target" -type f -name "bubble*.jar" | head -1)"
+    if [[ ! -z "${BUBBLE_JAR}" ]] ; then
+      # Use full jar if available. Client libraries like to have the JS engine for example. This is stripped from the server.
+      BUBBLE_FULL_JAR="$(find "${BUBBLE_SCRIPTS}/../bubble-server/target" -type f -name "bubble*-full.jar" | head -1)"
+      if [[ ! -z "${BUBBLE_FULL_JAR}" ]] ; then
+        BUBBLE_JAR="${BUBBLE_FULL_JAR}"
+      fi
+    fi
   fi
 fi
 if [[ -z "${BUBBLE_JAR}" ]] ; then
diff --git a/bin/first_time_setup.sh b/bin/first_time_setup.sh
index b008152e..f2db4247 100755
--- a/bin/first_time_setup.sh
+++ b/bin/first_time_setup.sh
@@ -61,7 +61,8 @@ elif [[ "${BUBBLE_SETUP_MODE}" == "debug" ]] ; then
   DEBUG_BUILD=debug mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar"
 
 elif [[ "${BUBBLE_SETUP_MODE}" == "production" ]] ; then
-  BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar"
+  BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true -Pproduction clean package || die "Error building bubble jar"
+  BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true -Pproduction-full package || die "Error building bubble full jar"
 
 else
   die "env var BUBBLE_SETUP_MODE was invalid: ${BUBBLE_SETUP_MODE}"
diff --git a/bin/git_update_bubble.sh b/bin/git_update_bubble.sh
index 1af8addb..38efd7b7 100755
--- a/bin/git_update_bubble.sh
+++ b/bin/git_update_bubble.sh
@@ -57,5 +57,6 @@ popd
 if [[ ${FAST} -eq 1 ]] ; then
   mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar"
 else
-  INSTALL_WEB=web mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error building bubble jar"
+  BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true -Pproduction clean package || die "Error building bubble jar"
+  BUBBLE_PRODUCTION=1 mvn -DskipTests=true -Dcheckstyle.skip=true -Pproduction-full package || die "Error building bubble full jar"
 fi
diff --git a/bubble-server/pom.xml b/bubble-server/pom.xml
index d92598a5..30370421 100644
--- a/bubble-server/pom.xml
+++ b/bubble-server/pom.xml
@@ -486,13 +486,14 @@ The exclusions below were generated with:
   jar tf ~/.m2/repository/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4.jar | grep -v 'META-INF' | sed -e 's/\$.*/*.class/' | sort | uniq | grep -v './$' | grep -v MethodUtils | while read ex ; do echo -n "<exclude>$ex</exclude>" ; done
 -->
 <exclude>org/apache/commons/beanutils/BaseDynaBeanMapDecorator*.class</exclude><exclude>org/apache/commons/beanutils/BaseDynaBeanMapDecorator.class</exclude><exclude>org/apache/commons/beanutils/BasicDynaBean.class</exclude><exclude>org/apache/commons/beanutils/BasicDynaClass.class</exclude><exclude>org/apache/commons/beanutils/BeanAccessLanguageException.class</exclude><exclude>org/apache/commons/beanutils/BeanComparator.class</exclude><exclude>org/apache/commons/beanutils/BeanIntrospectionData.class</exclude><exclude>org/apache/commons/beanutils/BeanIntrospector.class</exclude><exclude>org/apache/commons/beanutils/BeanMap*.class</exclude><exclude>org/apache/commons/beanutils/BeanMap.class</exclude><exclude>org/apache/commons/beanutils/BeanPredicate.class</exclude><exclude>org/apache/commons/beanutils/BeanPropertyValueChangeClosure.class</exclude><exclude>org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.class</exclude><exclude>org/apache/commons/beanutils/BeanToPropertyValueTransformer.class</exclude><exclude>org/apache/commons/beanutils/BeanUtils.class</exclude><exclude>org/apache/commons/beanutils/BeanUtilsBean*.class</exclude><exclude>org/apache/commons/beanutils/BeanUtilsBean.class</exclude><exclude>org/apache/commons/beanutils/BeanUtilsBean2.class</exclude><exclude>org/apache/commons/beanutils/ConstructorUtils.class</exclude><exclude>org/apache/commons/beanutils/ContextClassLoaderLocal.class</exclude><exclude>org/apache/commons/beanutils/ConversionException.class</exclude><exclude>org/apache/commons/beanutils/ConvertUtils.class</exclude><exclude>org/apache/commons/beanutils/ConvertUtilsBean.class</exclude><exclude>org/apache/commons/beanutils/ConvertUtilsBean2.class</exclude><exclude>org/apache/commons/beanutils/Converter.class</exclude><exclude>org/apache/commons/beanutils/ConvertingWrapDynaBean.class</exclude><exclude>org/apache/commons/beanutils/DefaultBeanIntrospector.class</exclude><exclude>org/apache/commons/beanutils/DefaultIntrospectionContext.class</exclude><exclude>org/apache/commons/beanutils/DynaBean.class</exclude><exclude>org/apache/commons/beanutils/DynaBeanMapDecorator.class</exclude><exclude>org/apache/commons/beanutils/DynaBeanPropertyMapDecorator.class</exclude><exclude>org/apache/commons/beanutils/DynaClass.class</exclude><exclude>org/apache/commons/beanutils/DynaProperty.class</exclude><exclude>org/apache/commons/beanutils/FluentPropertyBeanIntrospector.class</exclude><exclude>org/apache/commons/beanutils/IntrospectionContext.class</exclude><exclude>org/apache/commons/beanutils/JDBCDynaClass.class</exclude><exclude>org/apache/commons/beanutils/LazyDynaBean.class</exclude><exclude>org/apache/commons/beanutils/LazyDynaClass.class</exclude><exclude>org/apache/commons/beanutils/LazyDynaList.class</exclude><exclude>org/apache/commons/beanutils/LazyDynaMap.class</exclude><exclude>org/apache/commons/beanutils/MappedPropertyDescriptor*.class</exclude><exclude>org/apache/commons/beanutils/MappedPropertyDescriptor.class</exclude><exclude>org/apache/commons/beanutils/MutableDynaClass.class</exclude><exclude>org/apache/commons/beanutils/NestedNullException.class</exclude><exclude>org/apache/commons/beanutils/PropertyUtils.class</exclude><exclude>org/apache/commons/beanutils/PropertyUtilsBean.class</exclude><exclude>org/apache/commons/beanutils/ResultSetDynaClass.class</exclude><exclude>org/apache/commons/beanutils/ResultSetIterator.class</exclude><exclude>org/apache/commons/beanutils/RowSetDynaClass.class</exclude><exclude>org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.class</exclude><exclude>org/apache/commons/beanutils/WeakFastHashMap*.class</exclude><exclude>org/apache/commons/beanutils/WeakFastHashMap.class</exclude><exclude>org/apache/commons/beanutils/WrapDynaBean.class</exclude><exclude>org/apache/commons/beanutils/WrapDynaClass*.class</exclude><exclude>org/apache/commons/beanutils/WrapDynaClass.class</exclude><exclude>org/apache/commons/beanutils/converters/AbstractArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/AbstractConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/ArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/BigDecimalConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/BigIntegerConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/BooleanArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/BooleanConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/ByteArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/ByteConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/CalendarConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/CharacterArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/CharacterConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/ClassConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/ConverterFacade.class</exclude><exclude>org/apache/commons/beanutils/converters/DateConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/DateTimeConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/DoubleArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/DoubleConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/FileConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/FloatArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/FloatConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/IntegerArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/IntegerConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/LongArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/LongConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/NumberConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/ShortArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/ShortConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/SqlDateConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/SqlTimeConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/SqlTimestampConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/StringArrayConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/StringConverter.class</exclude><exclude>org/apache/commons/beanutils/converters/URLConverter.class</exclude><exclude>org/apache/commons/beanutils/expression/DefaultResolver.class</exclude><exclude>org/apache/commons/beanutils/expression/Resolver.class</exclude><exclude>org/apache/commons/beanutils/locale/BaseLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/LocaleBeanUtils*.class</exclude><exclude>org/apache/commons/beanutils/locale/LocaleBeanUtils.class</exclude><exclude>org/apache/commons/beanutils/locale/LocaleBeanUtilsBean*.class</exclude><exclude>org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.class</exclude><exclude>org/apache/commons/beanutils/locale/LocaleConvertUtils.class</exclude><exclude>org/apache/commons/beanutils/locale/LocaleConvertUtilsBean*.class</exclude><exclude>org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.class</exclude><exclude>org/apache/commons/beanutils/locale/LocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/DateLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/LongLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.class</exclude><exclude>org/apache/commons/beanutils/locale/converters/StringLocaleConverter.class</exclude>
-
 <!-- We don't use much of commons-compress -->
-<exclude>org/apache/commons/compress/archivers/arj/**</exclude>
-<exclude>org/apache/commons/compress/archivers/cpio/**</exclude>
-<exclude>org/apache/commons/compress/archivers/dump/**</exclude>
-<exclude>org/apache/commons/compress/archivers/examples/**</exclude>
-<exclude>org/apache/commons/compress/archivers/sevenz/**</exclude>
+<!--
+for commons-compress archivers, we only use a few classes but they're spread out.
+The exclusions below were generated with:
+  jar tf ~/.m2/repository/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar | grep archivers | sed -e 's/\$.*/*.class/' | sort | uniq | grep -v './$' | grep -v ArchiveInputStream | grep -v ArchiveOutputStream | grep -v ArchiveStreamFactory | grep -v ArchiveStreamProvider | grep -v ArchiveException | grep -v CpioConstants | grep -v StreamingNotSupportedException | grep -v ArchiveEntry | grep -v '/tar/' | grep -v '/zip/' | while read ex ; do echo -n "<exclude>$ex</exclude>" ; done
+-->
+<exclude>org/apache/commons/compress/archivers/ArchiveEntry.class</exclude><exclude>org/apache/commons/compress/archivers/EntryStreamOffsets.class</exclude><exclude>org/apache/commons/compress/archivers/Lister.class</exclude><exclude>org/apache/commons/compress/archivers/StreamingNotSupportedException.class</exclude><exclude>org/apache/commons/compress/archivers/ar/ArArchiveEntry.class</exclude><exclude>org/apache/commons/compress/archivers/arj/ArjArchiveEntry*.class</exclude><exclude>org/apache/commons/compress/archivers/arj/ArjArchiveEntry.class</exclude><exclude>org/apache/commons/compress/archivers/arj/LocalFileHeader*.class</exclude><exclude>org/apache/commons/compress/archivers/arj/LocalFileHeader.class</exclude><exclude>org/apache/commons/compress/archivers/arj/MainHeader*.class</exclude><exclude>org/apache/commons/compress/archivers/arj/MainHeader.class</exclude><exclude>org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.class</exclude><exclude>org/apache/commons/compress/archivers/cpio/CpioUtil.class</exclude><exclude>org/apache/commons/compress/archivers/dump/Dirent.class</exclude><exclude>org/apache/commons/compress/archivers/dump/DumpArchiveConstants*.class</exclude><exclude>org/apache/commons/compress/archivers/dump/DumpArchiveConstants.class</exclude><exclude>org/apache/commons/compress/archivers/dump/DumpArchiveEntry*.class</exclude><exclude>org/apache/commons/compress/archivers/dump/DumpArchiveEntry.class</exclude><exclude>org/apache/commons/compress/archivers/dump/DumpArchiveSummary.class</exclude><exclude>org/apache/commons/compress/archivers/dump/DumpArchiveUtil.class</exclude><exclude>org/apache/commons/compress/archivers/dump/InvalidFormatException.class</exclude><exclude>org/apache/commons/compress/archivers/dump/ShortFileException.class</exclude><exclude>org/apache/commons/compress/archivers/dump/TapeInputStream*.class</exclude><exclude>org/apache/commons/compress/archivers/dump/TapeInputStream.class</exclude><exclude>org/apache/commons/compress/archivers/dump/UnrecognizedFormatException.class</exclude><exclude>org/apache/commons/compress/archivers/dump/UnsupportedCompressionAlgorithmException.class</exclude><exclude>org/apache/commons/compress/archivers/examples/Archiver*.class</exclude><exclude>org/apache/commons/compress/archivers/examples/Archiver.class</exclude><exclude>org/apache/commons/compress/archivers/examples/CloseableConsumer*.class</exclude><exclude>org/apache/commons/compress/archivers/examples/CloseableConsumer.class</exclude><exclude>org/apache/commons/compress/archivers/examples/CloseableConsumerAdapter.class</exclude><exclude>org/apache/commons/compress/archivers/examples/Expander*.class</exclude><exclude>org/apache/commons/compress/archivers/examples/Expander.class</exclude><exclude>org/apache/commons/compress/archivers/jar/JarArchiveEntry.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder*.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/Archive.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/BindPair.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/BoundedSeekableByteChannelInputStream.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/CLI*.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/CLI.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/Coder.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/CoderBase.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/Coders*.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/Coders.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/DeltaDecoder.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/Folder.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/LZMADecoder.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/NID.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZFile*.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZFile.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZFileOptions*.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZFileOptions.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZMethod.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZMethodConfiguration.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZOutputFile*.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/StartHeader.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/StreamMap.class</exclude><exclude>org/apache/commons/compress/archivers/sevenz/SubStreamsInfo.class</exclude>
+
 <exclude>org/apache/commons/compress/compressors/snappy/**</exclude>
 <exclude>org/apache/commons/compress/compressors/lz4/**</exclude>
 <exclude>org/apache/commons/compress/compressors/lz77support/**</exclude>