From 2d8553bc08a3bd6df0caf93b4112a23dd301a122 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Fri, 18 Dec 2020 18:53:34 -0500
Subject: [PATCH] add cobbzilla-parent submodule

---
 .gitmodules                                       |  3 +++
 bin/jvc_common                                    | 12 ++++++++----
 bin/{use_https_submodule => use_https_submodules} |  0
 utils/cobbzilla-parent                            |  1 +
 4 files changed, 12 insertions(+), 4 deletions(-)
 rename bin/{use_https_submodule => use_https_submodules} (100%)
 create mode 160000 utils/cobbzilla-parent

diff --git a/.gitmodules b/.gitmodules
index 3505368..d73a359 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "utils/cobbzilla-utils"]
 	path = utils/cobbzilla-utils
 	url = git@git.bubblev.org:bubblev/cobbzilla-utils.git
+[submodule "utils/cobbzilla-parent"]
+	path = utils/cobbzilla-parent
+	url = git@git.bubblev.org:bubblev/cobbzilla-parent.git
diff --git a/bin/jvc_common b/bin/jvc_common
index 33fc3e5..b2ef1ff 100755
--- a/bin/jvc_common
+++ b/bin/jvc_common
@@ -61,24 +61,28 @@ if [[ -z "${JVC_JAR}" ]] ; then
     die "Maven not installed (mvn command not found on PATH), cannot build JVC jar"
   fi
 
-  # Build and install utility library
+  # Build and install utility libraries
+  pushd "${JVC_DIR}"/utils/cobbzilla-parent || die "Error changing directories to ${JVC_DIR}/utils/cobbzilla-parent"
+  mvn install || die "Error installing cobbzilla-parent"
+  popd || die "popd error (pwd=$(pwd))"
+
   pushd "${JVC_DIR}"/utils/cobbzilla-utils || die "Error changing directories to ${JVC_DIR}/utils/cobbzilla-utils"
   if [[ -z "$(find target -type f -name "*.jar")" ]] ; then
     if [[ -z "$(find . -type f)" ]] ; then
       cd ../.. && \
-        ./bin/use_https_submodule && \
+        ./bin/use_https_submodules && \
         git submodule update --init --recursive && \
         cd - \
       || die "Error updating git submodule"
     fi
     mvn -DskipTests=true clean install || die "Error building cobbzilla-utils library"
-    popd || die "popd error"
   fi
+  popd || die "popd error (pwd=$(pwd))"
 
   # Build jvc uberjar
   pushd "${JVC_DIR}" || die "Error changing directories to ${JVC_DIR}"
   mvn -DskipTests=true -Puberjar clean package || die "Error building JVC jar"
-  popd || die "popd error"
+  popd || die "popd error (pwd=$(pwd))"
 
   JVC_JAR="$(find "${JVC_DIR}"/target -type f -name "jvc-*-prod.jar" | head -1)"
   if [[ -z "${JVC_JAR}" ]] ; then
diff --git a/bin/use_https_submodule b/bin/use_https_submodules
similarity index 100%
rename from bin/use_https_submodule
rename to bin/use_https_submodules
diff --git a/utils/cobbzilla-parent b/utils/cobbzilla-parent
new file mode 160000
index 0000000..8e7003d
--- /dev/null
+++ b/utils/cobbzilla-parent
@@ -0,0 +1 @@
+Subproject commit 8e7003de03983a4a683702436b89469dac0ffe0a