Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cleanup-3.2.x' into 3.2.x

Browse Source 
* cleanup-3.2.x:
  Gradle 'api' task depends on 'jar' tasks
  Mark all IsFastEnough tests as performance tests
This commit is contained in:
Phillip Webb
2013-01-07 14:10:23 -08:00
parent 153508a300 f92f58d0b3
commit 15c0971381
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@@ -788,6 +788,11 @@ configure(rootProject) {
description = "Generates aggregated Javadoc API documentation." description = "Generates aggregated Javadoc API documentation."
title = "${rootProject.description} ${version} API" title = "${rootProject.description} ${version} API"
dependsOn {
subprojects.collect {
it.tasks.getByName("jar")
}
}
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

3
spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 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.
@@ -388,6 +388,7 @@ public class ServletRequestUtilsTests {
@Test @Test
public void testGetIntParameterWithDefaultValueHandlingIsFastEnough() { public void testGetIntParameterWithDefaultValueHandlingIsFastEnough() {
Assume.group(TestGroup.PERFORMANCE);
MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletRequest request = new MockHttpServletRequest();
StopWatch sw = new StopWatch(); StopWatch sw = new StopWatch();
sw.start(); sw.start();