[OPENJDK-2968] remove vestiges of scl-enable-maven

This was used in the RHEL7 images but not since.

Signed-off-by: Jonathan Dowland <[email protected]>

modules/maven/default/backward_compatibility.sh

@@ -4,7 +4,5 @@ set -e
 
 # For backward compatibility
 mkdir -p /usr/local/s2i
-ln -s /opt/jboss/container/maven/default/scl-enable-maven /usr/local/s2i/scl-enable-maven
-chown -h jboss:root /usr/local/s2i/scl-enable-maven
 ln -s /opt/jboss/container/maven/default/maven.sh /usr/local/s2i/common.sh
 chown -h jboss:root /usr/local/s2i/common.sh

modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i

@@ -36,10 +36,6 @@ function maven_s2i_init() {
   # Location of archived local Maven repository.  Used with incremental builds.
   _MAVEN_S2I_ARCHIVED_REPO="${S2I_ARTIFACTS_DIR}/m2"
 
-  # include maven scripts
-  if test -r "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}"/scl-enable-maven; then
-	  source "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}"/scl-enable-maven
-  fi
   source "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}"/maven.sh
 
   # Overrides for use with maven s2i

modules/s2i/bash/artifacts/usr/local/s2i/run

@@ -11,12 +11,6 @@ source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
 # Global S2I variable setup
 s2i_core_env_init
 
-# CLOUD-3387: RHEL7-based images enable maven in the runtime environment. This
-# is not needed for RHEL8-based images.
-if test -r "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/scl-enable-maven"; then
-    source "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/scl-enable-maven"
-fi
-
 if [ -z "${JAVA_OPTS+isunset}" ] && [ -n "${JAVA_OPTIONS+isset}" ]; then
     JAVA_OPTS="$JAVA_OPTIONS"
 fi

modules/s2i/bash/artifacts/usr/local/s2i/s2i-setup

@@ -9,5 +9,3 @@ source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
 log_warning "s2i-setup script has been deprecated and will be removed in a future release."
 
 s2i_core_init
-
-source "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/scl-enable-maven"