[ofbiz-framework] 01/02: Fixed: We have build problems in branches with plugins (OFBIZ-11284)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 123f73155a4179d2c544a0cd827a2dabcfa4e389
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Feb 14 09:38:31 2023 +0100

    Fixed: We have build problems in branches with plugins (OFBIZ-11284)
    
    With this change we don't need to amend
    
https://cwiki.apache.org/confluence/display/OFBIZ/Release+Management+Guide+for+OFBiz
    
    Conflicts handled by hand
---
 build.gradle | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index efe5350ff5..5f89aff8e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -970,8 +970,13 @@ task pullPluginSource(group: ofbizPlugin, description: 
'Download and install a p
     if (project.hasProperty('pluginId')) {
         // GitHub SVN feature 
https://docs.github.com/en/github/importing-your-projects-to-github/working-with-subversion-on-github/support-for-subversion-clients
         task pullPluginFromSvn(type: SvnCheckout) {
-            def currentBranch = getCurrentGitBranch() // Only used for release 
branches
-            svnUrl = 
"https://github.com/apache/ofbiz-plugins/trunk/${pluginId}";
+            def currentBranch = getCurrentGitBranch()
+            // Only used for release branches
+            if (currentBranch == "trunk") {
+                svnUrl = 
"https://github.com/apache/ofbiz-plugins/trunk/${pluginId}";
+            } else {
+                svnUrl = "https://github.com/apache/ofbiz-plugins/branches/"; + 
currentBranch + "/${pluginId}"
+            }
             workspaceDir = "${pluginsDir}/${pluginId}"
         }
         dependsOn pullPluginFromSvn
@@ -989,8 +994,12 @@ task pullAllPluginsSource(group: ofbizPlugin,
     }
     task pullPluginsFromSvn(type: SvnCheckout, dependsOn: deleteBeforePulling) 
{
         // GitHub SVN feature 
https://docs.github.com/en/github/importing-your-projects-to-github/working-with-subversion-on-github/support-for-subversion-clients
-        def currentBranch = getCurrentGitBranch() // Only used for release 
branches
-        svnUrl = "https://github.com/apache/ofbiz-plugins/trunk";
+        def currentBranch = getCurrentGitBranch()
+        // Only used for release branches
+        if (currentBranch == "trunk") {
+            svnUrl = "https://github.com/apache/ofbiz-plugins/trunk";
+        } else {
+            svnUrl = "https://github.com/apache/ofbiz-plugins/branches/"; + 
currentBranch
         workspaceDir = "${pluginsDir}"
     }
     dependsOn pullPluginsFromSvn