Skip to content

Commit 38766d8

Browse files
committed
Update forbidden-api, xmlbeans, JaCoCo
Also remove some obsolete property-file sorting, Gradle itself produces a stable file since some releases git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1923006 13f79535-47bb-0310-9956-ffa450edef68
1 parent 86de6a1 commit 38766d8

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

build.gradle

+3-14
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ buildscript {
2323

2424
dependencies {
2525
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929'
26-
classpath 'de.thetaphi:forbiddenapis:3.7'
26+
classpath 'de.thetaphi:forbiddenapis:3.8'
2727
}
2828
}
2929

@@ -147,7 +147,7 @@ dependencies {
147147

148148

149149
// previous xmlbeans version is used to bootstrap necessary schema bindings
150-
bootstrap 'org.apache.xmlbeans:xmlbeans:5.2.1'
150+
bootstrap 'org.apache.xmlbeans:xmlbeans:5.3.0'
151151
bootstrap "org.apache.logging.log4j:log4j-core:${log4jVersion}"
152152

153153
genresources "org.apache.logging.log4j:log4j-core:${log4jVersion}"
@@ -187,17 +187,6 @@ testSchemas.each {
187187
schemaGenTask(it.name, 'test', (it.name =~ /sEXT/ ? extCP : configurations.genresources), it.dir, "${it.path}:${it.name}")
188188
}
189189

190-
task adjustWrapperPropertiesFile {
191-
doLast {
192-
ant.replaceregexp(match:'^#.*', replace:'', flags:'g', byline:true) {
193-
fileset(dir: project.projectDir, includes: 'gradle/wrapper/gradle-wrapper.properties')
194-
}
195-
new File(project.projectDir, 'gradle/wrapper/gradle-wrapper.properties').with { it.text = it.readLines().findAll { it }.sort().join('\n') }
196-
ant.fixcrlf(file: 'gradle/wrapper/gradle-wrapper.properties', eol: 'lf')
197-
}
198-
}
199-
wrapper.finalizedBy adjustWrapperPropertiesFile
200-
201190
// https://discuss.gradle.org/t/passing-arguments-to-a-task/8427
202191
def schemaGenTask(String baseName, String mainTest, FileCollection beansPath, String xsdDir, String... xsdIncludes) {
203192
String srcDir = "build/generated/sources/${baseName}/${mainTest}/java"
@@ -680,7 +669,7 @@ if (project.hasProperty('enableSonar')) {
680669

681670

682671
jacoco {
683-
toolVersion = '0.8.11'
672+
toolVersion = '0.8.12'
684673
}
685674

686675
test {

0 commit comments

Comments
 (0)