diff options
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/build.gradle b/build.gradle index be66b393..9eb8a547 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ allprojects { url "https://repo.spring.io/milestone/" } } - version = '4.3.0-SNAPSHOT' + version = '4.3.3-SNAPSHOT' } subprojects { @@ -58,8 +58,9 @@ subprojects { } dependencies { - compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.24' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.24' + implementation "org.projectlombok:lombok:1.18.28" + annotationProcessor "org.projectlombok:lombok:1.18.28" + testAnnotationProcessor "org.projectlombok:lombok:1.18.28" testImplementation 'junit:junit:4.13.2' } @@ -83,7 +84,7 @@ subprojects { revision = getCheckedOutGitCommitHash() //tomcatVersion = '7.0.54'; //tomcatVersion = '8.0.36'; - tomcatVersion = '9.0.46'; + tomcatVersion = '9.0.73'; slf4jVersion = '1.7.36' cxfVersion = '3.5.5' } @@ -187,21 +188,9 @@ task releases(type: Copy) { def getCheckedOutGitCommitHash() { - def gitFolder = "$projectDir/.git/" - def takeFromHash = 40 - /* - * '.git/HEAD' contains either - * in case of detached head: the currently checked out commit hash - * otherwise: a reference to a file containing the current commit hash - */ - def head = new File(gitFolder + "HEAD").text.split(":") // .git/HEAD - def isCommit = head.length == 1 // e5a7c79edabbf7dd39888442df081b1c9d8e88fd - // def isRef = head.length > 1 // ref: refs/heads/master - - if(isCommit) return head[0].trim().take(takeFromHash) // e5a7c79edabb - - def refHead = new File(gitFolder + head[1].trim()) // .git/refs/heads/master - refHead.text.trim().take takeFromHash + def takeFromHash = 40 + 'git rev-parse --verify HEAD'.execute().text.trim().take takeFromHash + } /* task docs(type: Javadoc) { |