BUG 1176970: Delete all dependencies except settings.xml

openshift · Jan 7, 2015 · 70ed801 · 70ed801
1 parent 55b1939
commit 70ed801
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cartridges/openshift-origin-cartridge-jbossas/bin/control b/cartridges/openshift-origin-cartridge-jbossas/bin/control
@@ -241,7 +241,7 @@ function build() {
       if force_clean_build_enabled_for_latest_deployment
       then
           echo "Force-clean build is enabled. Removing Maven dependencies." 1>&2
-          rm -rf ${OPENSHIFT_HOMEDIR}.m2/* ${OPENSHIFT_HOMEDIR}.m2/.[^.]*
+          find ${OPENSHIFT_HOMEDIR}.m2/* -maxdepth 0 -name 'settings.xml' -prune -o -exec rm -rf '{}' ';'
       fi
 
       if [ -f ${OPENSHIFT_REPO_DIR}pom.xml ] && ! marker_present skip_maven_build

diff --git a/cartridges/openshift-origin-cartridge-jbosseap/bin/control b/cartridges/openshift-origin-cartridge-jbosseap/bin/control
@@ -239,7 +239,7 @@ function build() {
       if force_clean_build_enabled_for_latest_deployment
       then
           echo "Force-clean build is enabled. Removing Maven dependencies." 1>&2
-          rm -rf ${OPENSHIFT_HOMEDIR}.m2/* ${OPENSHIFT_HOMEDIR}.m2/.[^.]*
+          find ${OPENSHIFT_HOMEDIR}.m2/* -maxdepth 0 -name 'settings.xml' -prune -o -exec rm -rf '{}' ';'
       fi
 
       if [ -f ${OPENSHIFT_REPO_DIR}pom.xml ] && ! marker_present skip_maven_build

diff --git a/cartridges/openshift-origin-cartridge-jbossews/bin/build b/cartridges/openshift-origin-cartridge-jbossews/bin/build
@@ -32,7 +32,7 @@ fi
 
 if force_clean_build_enabled_for_latest_deployment; then
   echo "force_clean_build marker found; removing Maven dependencies."
-  rm -rf ${OPENSHIFT_HOMEDIR}.m2/* ${OPENSHIFT_HOMEDIR}.m2/.[^.]*
+  find ${OPENSHIFT_HOMEDIR}.m2/* -maxdepth 0 -name 'settings.xml' -prune -o -exec rm -rf '{}' ';'
 fi
 
 # Calculate build heap size