diff --git a/docs/docs.gradle b/docs/docs.gradle index ed08903e2e..e420c4abf3 100644 --- a/docs/docs.gradle +++ b/docs/docs.gradle @@ -60,6 +60,8 @@ project('manual') { task apidocs(type: Javadoc) { destinationDir = new File(buildDir, 'apidocs') title = "Spring Security $version API" + logging.captureStandardError LogLevel.INFO + logging.captureStandardOutput LogLevel.INFO source coreModuleProjects.collect { project -> project.sourceSets.main.allJava @@ -68,34 +70,34 @@ task apidocs(type: Javadoc) { classpath = files(coreModuleProjects.collect { project -> project.sourceSets.main.compileClasspath }) -} + options { + outputLevel = org.gradle.external.javadoc.JavadocOutputLevel.QUIET + links = [ + "http://static.springframework.org/spring/docs/3.2.x/javadoc-api", + "http://static.springsource.org/spring-ldap/docs/1.3.x/apidocs/", + "http://download.oracle.com/javase/6/docs/api/" + ] + groups = [ + 'Spring Security Core':[ + 'org.springframework.security.core*', + 'org.springframework.security.authentication*', + 'org.springframework.security.access*', + 'org.springframework.security.remoting*', + 'org.springframework.security.provisioning*', + 'org.springframework.security.util*'], + 'Spring Security Web':['org.springframework.security.web*'], + 'Spring Security LDAP':['org.springframework.security.ldap*'], + 'Spring Security Crypto':['org.springframework.security.crypto*'], + 'Spring Security OpenID':['org.springframework.security.openid*'], + 'Spring Security CAS':['org.springframework.security.cas*'], + 'Spring Security ACL':['org.springframework.security.acls*'], + 'Spring Security Config':['org.springframework.security.config*'], + 'Spring Security Taglibs':['org.springframework.security.taglibs*'], -apidocs.options.outputLevel = org.gradle.external.javadoc.JavadocOutputLevel.QUIET - -apidocs.options.links = [ - "http://static.springframework.org/spring/docs/3.2.x/javadoc-api", - "http://static.springsource.org/spring-ldap/docs/1.3.x/apidocs/", - "http://download.oracle.com/javase/6/docs/api/" -] - -apidocs.options.groups = [ - 'Spring Security Core':[ - 'org.springframework.security.core*', - 'org.springframework.security.authentication*', - 'org.springframework.security.access*', - 'org.springframework.security.remoting*', - 'org.springframework.security.provisioning*', - 'org.springframework.security.util*'], - 'Spring Security Web':['org.springframework.security.web*'], - 'Spring Security LDAP':['org.springframework.security.ldap*'], - 'Spring Security Crypto':['org.springframework.security.crypto*'], - 'Spring Security OpenID':['org.springframework.security.openid*'], - 'Spring Security CAS':['org.springframework.security.cas*'], - 'Spring Security ACL':['org.springframework.security.acls*'], - 'Spring Security Config':['org.springframework.security.config*'], - 'Spring Security Taglibs':['org.springframework.security.taglibs*'], - -] + ] + addStringOption('-quiet') + } +} ext.apiSpec = copySpec { into('apidocs') { diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 64086632bc..ebc01501da 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -186,6 +186,8 @@ jar { javadoc { title = "Spring Security $version API" source = sourceSets.main.allJava + logging.captureStandardError LogLevel.INFO + logging.captureStandardOutput LogLevel.INFO options { memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED author = true @@ -213,6 +215,7 @@ javadoc { 'Spring Security Config':['org.springframework.security.config*'], 'Spring Security Taglibs':['org.springframework.security.taglibs*'], ] + addStringOption('-quiet') } }