svn commit: r1787144 - in /ofbiz/ofbiz-framework/trunk: build.gradle common.gradle

Author: jleroux
Date: Thu Mar 16 08:48:13 2017
New Revision: 1787144

URL: http://svn.apache.org/viewvc?rev=1787144&view=rev
Log:
Fixed: Error message when svn updating due to pullAllPluginsSource
(OFBIZ-9262)

After removing the plugins dir, we should not have any issues. Tested locally:
works

Thanks: Taher and Deepak for sharing thoughts

Modified:
    ofbiz/ofbiz-framework/trunk/build.gradle
    ofbiz/ofbiz-framework/trunk/common.gradle

Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1787144&r1=1787143&r2=1787144&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Thu Mar 16 08:48:13 2017
@@ -747,13 +747,12 @@ task pullPluginSource(group: ofbizPlugin
 task pullAllPluginsSource(group: ofbizPlugin,
         description: 'Download and install all plugins from source control. Warning! deletes existing plugins') {
 
-    task pullPluginsFromSvn(type: SvnCheckout) {
+    task cleanupBeforePulling {
+        doLast { delete "${rootDir}/plugins" }
+    }
+    task pullPluginsFromSvn(type: SvnCheckout, dependsOn: cleanupBeforePulling) {
         svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk"
-        workspaceDir = "${rootDir}/temp"
-        doLast{
-            delete "${rootDir}/plugins"
-            ant.move(file: "${rootDir}/temp", toFile: "${rootDir}/plugins")
-        }
+        workspaceDir = "${rootDir}/plugins"
     }
     dependsOn pullPluginsFromSvn
 

Modified: ofbiz/ofbiz-framework/trunk/common.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/common.gradle?rev=1787144&r1=1787143&r2=1787144&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/common.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/common.gradle Thu Mar 16 08:48:13 2017
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+mkdir "${rootDir}/plugins"
+
 def iterateOverActiveComponents(applyFunction) {
 
     // Start is not a real component, therefore loading it manually