You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2023/02/14 09:02:43 UTC
[ofbiz-framework] branch trunk updated (499e7acd76 -> 695803f83e)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from 499e7acd76 Fixed: We have build problems in branches with plugins (OFBIZ-11284)
new 123f73155a Fixed: We have build problems in branches with plugins (OFBIZ-11284)
new 695803f83e Fixed: We have build problems in branches with plugins (OFBIZ-11284)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
[ofbiz-framework] 02/02: Fixed: We have build problems in branches with plugins (OFBIZ-11284)
Posted by jl...@apache.org.
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 695803f83e49854a5b6413b293666bf159de7d23
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Tue Feb 14 09:56:52 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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.gradle b/build.gradle
index 5f89aff8e7..03fb776250 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1000,6 +1000,7 @@ task pullAllPluginsSource(group: ofbizPlugin,
svnUrl = "https://github.com/apache/ofbiz-plugins/trunk"
} else {
svnUrl = "https://github.com/apache/ofbiz-plugins/branches/" + currentBranch
+ }
workspaceDir = "${pluginsDir}"
}
dependsOn pullPluginsFromSvn
[ofbiz-framework] 01/02: Fixed: We have build problems in branches with plugins (OFBIZ-11284)
Posted by jl...@apache.org.
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 <ja...@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