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


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

commit 499e7acd76e7d030d1d2259ced147db1a60335da
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Feb 13 19:42:23 2023 +0100

    Fixed: We have build problems in branches with plugins (OFBIZ-11284)
    
    OK must be https://github.com/apache/ofbiz-plugins/branches/...
    But does not work for trunk (410):
    https://github.com/apache/ofbiz-plugins/branches/trunk
    So we really need to amend
    
https://cwiki.apache.org/confluence/display/OFBIZ/Release+Management+Guide+for+OFBiz
---
 build.gradle | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index acfe90ed28..efe5350ff5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -142,6 +142,7 @@ tasks.withType(JavaCompile) {
     if (!project.hasProperty('skipNpmInstall')) finalizedBy 'npmInstall'
 }
 
+// Only used for release branches
 def getCurrentGitBranch() {
     return "git branch --show-current".execute().text.trim()
 }
@@ -969,8 +970,8 @@ 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()
-            svnUrl = "https://github.com/apache/ofbiz-plugins/"; + 
currentBranch + "/${pluginId}"
+            def currentBranch = getCurrentGitBranch() // Only used for release 
branches
+            svnUrl = 
"https://github.com/apache/ofbiz-plugins/trunk/${pluginId}";
             workspaceDir = "${pluginsDir}/${pluginId}"
         }
         dependsOn pullPluginFromSvn
@@ -988,8 +989,8 @@ 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/"; + currentBranch
+        def currentBranch = getCurrentGitBranch() // Only used for release 
branches
+        svnUrl = "https://github.com/apache/ofbiz-plugins/trunk";
         workspaceDir = "${pluginsDir}"
     }
     dependsOn pullPluginsFromSvn