Commit Graph

174 Commits

Author SHA1 Message Date
Stephane Nicoll 6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +02:00
Andy Wilkinson 5806a18eee Upgrade to dependency management plugin 0.6.1.RELEASE
Closes gh-6810
2016-09-19 19:37:43 +01:00
Phillip Webb 56544c8dd5 Polish 2016-09-09 10:27:44 -07:00
Johnny Lim 37c8c3669b Polish
Closes gh-6671
2016-08-17 10:49:04 +02:00
Spring Buildmaster 334baaeffd Next development version 2016-07-28 19:54:01 +00:00
Johnny Lim 65128c0ad1 Remove severity elements from checkstyle.xml
Remove `error` severity elements from `checkstyle.xml` and rely on the
default setting instead.

Closes gh-6442
2016-07-25 10:30:58 -07:00
Andy Wilkinson f84f31b47d Add setReadTimeout and setConnectTimeout to RestTemplateBuilder
Closes gh-6346
2016-07-13 16:40:32 +01:00
Andy Wilkinson d124d68213 Upgrade to Dependency Management Plugin 0.6.0.RELEASE
Closes gh-6257
2016-06-30 18:10:17 +01:00
Stephane Nicoll f9288a3af1 Revert "Polish maven repositories definition"
This commit reverts 62fa602fea

See gh-6031
2016-06-10 17:25:31 +02:00
Stephane Nicoll 62fa602fea Polish maven repositories definition
Previously, Maven repositories definition was specified in a profile that
is active by default. It means that as soon as any profile is enabled by
the user, said profile is no longer enabled. This has the nasty
consequences of having copy/paste in several places to make sure our own
profiles still have the proper repositories definition.

This commit creates a single "repositories" profile that is always active
unless a given property is explicitely specified. This allows to remove
the duplication and make things more consistent.

Some Gradle-specific repositories were also hard-coded in two modules
without any profile at all, meaning they were polluting the build of
anybody using it. While the impacted modules are gradle specific, that
repository has been shared in the new "repositories" profile as well.

Closes gh-6031
2016-06-10 11:55:46 +02:00
Phillip Webb 57bed2e5f6 Use fully qualified checkstyle class names
Update `checkstyle.xml` to use fully qualified class names. This reduces
the number of warning log messages when running `mvn -X` and should also
be slightly faster.
2016-06-09 21:03:28 -07:00
Andy Wilkinson ce68fdf515 Merge branch '1.3.x' 2016-06-01 18:14:00 +01:00
Andy Wilkinson 1037239efc Upgrade to Dependency Management Plugin 0.5.7.RELEASE
Closes gh-6105
2016-06-01 18:13:25 +01:00
Phillip Webb e664d585d9 Allow MockRest static imports
Update checkstyle rules to allow static imports from
MockRestRequestMatchers and MockRestResponseCreators.
2016-05-31 09:48:44 -07:00
Andy Wilkinson de0bcaa50e Update WebMvcTest to auto-configure supported template engines
Closes gh-5801
2016-05-10 10:41:38 +01:00
Spring Buildmaster 819a9574a6 Next Development Version 2016-05-10 05:28:34 +00:00
Spring Buildmaster 376bbe68d8 Next Development Version 2016-05-06 11:23:57 +00:00
Ruben Dijkstra 9a1db18172 Upgrade animal sniffer Java signature
Closes gh-5684
2016-04-15 08:36:15 +02:00
Andy Wilkinson eb3180d581 Provide test auto-configuration for Spring REST Docs
This commit introduces a new annotation, @AutoConfigureRestDocs,
which can be used to enable auto-configuration of Spring REST Docs.
The auto-configuration removes the need to use Spring REST Docs' JUnit
rule and will automatically configure MockMvc. Combined with the new
auto-configuration for MockMvc it allows a test class to be free of
boilerplate configuration:

@RunWith(SpringRunner.class)
@WebMvcTest
@AutoConfigureRestDocs(outputDir = "target/generated-snippets",
        uriScheme = "https", uriHost = "api.example.com",
        uriPort = 443)
public class ExampleDocumentationTests {

    @Autowired
    private MockMvc mvc;

    @Test
    public void documentIndex() {
        // …
    }

}

For more advanced customization a RestDocsMockMvcConfigurationCustomizer
bean can be used.

If a RestDocumentationResultHandler is found in the context, it will
be passed to the ConfigurableMockMvcBuilder's alwaysDo method as part
of its customization.

Closes gh-5563
2016-04-04 17:19:51 +01:00
Andy Wilkinson 33f0ea3480 Rework SpringApplicationTest to support web modes
Rework the new testing support so that @SpringApplicationTest can be
used for standard integration tests, web integration tests with a
mock Servlet environment and web integration tests with an embedded
servlet container. This means that it a replacement for 1.3's
@IntegrationTest and @WebIntegrationTest and allows all
SpringApplication testing to be configured using a common annotation.

The old @IntegrationTest and @WebIntegrationTest along with their
supporting classes have been reinstated to their previous form (while
remaining deprecated). This should ensure that they continue to work
in 1.4 exactly as they did in 1.3 giving users a smooth path to
@SpringApplicationTest.

See gh-5477
2016-03-31 21:35:10 -07:00
Phillip Webb 893a6c32f3 Upgrade to checkstyle 6.17
Fixes gh-5547
2016-03-31 13:14:53 -07:00
Andy Wilkinson 779649bfdb Merge branch '1.3.x' 2016-02-29 14:53:52 +00:00
Andy Wilkinson bb473c32e2 Enable Animal Sniffer checking of spring-boot-loader-tools
Previously, Animal Sniffer checking of spring-boot-loader-tools
was disabled as it failed with an NPE. This has been fixed in
Animal Sniffer 1.15.

This commit upgrades Animal Sniffer to 1.15 and adds the necessary
annotations to suppress failures for safe usage of sun.* and Java 7
APIs.

Note that UsesUnsafeJava has been copied from spring-boot and made
package-private. This retains the clearer intent of the custom
annotation (versus @IgnoreJRERequirement) while avoiding the change
in the build order that would be necessary for
spring-boot-loader-tools to use the annotation from spring-boot.

Closes gh-5284
2016-02-29 14:44:27 +00:00
Spring Buildmaster 225d877ab9 Next Development Version 2016-02-26 01:06:16 -08:00
Andy Wilkinson 2429e1a7e8 Merge branch '1.3.x' 2016-02-24 14:18:56 +00:00
Andy Wilkinson 718f509271 Upgrade to Dependency Management Plugin 0.5.6.RELEASE
Closes gh-5211
2016-02-24 14:18:32 +00:00
Phillip Webb cc5d4b8b7f Add AssertJ checkstyle rule
Closes gh-5083
2016-02-06 15:51:27 -08:00
Phillip Webb 8b4d801dd6 Add support for AssertJ
Add AssertJ as a managed dependency and also include it in
spring-boot-starter-test. Also provide a simple adapter class to allow
Hamcrest matchers to be used as AssertJ Conditions.

Fixes gh-5048
2016-02-06 15:06:23 -08:00
Stephane Nicoll fb0664902f Add dependency management for lombok
Closes gh-4598
2016-01-26 10:32:58 +01:00
Stephane Nicoll bead239448 Remove support for Log4j
Apache Log4j 1.x is EOL and has now been replaced by log4j 2. This commit
removes the deprecated support for Log4j 1.x

See gh-4905
2016-01-25 14:06:06 +01:00
Phillip Webb fbaf209240 Move master to 1.4.0.BUILD-SNAPSHOT 2016-01-24 10:45:24 -08:00
Spring Buildmaster 504d3e97ba Next development version 2016-01-21 18:41:30 -08:00
Andy Wilkinson d1b47c8a8f Add integration tests for default launch script
This commit adds a suit of integration tests for the launch script. See
the accompanying README.adoc for further details.

Closes gh-4872
2016-01-13 13:28:14 +00:00
Andy Wilkinson 2aff82bb64 Merge branch '1.2.x' 2016-01-12 10:19:36 +00:00
Spring Buildmaster 8db59059a5 Next Development Version 2015-12-18 05:43:02 -08:00
Stephane Nicoll bb736e255b Fix SNAPSHOT version 2015-12-17 14:15:14 +01:00
Matt Benson ea7a758901 Upgrade to maven-invoker-plugin 1.10
Closes gh-4760
2015-12-15 15:05:08 +00:00
Andy Wilkinson 17c4fa9d81 Upgrade to Gradle Dependency Management Plugin 0.5.4.RELEASE
Closes gh-4538
2015-12-03 15:23:17 +00:00
Ruben Dijkstra 02830989be Configure Checkstyle line separator so it does not use system default
In its default configuration, Checkstyle would fail on Windows as it
would expect CRLF, the system default line separator.

Closes gh-4666
2015-12-03 09:41:36 +00:00
Spring Buildmaster 3f6f57a80e Next Development Version 2015-11-16 03:18:54 -08:00
Phillip Webb edd3f1eade Revert spring-security-oauth upgrade
It doesn't appear to be in Maven Central and it's breaking the eclipse
setup.
2015-10-24 20:11:17 -07:00
Dave Syer 02523799aa Add release repo to default profile 2015-10-23 10:54:27 +01:00
Phillip Webb cf68f83ef6 Update checkstyle import order rules
See gh-4234
2015-10-19 13:03:02 -07:00
Spring Buildmaster 2b38a861e3 Next Development Version 2015-10-16 05:57:24 -07:00
Phillip Webb 822820f256 Revert "Relax `ParenPad` checkstyle rule"
The updated formatter means that we can reinstate the rule.

This reverts commit 82fffe3062.
2015-10-09 13:54:33 -07:00
Phillip Webb 2a16c25977 Replace import-control checkstyle file with regex
Fix Eclipse build warnings by replacing checkstyle's import-control file
with a simple regex rule.

Fixes gh-4006
2015-10-07 23:40:14 -07:00
Phillip Webb 82fffe3062 Relax `ParenPad` checkstyle rule
Eclipse Mars has a formatter bug (#479291) that sometimes adds
additional whitespace on annotations. Until it's fixed we need to relax
the `ParenPad` checkstyle rule.
2015-10-07 23:37:47 -07:00
Phillip Webb 47576354f7 Merge branch '1.2.x' 2015-10-07 23:19:50 -07:00
Phillip Webb cb6e30c8f5 Ignore helpmojo from Eclipse m2e config
Ignore the `helpmojo` goal to save needing an additional Eclipse plugin.
2015-10-07 19:45:20 -07:00
Andy Wilkinson a5ca1eb019 Move dependency management for Spring REST Docs into dependencies pom 2015-10-06 16:58:35 +01:00