[ofbiz-framework] branch release22.01 updated: 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 release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release22.01 by this push:
     new ed48ce2844 Fixed: We have build problems in branches with plugins 
(OFBIZ-11284)
ed48ce2844 is described below

commit ed48ce2844693f4f73493ab6d0d3a9aa154987ae
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
---
 build.gradle | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4d24c9c6a5..8b2bd7e04e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -959,7 +959,11 @@ task pullPluginSource(group: ofbizPlugin, description: 
'Download and install a p
         // 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()
-            svnUrl = "https://github.com/apache/ofbiz-plugins/branches/"; + 
currentBranch + "/${pluginId}"
+            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
@@ -978,7 +982,11 @@ 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()
-        svnUrl = "https://github.com/apache/ofbiz-plugins/branches/"; + 
currentBranch
+        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