Merge pull request #314 from clowder-framework/log4j

Log4j

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
             echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
-          else 
+          else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
           fi
       - uses: actions/setup-java@v1
@@ -97,7 +97,7 @@ jobs:
             echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
-          else 
+          else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
           fi
       - uses: actions/setup-java@v1
@@ -141,7 +141,7 @@ jobs:
             echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
-          else 
+          else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
           fi
       - uses: actions/setup-java@v1
@@ -164,6 +164,16 @@ jobs:
           VERSION: ${{ env.CLOWDER_VERSION }}
           BUILDNUMBER: ${{ github.run_number }}
           GITSHA1: ${{ github.sha  }}
+      - name: fix log4j
+        run: |
+          ZIPFILE=$(ls -1rt target/universal/*.zip | head -1)
+          DIR=$(basename ${ZIPFILE} .zip)
+          unzip -q ${ZIPFILE}
+          for x in $(find ${DIR} -name \*.jar); do
+            zip -d $x org/apache/log4j/net/JMSAppender.class org/apache/log4j/net/SocketServer.class | grep 'deleting:' && echo "fixed $x"
+          done
+          rm ${ZIPFILE}
+          zip -r ${ZIPFILE} ${DIR}
       - uses: actions/upload-artifact@v2
         with:
           name: clowder.zip
@@ -207,7 +217,7 @@ jobs:
             echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
-          else 
+          else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
           fi
       - uses: actions/setup-java@v1
@@ -247,7 +257,7 @@ jobs:
           key: ${{ secrets.SCP_KEY }}
           files: "target/scala-*/api/*"
           target: "CATS/${{ env.CLOWDER_VERSION }}/documentation/scaladoc"
-      - name: sphinx  
+      - name: sphinx
         run: |
           cd doc/src/sphinx/
           python -m pip install -r requirements.txt

.github/workflows/docker.yml

@@ -36,6 +36,7 @@ jobs:
           - clowder
           - mongo-init
           - monitor
+          - elasticsearch
         include:
           - name: clowder
             FOLDER: "."
@@ -49,6 +50,11 @@ jobs:
             FOLDER: scripts/monitor
             IMAGE: monitor
             README: ""
+          - name: elasticsearch
+            FOLDER: scripts/elasticsearch
+            IMAGE: elasticsearch
+            README: ""
+
     steps:
       - uses: actions/checkout@v2
 
@@ -75,7 +81,7 @@ jobs:
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
             echo "CLOWDER_TAGS=develop" >> $GITHUB_ENV
-          else 
+          else
             echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
             echo "CLOWDER_TAGS=" >> $GITHUB_ENV
           fi

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.19.5 - 2022-01-21
+
+### Fixed
+- Removed JMSAppender and SocketServer from log4j.
+- Cleaned up getting started documentation.
+
 ## 1.19.4 - 2021-11-11
 
 ### Fixed

CONTRIBUTORS.md

@@ -16,6 +16,7 @@ Following is a list of contributors in alphabetical order:
 - Inna Zharnitsky
 - Jim Myers
 - Jong Lee
+- Kastan Day
 - Kaveh Karimi-Asli
 - Kenton McHenry
 - Luigi Marini

Dockerfile

@@ -30,6 +30,11 @@ RUN rm -rf target/universal/clowder-*.zip clowder clowder-* \
     && ./sbt dist \
     && unzip -q target/universal/clowder-*.zip \
     && mv clowder-* clowder \
+    && apk add --no-cache zip \
+    && for x in $(find clowder -name \*.jar); do \
+         zip -d $x org/apache/log4j/net/JMSAppender.class org/apache/log4j/net/SocketServer.class | grep 'deleting:' && echo "fixed $x"; \
+       done; \
+       echo "removed JMSAppender and SocketServer" \
     && mkdir -p clowder/custom clowder/logs
 
 # ----------------------------------------------------------------------

doc/src/sphinx/conf.py

@@ -22,7 +22,7 @@
 author = 'Luigi Marini'
 
 # The full version, including alpha/beta/rc tags
-release = '1.19.4'
+release = '1.19.5'
 
 
 # -- General configuration ---------------------------------------------------

doc/src/sphinx/index.rst

@@ -44,13 +44,13 @@ Contents
     :caption: Getting Started
 
     userguide/ug_index
+    userguide/installing_clowder
     api
 
 .. toctree::
     :maxdepth: 1
     :caption: Administration
 
-    admin/installing
     admin/upgrading
     admin/customizing