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 e7a6a34b94 Fixed: We have build problems in branches with plugins
(OFBIZ-11284)
e7a6a34b94 is described below
commit e7a6a34b944579d3488e21ebf18918ea1c5a928c
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Feb 14 16:13:03 2023 +0100
Fixed: We have build problems in branches with plugins (OFBIZ-11284)
Replaces "trunk" by current branch (can be trunk too). In Javadoc uses 17
not 8
---
build.gradle | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index 8b2bd7e04e..687ee45783 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,10 +95,10 @@ distributions.main.contents.from(rootDir) {
}
javadoc {
- title='OFBiz trunk API'
+ title="OFBiz " + getCurrentGitBranch() + " API"
failOnError = true
options {
- source '8'
+ source '17'
encoding 'UTF-8'
charSet 'UTF-8'
// Those external Javadoc links should correspond to the actual
@@ -579,7 +579,7 @@ task createTenant(group: ofbizServer, description: 'Create
a new tenant in your
// ========== Documentation tasks ==========
tasks.withType(AsciidoctorTask) { task ->
outputOptions {
- // I hate we have to do this - but jruby (asciidoctorj-pdf) and
windows don't mix well
+ // I hate we have to do this - but JRuby (asciidoctorj-pdf) and
Windows don't mix well
if (System.properties['os.name'].toLowerCase().contains('windows')) {
backends 'html5'
} else {
@@ -588,7 +588,7 @@ tasks.withType(AsciidoctorTask) { task ->
}
attributes \
'doctype': 'book',
- 'revnumber': 'Trunk',
+ 'revnumber': getCurrentGitBranch(),
'experimental': '',
'allow-uri-read': true,
'icons': 'font',
