Merge branch 'v3' into 'development'

meh

See merge request !18

.gitignore

+archive.key
 *.whl
+*.jar
 *.tar.gz
-*.rpm
-jsonnet
+*.rpm
\ No newline at end of file
\ No newline at end of file

Dockerfile

@@ -104,11 +104,13 @@ COPY cp-server-operator-*_EtcConfluent.tar.gz /etc/
 ## For auditing & debugging
 COPY Dockerfile /etc/confluent/ironbank/
 COPY hardening_manifest.yaml /etc/confluent/ironbank/
+COPY maven-artifact-3.8.1.jar /tmp/
 
 RUN echo "===> Installing operator stuff" \
     && cd /usr/share && tar -xvf *_UsrShareJava.tar.gz && rm *_UsrShareJava.tar.gz \
     && cd /opt && tar -xvf *_OptCaas.tar.gz && rm *_OptCaas.tar.gz \
     && cd /etc && tar -xvf *_EtcConfluent.tar.gz && rm *_EtcConfluent.tar.gz \
+    && find /usr/share/java -type f \( -name "maven-artifact-3.3.3.jar" -o -name "maven-artifact-3.6.3.jar" \) -execdir cp /tmp/maven-artifact-3.8.1.jar . \; -exec rm {} \; \ 
     && chown -R appuser:appuser /etc/confluent \
     && mkdir -p "$KAFKA_DATA_DIR" "${KAFKA_LOG4J_DIR}" "${KAFKA_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" \
    	&& chmod -R ag+w "${KAFKA_LOG4J_DIR}" "${KAFKA_CONFIG_DIR}" "$KAFKA_DATA_DIR" "/opt"

hardening_manifest.yaml

@@ -221,7 +221,7 @@ resources:
   url: https://packages.confluent.io/rpm/6.1/archive.key
   validation:
     type: sha256
-    value: b569e9d80bc08b65d342491f8b94e47eb7032701ce17b091f212e1072672a4d5
+    value: b569e9d80bc08b65d342491f8b94e47eb7032701ce17b091f212e1072672a4d5  
 - filename: confluent-common-6.1.1-1.noarch.rpm
   url: https://packages.confluent.io/rpm/6.1/confluent-common-6.1.1-1.noarch.rpm
   validation:
@@ -317,7 +317,13 @@ resources:
   validation:
     type: sha256
     value: d0010d491ed7d28eab7da8661661a3f75219a4f68ded66618aaa953994791b90     
-          
+- filename: maven-artifact-3.8.1.jar
+  url: https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.1/maven-artifact-3.8.1.jar
+  validation:
+    type: sha256
+    value: 9dbd3db15ac4816471e72981cb06ef90f3ffa8be6628dddf7135f7bd69bee0c0      
+  
+
 # List of project maintainers
 maintainers:
 - name: "Scott Stroud"

scripts/importArtifacts.sh

@@ -53,6 +53,7 @@ mani=$(realpath "../hardening_manifest.yaml")
 importArtifacts $mani 'ironbank-files.s3.amazonaws.com' "$RESOURCE_HOME/ironbank-files"
 importArtifacts $mani 'packages.confluent.io' "$RESOURCE_HOME/confluent"
 importArtifacts $mani 'files.pythonhosted.org' "$RESOURCE_HOME/pythonhosted"
+importArtifacts $mani 'repo1.maven.org' "$RESOURCE_HOME/maven"
 
 echo "Generating hardening_manifest_template.yaml ..."
 $SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/ironbank-files"