Merge branch '5.1.x'
This commit is contained in:
commit
8ca834b868
|
@ -216,6 +216,7 @@ configure(subprojects.findAll { (it.name != "spring-build-src") && (it.name != "
|
||||||
javadoc {
|
javadoc {
|
||||||
description = "Generates project-level javadoc for use in -javadoc jar"
|
description = "Generates project-level javadoc for use in -javadoc jar"
|
||||||
|
|
||||||
|
options.encoding = "UTF-8"
|
||||||
options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
|
options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
|
||||||
options.author = true
|
options.author = true
|
||||||
options.header = project.name
|
options.header = project.name
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2018 the original author or authors.
|
* Copyright 2002-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -24,6 +24,7 @@ task api(type: Javadoc) {
|
||||||
it.tasks.getByName("jar")
|
it.tasks.getByName("jar")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
options.encoding = "UTF-8"
|
||||||
options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
|
options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
|
||||||
options.author = true
|
options.author = true
|
||||||
options.header = rootProject.description
|
options.header = rootProject.description
|
||||||
|
|
Loading…
Reference in New Issue