[java-parent-projects COMMIT] in /java-parent-project-v3/trunk/bin: lock-version-common.sh lock-version-monolithic.sh...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan 13 18:00:58 2014
New Revision: 209

URL: http://svn.shibboleth.net/view/java-parent-projects?rev=209&view=rev
Log:
No locking of externals.

Modified:
    java-parent-project-v3/trunk/bin/lock-version-common.sh
    java-parent-project-v3/trunk/bin/lock-version-monolithic.sh
    java-parent-project-v3/trunk/bin/lock-version-multimodule.sh

Modified: java-parent-project-v3/trunk/bin/lock-version-common.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/lock-version-common.sh?rev=209&r1=208&r2=209&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/lock-version-common.sh (original)
+++ java-parent-project-v3/trunk/bin/lock-version-common.sh Mon Jan 13 18:00:58 2014
@@ -2,23 +2,6 @@
 
 declare -r SVN=${SVN:-"/usr/bin/svn"}
 declare -r SED=${SED:-"/usr/bin/sed"}
-
-# $1 the version number to use
-# $2 the directory of the monolithic project or project module
-function lock_externals {
-    CURRENT=`$SVN propget svn:externals "$2"`
-    if [ -z "$CURRENT" ] ; then
-        return
-    fi
-
-    echo "Setting svn:externals property on directory $2"
-    $SVN --non-interactive --quiet propset svn:externals "/java-parent-projects/java-parent-project-v3/tags/$1/resources/eclipse/.settings .settings" "$2"
-    RETVAL=$?
-    if [ $RETVAL != 0 ] ; then
-        echo "Setting the svn:externals property on directory $2 failed with a status code of $RETVAL"
-        exit 1;
-    fi
-}
 
 # $1 the version number to use
 # $2 the directory of the monolithic project or project module

Modified: java-parent-project-v3/trunk/bin/lock-version-monolithic.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/lock-version-monolithic.sh?rev=209&r1=208&r2=209&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/lock-version-monolithic.sh (original)
+++ java-parent-project-v3/trunk/bin/lock-version-monolithic.sh Mon Jan 13 18:00:58 2014
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-# Adjusts the reference to the eclipse settings, project POM, and project 
+# Adjusts the reference to the eclipse project POM, and project 
 # checkstyle configuration such that it points to static, tagged parent project
 # information.
 
@@ -16,6 +16,5 @@
 
 source $LOCATION/lock-version-common.sh
 
-lock_externals $1 $2
 lock_pom $1 $2
 lock_checkstyle $1 $2

Modified: java-parent-project-v3/trunk/bin/lock-version-multimodule.sh
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v3/trunk/bin/lock-version-multimodule.sh?rev=209&r1=208&r2=209&view=diff
==============================================================================
--- java-parent-project-v3/trunk/bin/lock-version-multimodule.sh (original)
+++ java-parent-project-v3/trunk/bin/lock-version-multimodule.sh Mon Jan 13 18:00:58 2014
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # Adjusts the references to the reference to the super POM in the parent module
-# and the eclipse settings and checkstyle configuration for each project module
+# and the checkstyle configuration for each project module
 # such that it points to static, tagged parent project information.
 
 if [ $# != 2 ] ; then
@@ -21,7 +21,6 @@
         if [ ${module##*-} = "parent" ] ; then
             lock_pom $1 $2/$module
         else
-            lock_externals $1 $2/$module
             lock_checkstyle $1 $2/$module
         fi
     fi