Commit Graph

7761 Commits

Author SHA1 Message Date
Andy Wilkinson d27e280759 Merge branch '1.3.x' 2016-04-05 13:38:41 +01:00
Stephane Nicoll 520448cd9c Add support for publisher confirms/returns
Closes gh-3945
2016-04-05 14:25:18 +02:00
Andy Wilkinson d138c1a61f Upgrade to Spring Security 4.0.4.RELEASE
Closes gh-5588
2016-04-05 12:52:58 +01:00
Andy Wilkinson 17aadc72ec Upgrade to Spring Security JWT 1.0.4.RELEASE
Closes gh-5587
2016-04-05 12:52:52 +01:00
Andy Wilkinson 52e876a996 Upgrade to Spring Cloud Connectors 1.2.2.RELEASE
Closes gh-5586
2016-04-05 12:52:34 +01:00
Andy Wilkinson ada3155a80 Upgrade to SLF4J 1.7.21
Closes gh-5585
2016-04-05 12:52:33 +01:00
Andy Wilkinson c77659c216 Upgrade to jOOQ 3.7.3
Closes gh-5584
2016-04-05 12:52:33 +01:00
Andy Wilkinson a0420f5f7c Upgrade to Jaybird 2.2.10
Closes gh-5583
2016-04-05 12:52:27 +01:00
Andy Wilkinson 41c1b29067 Upgrade to AspectJ 1.8.9
Closes gh-5582
2016-04-05 12:52:20 +01:00
Andy Wilkinson 1d8ff34eb0 Upgrade to Tomcat 8.0.33
Closes gh-5581
2016-04-05 12:52:20 +01:00
Andy Wilkinson f3b70e4641 Upgrade to HTTP Client 4.5.2
Closes gh-5580
2016-04-05 12:52:20 +01:00
Andy Wilkinson 36c572918e Upgrade to Undertow 1.3.20.Final
Closes gh-5579
2016-04-05 12:52:19 +01:00
Andy Wilkinson 20ba452eb2 Upgrade to HikariCP 2.4.5
Closes gh-5578
2016-04-05 12:52:19 +01:00
Andy Wilkinson 810ce0ed5a Upgrade to Jackson 2.6.6
Closes gh-5577
2016-04-05 12:52:19 +01:00
Andy Wilkinson ffe21175ca Upgrade to Logback 1.1.7
Closes gh-5568
2016-04-05 12:40:21 +01:00
Stephane Nicoll 9bfdad7587 Merge pull request #5444 from jxblum/polish-data-gemfire-starter-and-sample
* pr/5444:
  Polish contribution
  Polish Pivotal GemFire starter and sample
2016-04-05 13:35:02 +02:00
Stephane Nicoll d4a1365a2a Polish contribution
Closes gh-5444
2016-04-05 13:34:44 +02:00
John Blum 67f92bff1e Polish Pivotal GemFire starter and sample
Closes gh-5439
2016-04-05 12:52:10 +02:00
Stephane Nicoll 63a3d003dd Merge pull request #5511 from htynkn/upgrade-elastic
* pr/5511:
  Polish contribution
  Upgrade elasticsearch to 2.2.0
  Polish contribution
  Deprecate Undertow container's constructors that have a port parameter
  Remove unused unsatisfiedDependency.getInjectionPoint() call
  Polish contribution
  Allow Tomcat's minimum threads to be configured via the environment
2016-04-05 12:38:16 +02:00
Stephane Nicoll 05ef0818f8 Polish contribution
Closes gh-5511
2016-04-05 12:38:04 +02:00
Huang YunKun 6a2ff3f02a Upgrade elasticsearch to 2.2.0
Closes gh-5443
2016-04-05 12:38:04 +02:00
Andy Wilkinson c98b8098b4 Merge pull request #5546 from Christoph Dreis
* gh-5546:
  Polish contribution
  Deprecate Undertow container's constructors that have a port parameter
2016-04-05 11:27:09 +01:00
Andy Wilkinson 42a2d2da37 Polish contribution 2016-04-05 11:26:29 +01:00
dreis 0db118c189 Deprecate Undertow container's constructors that have a port parameter
Closes gh-5546
2016-04-05 11:24:30 +01:00
Andy Wilkinson df4a569ec5 Merge pull request #5575 from Johnny Lim
* gh-5575:
  Remove unused unsatisfiedDependency.getInjectionPoint() call
2016-04-05 11:07:42 +01:00
Johnny Lim ab15d73bc8 Remove unused unsatisfiedDependency.getInjectionPoint() call
Closes gh-5575
2016-04-05 11:07:23 +01:00
Andy Wilkinson 232a808049 Merge pull request #5572 from Quinten De Swaef
* gh-5572:
  Polish contribution
  Allow Tomcat's minimum threads to be configured via the environment
2016-04-05 11:03:18 +01:00
Andy Wilkinson 487f7310fd Polish contribution 2016-04-05 11:03:03 +01:00
Quinten De Swaef 34eb3695e4 Allow Tomcat's minimum threads to be configured via the environment
Closes gh-5572
2016-04-05 10:56:11 +01:00
Andy Wilkinson ca716561dc Update deployment test exclusions after web starter validation changes
The changes made in a6c1668b mean that the web starter no longer
depends on spring-boot-starter-validation. Instead, it depends
directly on hibernate-validator. This means that the exclusion of the
validation starter in the TomEE deployment test app no longer matches
anything and hibernate-validator is packaged in the war. This breaks
the application as TomEE ships with Bean Validation 2.0 and the
version of Hibernate Validator being used requires 2.1.

This commit updates the exclusions in the TomEE deployment app so that
hibernate-validator is excluded once again. This allows the app to
use TomEE's bundled Bean Validation implementation.

The stale spring-boot-starter-validation exclusion has been removed
from the Wildfly deployment test app. It is redundant as Wildfly ships
with Bean Validation 2.1. This brings this test app into line with
the Glassfish test app.

Closes gh-5454
2016-04-05 09:20:20 +01:00
Stephane Nicoll 539d57551c Merge pull request #5570 from stepio/master
* pr/5570:
  Manage jackson-module-jaxb-annotations dependency
2016-04-05 07:53:37 +02:00
Igor Stepanov 01f3e7059b Manage jackson-module-jaxb-annotations dependency
Closes gh-5570
2016-04-05 07:52:24 +02:00
Phillip Webb 5479c4cd6e Merge pull request #5565 from izeye/patch-3
* patch-3:
  Remove System.out.println()
2016-04-04 22:37:49 -07:00
Johnny Lim 8864f85b82 Remove System.out.println() 2016-04-04 22:37:37 -07:00
Phillip Webb b398b3319c Rename @SpringApplicationTest -> @SpringBootTest
Rename @SpringApplicationTest to SpringBootTest and
@SpringApplicationContextLoader to @SpringBootContextLoader.

Fixes gh-5562
2016-04-04 22:36:58 -07:00
Phillip Webb b0b190b362 Delete @SpringApplicationConfiguration
Remove the @SpringApplicationConfiguration annotation since it offers
little value over @SpringApplicationTest.

See gh-5562
2016-04-04 22:36:58 -07:00
Phillip Webb 4d404b214c Migrate away from @SpringApplicationConfiguration
Refactor internal tests to no longer use @SpringApplicationConfiguration

See gh-5562
2016-04-04 22:36:57 -07:00
Phillip Webb adb42ed966 Polish 2016-04-04 22:36:57 -07:00
Andy Wilkinson 15cbef3df0 Update JpaBaseConfiguration to use constructor injection
This change was missed as part of the work done in 19d8c5e6.

See gh-5306
Closes gh-5543
2016-04-04 18:55:31 +01:00
Andy Wilkinson e41ccfae3c Correct javadoc tag 2016-04-04 17:47:05 +01: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 f99bfccd51 Polishing 2016-04-04 13:43:27 +01:00
Andy Wilkinson b630b080ce Make it easier to customize the auto-configured MockMvcBuilder
Closes gh-5556
2016-04-04 13:40:22 +01:00
Andy Wilkinson 611d441763 Polishing 2016-04-04 13:25:02 +01:00
Dave Syer 416ce1a6f4 Make FixedAuthoritiesExtractor more liberal in what it accepts
In particular it now accepts a list of maps containing
"authority" keys (which is what you get from a standard JSON
decoding of a Spring Security Authentication).

Fixes gh-5482
2016-04-04 12:20:39 +01:00
Dave Syer a6c1668bd9 Switch validator starter for hibernate validator
In the web starter we shouldn't depend explicitly on any EL
implementation, otherwise when people build wars and deploy
them in containers that have their own EL there is a conflict.
We can still depend on hibernate-validator to support
JSR-303 in web apps because the EL implementation comes with
the container.

Fixes gh-5454
2016-04-04 11:53:40 +01:00
Dave Syer 72db5becd6 Add comment to pom in sample explaining provided deps 2016-04-04 11:08:08 +01:00
Stephane Nicoll be987065b1 Merge pull request #5557 from brendankirby/readme-patch
* pr/5557:
  Update README.adoc
2016-04-03 10:42:05 +02:00
Brendan Kirby 6de4cabc29 Update README.adoc
Closes gh-5557
2016-04-03 10:41:45 +02:00
Stephane Nicoll 0a8975bc84 Polish 2016-04-02 08:05:02 +02:00