Commit Graph

1492 Commits

Author SHA1 Message Date
Andy Wilkinson
52536dc291 Update Actuator UI sample test to adapt to sensitivity removal
See gh-9924
2017-08-01 11:12:33 +01:00
Andy Wilkinson
bb55f49396 Remove concept of sensitivity from Actuator's endpoints
Closes gh-9924
2017-08-01 10:05:09 +01:00
Andy Wilkinson
847f6d1b2c Update test in Actuator sample to adapt to changes in env response
See gh-9864
2017-08-01 09:03:23 +01:00
Andy Wilkinson
4f76a560b8 Fix the Actuator sample 2017-07-31 08:47:16 +01:00
Andy Wilkinson
9f75da9a8f Simplify the Actuator's hypermedia support
This commit replaces the Acuator's support for hypermedia with a
single endpoint that returns HAL-formatted links to all of the
available endpoints. This is done without requiring Spring HATEOAS
to be on the classpath in a similar manner to the existing
CloudFoundry discovery endpoint.

Closes gh-9901
2017-07-30 22:43:05 +01:00
Andy Wilkinson
fb3d79c750 Drop support for self-hosted Actuator docs
Closes gh-9899
2017-07-29 09:19:53 +01:00
Andy Wilkinson
6f864c6210 Fix up version numbers following release 2017-07-27 09:52:16 +01:00
Spring Buildmaster
17a5bb0be4 Next development version 2017-07-27 08:00:21 +00:00
Stephane Nicoll
75fc0c38c8 Merge branch '1.5.x' 2017-07-26 13:39:25 +02:00
Johnny Lim
fe1eb8b5f3 Polish
See gh-9855
2017-07-26 13:39:00 +02:00
Andy Wilkinson
39b4270b7e Fix up version numbers following release 2017-07-26 10:40:35 +01:00
Spring Buildmaster
41c5c0e7c9 Next development version 2017-07-26 08:30:55 +00:00
Stephane Nicoll
dbce7d8935 Polish "Add JUnit Jupiter sample application"
Closes gh-8048
2017-07-25 09:51:47 +02:00
Eddú Meléndez
f1664db85e Add JUnit Jupiter sample application
See gh-8048
2017-07-25 09:51:47 +02:00
Phillip Webb
9db72450da Merge branch '1.5.x' 2017-07-19 10:23:23 -07:00
Phillip Webb
68910f2b8f Polish 2017-07-19 10:21:06 -07:00
Stephane Nicoll
e8566c8764 Merge branch '1.5.x' 2017-07-19 15:24:25 +02:00
Raja Kolli
931eca188e Fix JOOQ sample's compiler configuration
Closes gh-9672
2017-07-19 14:44:07 +02:00
Phillip Webb
a57e6495dd Migrate from FileSystemUtils.deleteRecursively
Update test to migrate away from the now deprecated FileSystemUtils.
2017-07-18 20:22:24 -07:00
Madhura Bhave
ecaa6340e2 Update path in actuator sample tests 2017-07-17 19:22:33 -07:00
Madhura Bhave
b58923a42d Merge branch '1.5.x' 2017-07-17 11:27:08 -07:00
Madhura Bhave
0f8a819af9 Enable cors in default management security config
Fixes gh-9548
2017-07-17 10:49:48 -07:00
Johnny Lim
360e3a492c Polish
closes gh-9729
2017-07-12 13:25:19 +02:00
Phillip Webb
8e3baf3130 Polish 2017-07-11 13:57:21 -07:00
Stephane Nicoll
fa71051ec6 Polish "Upgrade to Infinispan 9.0.3.Final"
Closes gh-9688
2017-07-08 15:30:13 +02:00
Andy Wilkinson
f26f8176b6 Start building against Spring Session 2.0 snapshots
See gh-9541
2017-06-23 10:00:05 +02:00
Eddú Meléndez
b1f96a4641 Improve sample to use fragment expression by thymeleaf 3
Avoid repeated title text making use of capabilities in thymeleaf 3.

Closes gh-9561
2017-06-22 09:50:28 +02:00
Andy Wilkinson
991314c63d Merge branch '1.5.x' 2017-06-16 09:13:42 +01:00
Andy Wilkinson
59122358d3 Clean up and format code 2017-06-16 08:58:14 +01:00
Andy Wilkinson
4a030d5a7a Drop support for auto-configuring an embedded Elasticsearch node
Elastic have announced [1] that embedded Elasticsearch is no longer
supported. This commit brings us into line with that announcement by
removing the auto-configuration that would create an Elasticsearch
Node and NodeClient.

To use the Elasticsearch auto-configuration, a user must now provide
the address of one or more cluster nodes
(via the spring.elastisearch.cluster-nodes property) which will then
be used to create a TransportClient.

See gh-9374

[1] https://www.elastic.co/blog/elasticsearch-the-server
2017-06-15 19:52:24 +01:00
Andy Wilkinson
f7e9ec5f42 Minimise our usage of SocketUtils.findAvailableTcpPort
Closes gh-9382
2017-06-09 14:45:09 +01:00
Stephane Nicoll
aa083996f9 Fixup version numbers following release 2017-06-08 17:38:11 +03:00
Spring Buildmaster
05d4d0281c Next Development Version 2017-06-08 12:47:16 +00:00
Stephane Nicoll
6b1d06cf09 Fixup version numbers following release 2017-06-08 13:46:33 +03:00
Spring Buildmaster
88e43c8421 Next Development Version 2017-06-08 09:52:43 +00:00
Andy Wilkinson
f4c9ab78b2 Fix WebFlux sample's reactor-test dependency
See gh-9427
2017-06-07 16:53:16 +01:00
Stephane Nicoll
040c12bc85 Merge branch '1.5.x' 2017-06-07 18:42:40 +03:00
Stephane Nicoll
fc38c1ba4d Improve cache sample
Clarify the cache sample and in particular that Infinispan does not
bootstrap with a default configuration file. Hence the custom
`infinispan.xml` configuration is enabled by default if Infinispan is
available on the classpath.

See gh-9417
2017-06-07 18:41:38 +03:00
Stephane Nicoll
7f420d1268 Polish contribution
Closes gh-9411
2017-06-06 10:52:31 +02:00
Vedran Pavic
db060c847d Ensure QuartzDatabaseInitializer is initialized before Scheduler
If the auto-configured `Scheduler` instance backed by JDBC job store is
used as a dependency in an application component, the initialization of
`Scheduler` will be triggered before `QuartzDatabaseInitializer`. This
will result in failure due to schema not being prepared in time for
`Scheduler` to populate job details.

This commit ensures `QuartzDatabaseInitializer` is initialized before the
auto-configured `Scheduler` by introducing a dependency between the two.

See gh-9411
2017-06-06 10:14:49 +02:00
Phillip Webb
2c7dd9f519 Polish 2017-06-02 16:00:39 -07:00
Stephane Nicoll
90498a0b2f Fix broken build 2017-06-02 17:58:14 +02:00
Stephane Nicoll
59a15b259c Polish "Add Quartz Scheduler support"
Closes gh-4299
2017-05-30 18:48:12 +02:00
Vedran Pavic
9e23206c31 Add Quartz Scheduler support
See gh-4299
2017-05-30 18:48:12 +02:00
Madhura Bhave
d745b69630 Replace usages of EnvironmentTestUtils 2017-05-24 14:59:04 -07:00
Brian Clozel
fed8c8a681 Adapt WebFlux.fn auto-config to SPR-15536
Since SPR-15536, WebFlux.fn is now configured with `@EnableWebFlux`,
along the annotated controllers. Both `RouterFunction` and Controller
instances can now live within the same application and they share
the same web infrastructure.

This commit removes the custom auto-configuration for `RouterFunction`
and relies on `@EnableWebFlux` for that.

Closes gh-9165
2017-05-24 14:54:05 +02:00
Mark Paluch
7e8e2c486e Adapt to relocated packages in Spring Data Cassandra
See gh-9291
2017-05-24 11:11:36 +01:00
Andy Wilkinson
d5438c299c Polish "Use try-with-resources to close resources automatically"
- Apply code formatting
- Use try-with-resources in many other places that were missed in the
  pull request

Closes gh-8045
2017-05-23 19:38:48 +01:00
Stephane Nicoll
d0670d5b95 Fix reference to actuator endpoints
Closes gh-9247
2017-05-17 10:15:09 +02:00
Phillip Webb
889d43ddc4 Refine SpringApplication source types
Update `SpringApplication` so that the `run` methods and constructors
now require `Class<?>` arguments, rather than `Objects`. String based
sources can still be loaded, but must now be set on the `getSources()`
collections. `Package` and `Resource` types are no longer directly
supported.

This change should help IDEs offer better content assist, and will
help integrations with alternative languages such as Ceylon.

Users currently passing in Class references or using the
`spring.main.sources` property should not be affected by this change. If
an XML resource is being used, some refactoring may be required (see the
changes to `SampleSpringXmlApplication` in this commit).

Fixes gh-9170
2017-05-15 20:35:29 -07:00
Phillip Webb
302f038e84 Polish 2017-05-15 20:35:29 -07:00
Stephane Nicoll
2e94fd4434 Remove support for Spring Loaded
Closes gh-7978
2017-05-15 14:18:06 +03:00
Madhura Bhave
dc7b3f6d6e Update samples to use new generator mappings
Closes gh-7612
2017-05-12 11:35:42 -07:00
Andy Wilkinson
a3f3740725 Remove Tomcat 8.0-based SSL sample
We now require Tomcat 8.5
2017-05-12 17:55:19 +01:00
Andy Wilkinson
771343e31b Update OAuth2 sample following breaking API change in Spring Security
See gh-8714 and 9480e09c21
2017-05-10 09:25:44 +01:00
Andy Wilkinson
822b473cbe Update samples following API changes in Spring Data snapshots
findOne is now findById
2017-05-04 10:27:51 +01:00
Brian Clozel
f2c63706da Change default file extension for Mustache templates
This commit changes the default file extension for Mustache templates,
from `.html` to `.mustache`, which is the file extension used in the
official reference documentation and by most IDE plugins.

Fixes gh-8997
2017-04-28 14:12:26 +02:00
Brian Clozel
4d5dcca553 Add Thymeleaf auto-configuration for WebFlux
Thymeleaf 3.0 implements the Spring 5.0 view infrastructure for WebMVC
and the new WebFlux framework. This commit adds auto-configuration for
the WebFlux support.

In that process, the configuration property for `spring.thymeleaf` has
been changed to add `spring.thymeleaf.servlet` and
`spring.thymeleaf.reactive` for MVC/WebFlux specific properties.

Now that the `spring-boot-starter-thymeleaf` does not only support
Spring MVC, the transitive dependency on `spring-boot-starter-web` is
removed from it.

Fixes gh-8124
2017-04-28 14:11:45 +02:00
Madhura Bhave
829ab59757 Use new configuration properties in samples
Update `spring-boot-samples` to use the new configuration properties
support.

See gh-9000
2017-04-27 13:59:25 -07:00
Phillip Webb
45dd9f7144 Polish 2017-04-27 12:04:02 -07:00
Madhura Bhave
bc1ee76b55 Change default for new_generator_mappings to true
Closes gh-7612
2017-04-25 12:09:36 -07:00
Phillip Webb
06558675bb Polish 2017-04-25 09:45:14 -07:00
Brian Clozel
7e77e648bf Add Mustache support for Spring WebFlux apps
This commit moves the existing Spring MVC Mustache support to its own
`servlet` package and adds a new one under `reactive` for the WebFlux
web applications.

New `MustacheView` and `MustacheViewResolver` types resolve and render
Mustache views for WebFlux applications.

Since this templating engine is now supported by two flavors of Spring
web apps, the `spring-boot-starter-mustache` does not depend anymore on
the `spring-boot-starter-web` one: it's up to the developer to add the
relevant starter `web` or `webflux` to their application.

Fixes gh-8648
2017-04-25 11:27:18 +02:00
Madhura Bhave
c2e5fd031a Replace usage of WebMvcConfigurerAdapter
Closes gh-8964
2017-04-24 15:31:39 -07:00
Stephane Nicoll
9327b58304 Fixup version numbers following release 2017-04-21 11:26:45 +02:00
Spring Buildmaster
9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Stephane Nicoll
7fbce192b4 Fixup version numbers following release 2017-04-20 15:58:32 +02:00
Spring Buildmaster
d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Phillip Webb
700f0ea93c Fix WebClientTest calls
Update calls to WebClientTest following upstream changes.
2017-04-14 16:26:01 -07:00
Madhura Bhave
bcd79dd992 Move all actuators under /application
Context path can be configured via `management.context-path`.

Closes gh-6886
2017-04-14 15:15:44 -07:00
Stephane Nicoll
42c1eb894e Merge branch '1.5.x' 2017-04-14 13:58:03 +02:00
Stephane Nicoll
8c21e16cf1 Add reference to Infinispan starter
Closes gh-8592
2017-04-14 13:57:47 +02:00
Phillip Webb
c4cba6b0ea Merge branch '1.5.x' 2017-04-11 21:07:51 -07:00
Phillip Webb
d301d0f4c3 Merge branch '1.4.x' into 1.5.x 2017-04-11 20:42:48 -07:00
Phillip Webb
758ddcd420 Polish 2017-04-11 20:17:23 -07:00
Madhura Bhave
971057705d Merge branch '1.5.x' 2017-04-11 15:57:10 -07:00
Madhura Bhave
535451f9e5 Merge branch '1.4.x' into 1.5.x 2017-04-11 15:54:01 -07:00
Madhura Bhave
b2f0ebfcb8 Prevent empty json for parameters in trace endpoint
Fixes gh-8883
2017-04-11 15:30:39 -07:00
Stephane Nicoll
2d169d526a Merge branch '1.5.x' 2017-04-07 10:05:40 +02:00
Stephane Nicoll
fffb53ccf5 Fix neo4j embedded documentation
The neo4j embedded driver no longer embeds the neo4j kernel and users are
expected to add that dependency manually. We don't provide dependency
management for any of them so this commit updates the documentation to
refers to the official documentation.

Closes gh-8567
2017-04-07 10:04:41 +02:00
Vedran Pavic
2667b7f51c Upgrade to Hazelcast 3.8
Closes gh-8808
2017-04-05 14:21:00 +02:00
Phillip Webb
2de7e9c310 Merge branch '1.5.x' 2017-04-04 10:07:38 -07:00
Phillip Webb
3b93bb46e0 Revert accidental call to .close()
Remove call to `.close()` which was accidentally left in after some
performance testing.
2017-04-04 09:56:03 -07:00
Phillip Webb
ad38776de3 Polish 2017-04-04 09:48:10 -07:00
Andy Wilkinson
5cb1f3209e Reinstate Verify.java that was removed in 47c0c3c0 2017-04-04 17:38:51 +01:00
Andy Wilkinson
47c0c3c0ef Update samples with Gradle configuration to align with new plugin 2017-04-04 15:33:27 +01:00
Stephane Nicoll
db33a75484 Enable transaction management consistently
Previously to this commit, transaction management was only enabled when
a `DataSource` is configured. The processing of `@Transactional`
annotations are now enabled as long as a `PlatformTransactionManager` is
present.

Also, the `spring.aop.proxy-target-class` is now honoured if set, still
defaulting to CGLIB mode.

Closes gh-8434
2017-04-03 09:24:15 +03:00
Andy Wilkinson
a9a31107cf Align with API changes in latest Spring Data Kay snapshots
See gh-7461
2017-03-24 11:26:27 +00:00
Andy Wilkinson
25bf4a14cd Start building against Neo4j OGM 3.0.0 snapshots
This commit our Neo4j OGM dependency with the Spring Data Neo4j
snapshots that are currently included in snapshots of Spring Data Kay.

It switches to using Neo4j's Bolt driver by default, aligning it with
the default of the latest Spring Data Neo4j 5 snapshots.

It also contains a workaround for a Neo4j OGM issue [1] and a change
to Neo4jDataAutoConfigurationTests that prevents the entire classpath
from being scanned.

See gh-8687

[1] https://github.com/neo4j/neo4j-ogm/issues/340
2017-03-22 15:24:49 +00:00
Stephane Nicoll
0c4c2f4bf4 Harmonize webflux sample test 2017-03-16 11:36:41 +01:00
Phillip Webb
b76ca0bf8f Restructure web auto-configuration
Restructure `org.springframework.boot.autoconfigure.web` to better align
with the new package structure in `spring-boot`.

Auto-configuration is now split into client, servlet and reactive
sub-packages. In addition a new `http` package now handles common
HTTP concerns.

Fixes gh-8616
2017-03-14 22:06:28 -07:00
Phillip Webb
33e54ed723 Relocate org.springframework.boot.web.support
Move `org.springframework.boot.web.support` under the `servlet` package.

Fixes gh-8557
2017-03-14 22:03:03 -07:00
Phillip Webb
67556ba8ea Restructure embedded web server packages
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:

Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server

Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter

Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server

Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded

In addition:

- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
  to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
  `ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
  `ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.

Fixes gh-8532
2017-03-12 21:08:25 -07:00
Phillip Webb
d8f827d224 Cleanup and format code 2017-03-06 17:08:09 -08:00
Phillip Webb
425dbc3e52 Update copyright header for edited files 2017-03-06 15:04:07 -08:00
Phillip Webb
2a592103f0 Polish formatting 2017-03-06 15:03:43 -08:00
Stephane Nicoll
3cdc81c351 Fixup version numbers following release 2017-03-03 17:34:05 +01:00
Spring Buildmaster
d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Stephane Nicoll
dac3810bc1 Fixup version numbers following release 2017-03-03 16:14:56 +01:00
Spring Buildmaster
2a83e80a9b Next Development Version 2017-03-03 14:39:21 +00:00
Vedran Pavic
1c789f1a8d Remove dependency management for hibernate-entitymanager
Closes gh-8433
2017-03-02 18:31:53 +01:00
Stephane Nicoll
cb40ea485b Merge branch '1.5.x' 2017-03-02 14:31:49 +01:00
Stephane Nicoll
5cc569fc91 Improve execution speed of CacheAutoConfigurationTests
As of Hazelcast 3.7, the bootstrap is pretty slow by default due to the
networking discovery. This commit disables both TCP/IP and multicast
discoveries.
2017-03-02 14:28:33 +01:00
Phillip Webb
a4bcd20b64 Merge branch '1.5.x' 2017-02-27 20:43:18 -08:00
Phillip Webb
ca1540cefe Update header copyright for changed files 2017-02-27 20:41:18 -08:00
Phillip Webb
5867cd6175 Polish 2017-02-27 20:41:18 -08:00
Phillip Webb
47fd5f4fac Merge branch '1.4.x' into 1.5.x 2017-02-27 14:00:46 -08:00
Phillip Webb
47b00c086c Polish 2017-02-27 13:56:17 -08:00
Stephane Nicoll
12397edbd4 Expose a WebTestClient with @SpringBootTest
This commit exposes a `WebTestClient` automatically in a reactive
integration test that uses an embedded web server. This is similar to
what we do with `TestRestTemplate` for servlet based integration tests.

Closes gh-8399
2017-02-24 13:50:58 +01:00
Brian Clozel
c1e93d8991 Add WebFlux application sample
This commit adds a sample application for the
annotation variant of Spring WebFlux.
2017-02-24 13:03:12 +01:00
Andy Wilkinson
ad30ad808b Merge branch '1.5.x' 2017-02-20 08:59:51 +00:00
Andy Wilkinson
4f29bc9c14 Make mvn verify work without install of spring-boot-dependencies
Previously, the custom layout sample could only be built successfully
if spring-boot-dependencies had be installed locally, making its
effective pom available in the local Maven cache.

This commit updates the sample's tests to look at its own pom to
determine the version of Spring Boot that should be used in the
Gradle tests.

Closes gh-8330
2017-02-20 08:59:13 +00:00
Stephane Nicoll
093140ae44 Merge branch '1.5.x' 2017-02-13 09:54:39 +01:00
Stephane Nicoll
842170768d Polish cache sample readme
Closes gh-8272
2017-02-13 09:53:37 +01:00
Andy Wilkinson
df08863641 Make ServletRegistrationBean and FilterRegistration bean generic
Closes gh-7666
2017-02-09 13:36:35 +00:00
Andy Wilkinson
fbf493b1e8 Merge branch '1.5.x' 2017-02-08 20:51:37 +00:00
Andy Wilkinson
ab192d01cc Merge branch '1.4.x' into 1.5.x 2017-02-08 20:51:30 +00:00
Andy Wilkinson
7e030d2068 Polish 2017-02-08 20:51:23 +00:00
Andy Wilkinson
1efa700713 Merge branch '1.5.x' 2017-02-08 20:50:45 +00:00
Andy Wilkinson
25982ecf69 Merge branch '1.4.x' into 1.5.x 2017-02-08 20:50:24 +00:00
Andy Wilkinson
04c8b912ee Fall back to standard LiveBeansView behaviour when MBean is in use
Closes gh-8146
2017-02-08 20:49:16 +00:00
Brian Clozel
12d883f6b9 Introduce "server.servlet" configuration prefix
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.

Closes gh-8066
2017-02-07 16:48:22 +01:00
Stephane Nicoll
b2ec03cd4e Restore couchbase support
This commit effectively reverts the changes that were applied to
workaround the breakage in spring-data-couchbase.

Closes gh-8200
2017-02-07 12:03:27 +01:00
Brian Clozel
8619d6a229 Rename EmbeddedServletContainer -> EmbeddedWebServer
This contract is not specific to servlet containers and should be
reused by all web server implementations (including reactive variants).

Fixes gh-8208
2017-02-06 17:44:26 +01:00
Stephane Nicoll
6af6e8e31b Remove auto-configuration for ServerProperties
This commit removes `ServerProperties` and `ManagementServerProperties`
auto-configurations. Those properties objects are now created using
`@EnableConfigurationProperties` only.

Closes gh-8108
2017-02-06 14:00:50 +01:00
Stephane Nicoll
e0c8e1f514 Ignore test until couchbase support is restored
The changes required to restore our Couchbase support are too involved
and we should hear from the data couchbase team first.

See gh-8200
2017-02-06 13:27:22 +01:00
Stephane Nicoll
cfdc75d384 Merge branch '1.5.x' 2017-02-06 10:38:16 +01:00
Stephane Nicoll
4d7b03b002 Polish contribution
Closes gh-8202
2017-02-06 10:34:22 +01:00
John Blum
31ed70e1b8 Improve spring-boot-sample-cache UX by using Maven profiles
See gh-8202
2017-02-06 09:50:40 +01:00
Madhura Bhave
5dafa3ae9c Fixup version numbers following release 2017-01-30 15:27:42 -08:00
Andy Wilkinson
95f659f4f9 Add new WebApplicationType enum to pave the way for Web Flux support
Closes gh-8077
2017-01-30 20:26:24 +00:00
Spring Buildmaster
5c12500366 Next Development Version 2017-01-30 20:10:13 +00:00
Andy Wilkinson
c00638fee3 Remove Thymeleaf's layout dialect from its starter and update samples
Closes gh-7557
2017-01-30 14:20:50 +00:00
Andy Wilkinson
a9656145de Fix up version numbers following release 2017-01-30 12:27:04 +00:00
Spring Buildmaster
a2696bf873 Next Development Version 2017-01-30 11:40:24 +00:00
Andy Wilkinson
bed727ae8c Merge branch '1.5.x' 2017-01-26 15:05:02 +00:00
Andy Wilkinson
f34d309548 Formatting 2017-01-26 15:03:02 +00:00
Stephane Nicoll
bd0c1cb9c3 Fixup version numbers following release 2017-01-26 15:55:14 +01:00
Spring Buildmaster
ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +00:00
Andy Wilkinson
9bba73a1a9 Upgrade to Thymeleaf 3 and drop support for Thymleaf 2
This commit raises the minimum supported version of Thymeleaf to
3.0.x. It also upgrades Spring Social to a version that is compatible
with Thymeleaf 3.

Closes gh-7450
Closes gh-6258
See gh-7885
2017-01-25 13:59:09 +00:00
Andy Wilkinson
9c77708fcb Remove Jetty 9.3 sample that was missed in dbd10a8d
See gh-7985
2017-01-25 13:54:25 +00:00
Andy Wilkinson
dbd10a8daa Remove support for Jetty 9.3 and earlier
Closes gh-7985
2017-01-24 20:00:50 +00:00
Andy Wilkinson
0807c27c26 Complete removing support for Tomcat 7
Closes gh-6416
2017-01-24 17:26:30 +00:00
Andy Wilkinson
0f998e2ae1 Merge branch '1.5.x' 2017-01-24 12:39:45 +00:00
Andy Wilkinson
013d45a4d7 Upgrade to Jetty 9.4.1.v20170120
Closes gh-7750
2017-01-24 12:39:22 +00:00
Andy Wilkinson
fa22396dae Merge branch '1.5.x' 2017-01-24 10:53:29 +00:00
Andy Wilkinson
1a69a4ff67 Remove unnecessary use of @Autowired in the samples 2017-01-24 10:52:50 +00:00
Phillip Webb
8ffaa54e74 Merge branch '1.5.x' 2017-01-23 23:45:44 -08:00
Phillip Webb
2c89d9918f Relocate AutoConfigurations from root package
Move PropertyPlaceholder and MessageSource auto-configuration from the
root package to the `context` subpackage.

Fixes gh-8071
2017-01-23 17:32:45 -08:00
Phillip Webb
3893383cbe Merge branch '1.5.x' 2017-01-23 16:40:30 -08:00
Phillip Webb
5703fb1515 Polish 2017-01-23 16:03:59 -08:00
Andy Wilkinson
863d505994 Merge branch '1.5.x' 2017-01-23 11:09:28 +00:00
Andy Wilkinson
07d9c3fef6 Rename classes and package in new OAuth2 and Actuator sample
Closes gh-8058
2017-01-23 11:08:05 +00:00
Stephane Nicoll
4fe04178b7 Merge branch '1.5.x' 2017-01-20 16:43:21 +01:00
Stephane Nicoll
915c959a28 Polish contribution
Closes gh-7600
2017-01-20 16:40:48 +01:00
Phillip Webb
89f7ec054f Merge branch '1.5.x' 2017-01-19 12:45:26 -08:00
Phillip Webb
f3cd0ad22c Polish 2017-01-19 12:44:57 -08:00
Phillip Webb
5502fa2936 Merge branch '1.5.x' 2017-01-18 21:05:22 -08:00
Phillip Webb
10dbf3c571 Use @Validated as trigger for JSR-330 validation
Update `ConfigurationPropertiesBindingPostProcessor` so that
`@Validated` is expected to be used to trigger JSR-330 validation.

Any existing configuration classes that use JSR-330 annotations but
don't have `@Validated` will currently still be validated, but will
now log a warning. This should give users a chance to add the requested
annotations before the next Spring Boot release where we will use them
as the exclusive signal that validation is required.

Closes gh-7579
2017-01-18 21:01:07 -08:00
Andy Wilkinson
5036fc50fc Merge branch '1.5.x' 2017-01-17 21:17:03 +00:00
Andy Wilkinson
29adf2d85e Ensure that test closes InputStream that reads contents of output files 2017-01-17 21:16:20 +00:00
Andy Wilkinson
c2efae06f0 Merge branch '1.5.x' 2017-01-17 14:35:40 +00:00
Andy Wilkinson
2973d3ed4b Polishing 2017-01-17 14:35:30 +00:00
Andy Wilkinson
467350a65d Merge branch '1.5.x' 2017-01-17 14:27:02 +00:00
Andy Wilkinson
ed18478054 Give FileWritingMessageHandler more time to sort itself out
See 3927dca3
2017-01-17 14:26:14 +00:00
Andy Wilkinson
3fd597481f Merge branch '1.5.x' 2017-01-17 13:19:31 +00:00
Andy Wilkinson
682d0f524f Test insecure, insensitive endpoint with property that's always available
The user property is only available on Unix-like platforms (due to
the USER environment variable). This commit updates the test to
explicitly set a specific property and then check that it's accessible
via the env endpoint rather than using one that is OS-specific.

See gh-7868
See gh-7881
2017-01-17 13:17:32 +00:00
Andy Wilkinson
f87e8d1def Merge branch '1.5.x' 2017-01-17 12:25:12 +00:00
Andy Wilkinson
8666248d27 Polishing 2017-01-17 12:25:01 +00:00
Andy Wilkinson
1ad7a66f03 Merge branch '1.5.x' 2017-01-17 11:53:14 +00:00
Andy Wilkinson
3927dca3e0 Tolerate files being briefly left open by FileWritingMessageHandler
When the context is closed, FileWritingMessageHandler is stopped and
it closes its output files. However, it appears to do so in a manner
which means that they may be closed after the call to close the
context is completed. This causes problems on Windows as files that
are still open cannot be deleted.

This commit adds a workaround to SampleIntegrationApplicationTests
so that it makes up to 10 attempts each 0.5s apart to clean up the
input and output directories.
2017-01-17 11:48:57 +00:00
Stephane Nicoll
f4f5a70cb2 Merge branch '1.5.x' 2017-01-17 09:57:53 +01:00
Johnny Lim
acc36c076d Polish
See gh-8004
2017-01-17 09:53:50 +01:00
Stephane Nicoll
752a91c75b Merge branch '1.5.x' 2017-01-14 04:36:47 -05:00
Stephane Nicoll
7e557662a5 Polish contribution
Closes gh-7916
2017-01-14 04:35:58 -05:00
Praveendra Singh
36de58f0fe Polish samples list in readme
See gh-7916
2017-01-14 04:34:10 -05:00
Andy Wilkinson
ae3434ba4c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284 Correct copyright dates and enforce that starting year is 2012
Closes gh-7923
2017-01-13 18:43:30 -05:00
Phillip Webb
b99c2daf31 Fixup broken version number 2017-01-06 00:05:25 -08:00
Phillip Webb
c35454e5f4 Merge branch '1.5.x' 2017-01-05 23:40:58 -08:00
Phillip Webb
f96294b63b Add LDAP sample
Add an LDAP sample application.

See gh-7733
2017-01-05 23:36:29 -08:00
Madhura Bhave
4ea47220e9 Match nested paths for insensitive actuators
Update `ManagementWebSecurityAutoConfiguration` to match nested path
for insensitive actuators.

Prior to this commit, when Spring Security was on the classpath
nested paths were considered sensitive (even if the actuator
endpoint was not sensitive). i.e. when setting
`endpoints.env.sensitive=false` `/env` could be accessed without
authentication but `/env/user` could not.

Fixes gh-7868
Closes gh-7881
2017-01-05 18:45:30 -08:00
Phillip Webb
18aa9be4fb Merge branch '1.4.x' into 1.5.x 2017-01-05 18:16:42 -08:00
Phillip Webb
21bfe52694 Add test to check class resources aren't exposed
Closes gh-7880
2017-01-05 18:15:50 -08:00
Phillip Webb
77f9bb09ca Further Polish Mockito 2 support
See gh-7770
2017-01-05 14:29:29 -08:00
Phillip Webb
7f99153daf Fixup parent POM version number 2017-01-05 13:57:30 -08:00
Phillip Webb
6776ec2704 Merge branch '1.5.x' 2017-01-05 11:04:37 -08:00
Phillip Webb
565f75438e Polish 2017-01-05 11:04:07 -08:00
Dave Syer
21be9ef666 Merge remote-tracking branch 'origin/1.5.x' 2017-01-05 11:59:49 +00:00
Dave Syer
fe344df9c5 Change default order of OAuth2 resource server filter chain
The default is now SecurityProperties.ACCESS_OVERRIDE_ORDER-1
(instead of 3), and the user can set it with
security.oauth2.resource.filter-order (as opposed to being hard
coded). The filter is provided by Spring OAuth2 so this change is
a BeanPostProcessor to call a setter on that object.

Fixes gh-5072
2017-01-05 11:58:36 +00:00
Phillip Webb
53f1df86a2 Merge branch '1.5.x' 2016-12-30 12:17:28 -08:00
Phillip Webb
aacf5d660f Update copyright year for changed files 2016-12-30 11:53:51 -08:00
Phillip Webb
be3fe12cf0 Polish 2016-12-30 11:46:24 -08:00
Phillip Webb
273beaa3ce Polish 2016-12-30 11:10:44 -08:00
Stephane Nicoll
4604bb7e8a Merge branch '1.5.x' 2016-12-30 18:01:59 +01:00
Stephane Nicoll
c903ff46a7 Polish samples 2016-12-30 17:57:14 +01:00
Stephane Nicoll
a19a28062f Fix actuator security in samples
Closes gh-7637
2016-12-30 17:56:19 +01:00
Stephane Nicoll
9dfaf4de06 Merge branch '1.5.x' 2016-12-30 15:53:16 +01:00
Stephane Nicoll
3ed5a723bb Polish log4j2 sample 2016-12-30 15:50:45 +01:00
Phillip Webb
519f9c6c54 Merge branch '1.5.x' 2016-12-28 15:35:32 -08:00
Phillip Webb
97d7ffd8e8 Merge branch '1.4.x' into 1.5.x 2016-12-28 14:48:05 -08:00
Phillip Webb
61c931943f Fix Devtools PatternResolver Servlet support
Update ClassLoaderFilesResourcePatternResolver to support servlet
resources when it's being used with a WebApplicationContext.

Prior to commit 918e122ddc a `ResourceLoader` was not added to the
`ApplicationContext`, meaning that servlet resources could be found by
virtue of the protected `getResourceByPath()` method. Following commit
918e122ddc, the context `ResourceLoader` is set, meaning that all calls
to `getResource` delegate to the `ResourceLoader` and the
`ApplicationContext` methods are not invoked. Since the devtools
`ResourceLoader` wasn't Servlet aware, servlet resources could not
be found.

Fixes gh-7752
2016-12-28 14:25:11 -08:00
Phillip Webb
49fa702708 Merge branch '1.5.x' 2016-12-27 15:06:22 -08:00
Phillip Webb
85504e74a6 Merge branch '1.4.x' into 1.5.x 2016-12-27 15:05:15 -08:00
Mesut Can Gurle
ab2290eecd Improve Cassandra sample README documentation
Update the README file in `spring-boot-sample-data-cassandra` with
details of how to setup the keyspace and create the tables.

Closes gh-7737
2016-12-27 12:56:22 -08:00
Phillip Webb
61f65ea10e Add test for devtools + serving from /public
Add a simple test to show that basic serving of `/public` resources
works with devtoos.

See gh-7752
2016-12-27 12:24:32 -08:00
Stephane Nicoll
80df396e3c Fix parent version 2016-12-27 12:43:15 +01:00
Phillip Webb
291752a317 Merge branch '1.5.x' 2016-12-24 11:26:50 -08:00
Phillip Webb
a116579cfc Work around Jetty websocket client bug
Add workaround for Jetty JsrSession NullPointerException bug
(https://github.com/eclipse/jetty.project/issues/1202) in
`spring-boot-sample-websocket-jetty`.

See gh-7599
2016-12-24 11:22:58 -08:00
Phillip Webb
a23591e047 Support Jetty 9.4 and upgrade to 9.4.0.v20161208
Update `JettyEmbeddedServletContainerFactory` to support Jetty 9.4
directly and Jetty 9.3 via reflection. The primary difference between
Jetty 9.3 and 9.4 are the session management classes. Websocket suppport
has also been updates, but this is handled transparently by the
Spring Framework support.

Fixes gh-7599
2016-12-24 11:22:38 -08:00
Phillip Webb
c3edf9e341 Fixup version numbers following release 2016-12-22 19:03:09 -08:00
Spring Buildmaster
9057f9ae1f Next development version 2016-12-23 00:15:23 +00:00
Phillip Webb
6e02fe59f7 Merge branch '1.5.x' 2016-12-21 22:32:43 -08:00
Phillip Webb
982f41b70c Polish @IntegrationComponentScan auto-configuration
See gh-2037
See gh-7718
2016-12-21 22:22:50 -08:00
Stephane Nicoll
ac9eb8a9a9 Fix Maven warning in samples
Closes gh-7716
2016-12-21 11:40:14 +01:00
Phillip Webb
1f417997f3 Merge branch '1.5.x' 2016-12-19 13:21:18 -08:00
Phillip Webb
6121208cbb Polish formatting 2016-12-19 12:47:03 -08:00
Phillip Webb
bd74c3d327 Polish formatting 2016-12-19 12:25:09 -08:00
Andy Wilkinson
943262bb97 Raise the minimum supported version of Hibernate to 5.2.x
Closes gh-7586
2016-12-15 21:31:53 +00:00
Madhura Bhave
1cd1054514 Merge branch '1.5.x' 2016-12-06 11:08:24 -08:00
Madhura Bhave
1be5812cf0 Require ACTUATOR role rather than ADMIN
Update management security to require an `ACTUATOR` role rather than
`ADMIN` by default. This should reduce the risk of users accidentally
exposing actuator endpoints because they happen to use a role named
`ADMIN`.

Fixes gh-7569
2016-12-05 17:58:16 -08:00
Madhura Bhave
d09aafacda Add a security interceptor for actuator endpoints
Update `AbstractEndpointHandlerMapping` to support a security
interceptor that can be used to enforce endpoint security.

Fixes gh-6889
2016-12-05 17:57:00 -08:00
Andy Wilkinson
2adb002275 Merge branch '1.5.x' 2016-12-02 11:21:10 +00:00
Andy Wilkinson
cee2f818d6 Fix m2e error caused by spring-boot-sample-custom-layout 2016-12-02 11:20:39 +00:00
Andy Wilkinson
8a95d5d798 Remove Spring Data GemFire Starter and Sample
Closes gh-7465
2016-11-30 10:49:07 +00:00
Stephane Nicoll
655bffb8eb Merge branch '1.5.x' 2016-11-30 11:37:58 +01:00
Stephane Nicoll
740d28578b Promote plugin dependency management
This commit promotes the plugin dependency management for the
`maven-enforcer-plugin` and `maven-invoker-plugin` to the root. That way
these can be used in samples as well rather than having a separate copy.

Closes gh-7517
2016-11-30 11:37:48 +01:00
Stephane Nicoll
2577d79ff1 Merge branch '1.5.x' 2016-11-29 14:54:38 +01:00
Stephane Nicoll
b618c70e52 Add test slice for pure jdbc tests
This commit adds `@JdbcTest`, a new test slice for pure jdbc tests. It
provides the same basic features than `@DataJpaTest`.

Closes gh-6563
2016-11-29 14:54:15 +01:00
Stephane Nicoll
e8d476dbca Fix use of forceCreation flag in maven-jar-plugin 2016-11-29 11:28:14 +01:00
Stephane Nicoll
fcb405ebde Merge branch '1.5.x' 2016-11-29 10:04:49 +01:00
Stephane Nicoll
140379fc5a Fix Maven warnings 2016-11-29 10:03:49 +01:00
Stephane Nicoll
cb6a7b79fe Fix build failure 2016-11-29 10:03:30 +01:00
Phillip Webb
a055ef8614 Fix parent POM version following 1.5.x merge 2016-11-28 23:12:49 -08:00
Phillip Webb
450ab28163 Merge branch '1.5.x' 2016-11-28 17:27:05 -08:00
Phillip Webb
8432c52369 Add custom LayoutFactory sample
Add a sample that shows how a custom LayoutFactory can be used with
both Maven and Gradle.

Closes gh-7263
2016-11-28 16:31:53 -08:00
Phillip Webb
e0dfff2b23 Merge branch '1.5.x' 2016-11-22 14:54:17 -08:00
Phillip Webb
88c84ce234 Merge branch '1.4.x' into 1.5.x 2016-11-22 14:53:30 -08:00
Phillip Webb
ce58e16860 Add additional Tomcat timeout test
Update the Tomcat sample to also test that the connection timeout is
set.

See gh-7425
2016-11-22 14:30:36 -08:00
Andy Wilkinson
95a763d528 Merge branch '1.5.x' 2016-11-22 11:08:10 +00:00
Andy Wilkinson
f5dd90815b Polishing: fix some compiler warnings 2016-11-22 11:07:51 +00:00
Phillip Webb
20d7dd5747 Merge branch '1.5.x' 2016-11-18 17:30:03 -08:00
Phillip Webb
1657120286 Move ModifiedClassPathRunner to its own module
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.

Fixes gh-7420
2016-11-18 17:27:54 -08:00
Phillip Webb
cb7c0b5031 Merge branch '1.5.x' 2016-11-16 16:06:53 -08:00
Johnny Lim
8038882d46 Polish
Closes gh-7403
2016-11-16 13:36:51 -08:00
Stephane Nicoll
6aa57e8ffe Merge branch '1.5.x' 2016-11-12 11:16:43 +01:00
Stephane Nicoll
2b8801a6b5 Merge branch '1.4.x' into 1.5.x 2016-11-12 11:16:30 +01:00
Emanuel Rabina
6b681ddfab Upgrade Thymeleaf 3 layout dialect in doc
Closes gh-7370
2016-11-12 11:15:00 +01:00
Stephane Nicoll
72e696bcbd Fixup version numbers following release 2016-11-08 18:24:42 +01:00
Spring Buildmaster
e712a9ba8c Next Development Version 2016-11-08 16:55:37 +00:00
Stephane Nicoll
d32da0d692 Merge branch '1.5.x' 2016-11-05 11:16:09 +01:00
Stephane Nicoll
01e66ecbd5 Merge branch '1.4.x' into 1.5.x 2016-11-05 11:15:27 +01:00
Stephane Nicoll
4311cf333f Remove sample reference in build 2016-11-05 11:14:50 +01:00
Stephane Nicoll
4407194c00 Replace sample by integration test
Closes gh-3888
2016-11-05 11:09:36 +01:00
Andy Wilkinson
a350b66150 Merge branch '1.5.x' 2016-11-03 22:41:14 +00:00
Andy Wilkinson
025bafd911 Polish new Actuator sample 2016-11-03 22:40:12 +00:00
Phillip Webb
0cdde3b83c Merge branch '1.5.x' 2016-11-03 14:50:26 -07:00
Phillip Webb
81c5753f4d Merge branch '1.4.x' into 1.5.x 2016-11-03 14:49:38 -07:00
Phillip Webb
6a2ac080ac Create our own SessionCreationPolicy enum
Update `ManagementServerProperties` so that `security.sessions` no
longer uses `SessionCreationPolicy` from Spring Security. We now
use our own enun which allows `management.security.*` properties to
be set without the risk of a `ClassNotFoundException`.

Fixes gh-3888
2016-11-03 14:36:49 -07:00
Andy Wilkinson
4486d2d209 Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots
Closes gh-7301
See gh-7029
2016-11-03 20:49:02 +00:00
Andy Wilkinson
57450042bb Merge branch '1.5.x' 2016-10-19 10:44:27 +01:00
Andy Wilkinson
7962818294 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:44:20 +01:00
Andy Wilkinson
6ac041c43b Update Thymeleaf 3 related versions in docs and sample
See gh-6991
Closes gh-7183
2016-10-19 10:43:38 +01:00
Andy Wilkinson
e49b5f241e Merge branch '1.5.x' 2016-10-17 15:30:02 +01:00
Andy Wilkinson
57108a9faa Try to make the tests for the Cassandra sample more robust
Cassandra sometimes takes a long time when dropping the test keyspace.
This results in the test failing due to an exception being thrown.
This commit attempts to make the tests more robust by catching and
logging any exceptions thrown during server cleanup.
2016-10-17 15:28:50 +01:00
Phillip Webb
01900c8342 Merge branch '1.5.x' 2016-10-11 23:42:14 -07:00
Phillip Webb
d818a09ed8 Polish 2016-10-11 23:38:14 -07:00
Stephane Nicoll
c5cc626d48 Remove remote shell support
See gh-7044
2016-10-11 17:59:25 +02:00
Andy Wilkinson
fe10ea73b0 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:58:42 +01:00
Andy Wilkinson
ad3e5c04bb Add a second, portal-compatible ID to the Gradle plugin
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.

This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.

Closes gh-6997
2016-10-05 14:58:26 +01:00
Andy Wilkinson
f137ec6a3a Merge branch '1.5.x' 2016-10-05 14:58:02 +01:00
Andy Wilkinson
846f264da8 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:57:51 +01:00
Andy Wilkinson
77f1da871f Add a second, portal-compatible ID to the Gradle plugin
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.

This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.

Closes gh-6997
2016-10-05 14:54:23 +01:00
Phillip Webb
d0d01b92b9 Fixup parent POM version 2016-10-03 22:54:06 -07:00
Phillip Webb
17bb3b51df Merge branch '1.5.x' 2016-10-03 22:53:10 -07:00
Phillip Webb
8fe755d281 Fixup parent POM version 2016-10-03 22:52:43 -07:00
Phillip Webb
6d11931421 Merge branch '1.4.x' into 1.5.x 2016-10-03 22:51:49 -07:00
Phillip Webb
bd341cbac8 Polish 2016-10-03 22:51:21 -07:00
Phillip Webb
53f50eda39 Merge branch '1.5.x' 2016-10-03 22:47:11 -07:00
Phillip Webb
a2315378d4 Formatting 2016-10-03 22:44:36 -07:00
Phillip Webb
f2b0fa284e Merge branch '1.4.x' into 1.5.x 2016-10-03 22:38:22 -07:00
Madhura Bhave
16fe332f51 Fix NoClassDefFoundError when Mockito is missing
Update MockReset class to check for the presence of the MockUtil class
before attempting to use it.

Fixes gh-7065
2016-10-03 22:27:20 -07:00
Phillip Webb
f59cc25e2b Fix eclipse warnings 2016-10-03 21:51:16 -07:00
Andy Wilkinson
d3d58bb2d2 Merge branch '1.5.x' 2016-09-29 21:09:41 +01:00
Andy Wilkinson
901aa2764b Merge branch '1.4.x' into 1.5.x 2016-09-29 21:09:18 +01:00
Andy Wilkinson
cf4142dbc0 Prevent htmlunit from pulling in commons-logging
Update dependency management to exclude commons-logging and add
an enforcer rule to spring-boot-samples to try and prevent unwanted
commons-logging dependencies from sneaking back in again.

Closes gh-7067
2016-09-29 21:08:15 +01:00
Andy Wilkinson
f82dc8e043 Upgrade to JMS API 2.0
Closes gh-7049
2016-09-29 20:33:21 +01:00
Andy Wilkinson
4d64c9c93d Merge branch '1.5.x' 2016-09-29 16:29:42 +01:00
Andy Wilkinson
733cfe9f70 Merge branch '1.4.x' into 1.5.x 2016-09-29 16:29:35 +01:00
Andy Wilkinson
51eb1ac04d Declare embedded queue up front in samples that use Artemis
Closes gh-7063
2016-09-29 16:28:40 +01:00
Andy Wilkinson
241ab10160 Merge branch '1.5.x' 2016-09-29 15:49:04 +01:00
Andy Wilkinson
2a035d0748 Remove support for Velocity following its deprecation in 1.4
Closes gh-6971
2016-09-29 15:44:36 +01:00
Andy Wilkinson
464915d2cc Remove support for HornetQ following its deprecation in 1.4
See gh-6971
2016-09-29 15:44:36 +01:00
Andy Wilkinson
3e058e038f Merge branch '1.5.x' 2016-09-29 13:12:24 +01:00
Andy Wilkinson
cd45ce9104 Merge branch '1.4.x' into 1.5.x 2016-09-29 13:12:11 +01:00
Andy Wilkinson
1bb5dc205d Update samples to use Artemis in place of HornetQ
Closes gh-7057
2016-09-29 11:52:09 +01:00
Stephane Nicoll
8b6d7eedc0 Merge branch '1.5.x' 2016-09-29 10:38:42 +02:00
Vedran Pavic
c4aa78679a Upgrade Hazelcast to 3.7.1
In addition, dependency management for `hazelcast-hibernate5` module has
been added, and a separate dependency version was introduced for
`hazelcast-hibernate4` module.

Closes gh-7023
2016-09-29 10:37:29 +02:00
Stephane Nicoll
d117ec45b8 Merge branch '1.4.x' into 1.5.x 2016-09-22 07:53:27 +02:00
Stephane Nicoll
85fb273596 Fix spring-boot-antlib version
See gh-6978
2016-09-22 07:52:02 +02:00
Andy Wilkinson
aaf435ff2a Suppress Neo4J-related deprecation warnings
See gh-6976
2016-09-21 20:57:05 +01:00
Andy Wilkinson
08842c1273 Suppress Neo4J-related deprecation warnings
See gh-6976
2016-09-21 19:52:18 +01:00
Andy Wilkinson
16a0f72df5 Merge branch '1.5.x' 2016-09-21 17:03:35 +01:00
Andy Wilkinson
c108da9d53 Upgrade to Spring Data Ingalls M1
Closes gh-6785
Closes gh-5835
2016-09-21 17:01:47 +01:00
Stephane Nicoll
9bc77254a7 Start building against Spring Framework 5 snapshot
This commit enables compatibility build against Spring Framework 5.

The Velocity and Guava support that are deprecated in the 1.x line have
been removed and few other classes contain minor change to comply to non
backward compatible changes in Spring Framework 5.

This commit also switches the required java version to 8.

Closes gh-6977
2016-09-21 17:37:02 +02:00
Stephane Nicoll
6643ec3713 Next development version 2016-09-21 17:05:50 +02:00
Stephane Nicoll
5684924f60 Polish 2016-09-21 17:01:43 +02:00
Stephane Nicoll
6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +02:00
Stephane Nicoll
97083300d7 Fixup version numbers following release 2016-09-21 10:35:52 +02:00
Spring Buildmaster
7e9ed5e1a7 Next Development Version 2016-09-21 07:58:07 +00:00
Stephane Nicoll
04a72fcb78 Fixup version numbers following release 2016-09-20 22:53:40 +02:00
Andy Wilkinson
be33827f49 Simplify property validation sample and document need for static bean method
Closes gh-6627
2016-09-20 21:33:31 +01:00
Spring Buildmaster
5f959b074f Next Development Version 2016-09-20 20:20:06 +00:00
Stephane Nicoll
fc5ab5685b Fix location url in test
See gh-6956
2016-09-20 09:44:21 +02:00
Phillip Webb
ede1657d79 Include Jetty EL dependency in starter
Update spring-boot-starter-jetty to include an EL dependency.

Fixes gh-6692
2016-09-08 16:52:53 -07:00
Andy Wilkinson
10402a651f Close context to ensure that logging system is cleaned up
See gh-6688
2016-08-25 20:41:43 +01:00
Andy Wilkinson
07a50bb16c Update the samples to make use of auto-configured TestRestTemplate
Closes gh-6730
2016-08-25 12:07:40 +01:00
Andy Wilkinson
46e03529fb Remove redundant bean declarations from some of the security samples
Closes gh-6740
2016-08-24 17:34:29 +01:00
Stephane Nicoll
96d5def17d Add reference to Caffeine in cache sample 2016-08-17 10:13:46 +02:00
Andy Wilkinson
1b42e1aaa3 Recommend setting spring.thymeleaf.mode: HTML when using Thymeleaf 3
Closes gh-6552
2016-08-08 10:40:01 +01:00
Phillip Webb
c7a23eae56 Fixup version numbers following release 2016-07-28 14:38:17 -07:00
Spring Buildmaster
334baaeffd Next development version 2016-07-28 19:54:01 +00:00
Stephane Nicoll
29cd3c42e1 Fixup version numbers following release 2016-07-28 11:46:55 +02:00
Spring Buildmaster
a89ef5df6e Next Development Version 2016-07-28 09:18:40 +00:00
Johnny Lim
9627d0ed66 Polish
Closes gh-6487
2016-07-27 12:29:33 +01:00
Phillip Webb
296dc7132b Allow JSON Testers to be @Autowired
Switch `@AutoConfigureJsonTesters` to use regular `@Autowired` injection
for JSON testers. Prior to this commit JSON Tester fields were
initialized directly which caused IDE issues and was also a little
confusing.

Fixes gh-6451
2016-07-26 21:41:37 -07:00
Phillip Webb
4a1e0d4544 Extend @AutoConfigureMockMvc print support
Update @AutoConfigureMockMvc to support extended print options including
`System.err` and `log.debug`. In addition the "default" print option
can now be overridden by adding `spring.test.mockmvc.print=...` to
`src/test/resources/application.properties`.

Fixes gh-6455
2016-07-25 13:17:26 -07:00
Johnny Lim
417fae4e27 Use the managed version for H2 in spring-boot-sample-actuator
Closes gh-6432
2016-07-20 11:29:43 +02:00
Phillip Webb
05ff4ed4e0 Upgrade to Tomcat 8.5.4 & remove tomcat-juli
Upgrade the managed Tomcat dependency to 8.5.4 and remove `tomcat-juli`
since it's now included in `tomcat-embed-core`.

Fixes gh-6192
2016-07-18 17:52:35 -07:00
Andy Wilkinson
db83e89922 Add support for Thymeleaf 3 while keeping Thymeleaf 2 as the default
Closes gh-4393
2016-07-12 23:02:04 +01:00
Phillip Webb
43afc149a1 Consider WebAppConfiguration in @SpringBootTest
Update SpringBootTestContextBootstrapper to consider the
`@WebAppConfiguration` annotation and use sensible resourceBasePath
defaults.

Fixes gh-6371
2016-07-11 16:38:10 -07:00
Phillip Webb
df8dfb093b Fix package tangle in jOOQ sample
Use a custom GeneratorStrategy to fix the package tangles that jOOQ
creates by default.

Fixes gh-6372
2016-07-11 12:50:42 -07:00
Andy Wilkinson
3286760073 Make it easier to add auto-configuration to a test slice
Previously, an entry had to be added to spring.factories using the
name of one of the @AutoConfigure… meta-annotations on the @…Test
annotation as the key. This indirection was unnecessarily complicated.

This commit simplifies things by allowing the name of the @…Test
annotation itself to be used as the key.

Closes gh-6335
2016-07-06 16:44:26 +01:00
Stephane Nicoll
eeb95693b3 Fixup version numbers following release 2016-07-04 16:45:17 +02:00
Spring Buildmaster
2216369348 Next Development Version 2016-07-04 14:15:02 +00:00
Andy Wilkinson
92bb24e365 Avoid synchronizing on this and use an internal monitor instead
Where possible, code that previously synchronized on this (or on the
class in the case of static methods) has been updated to use an
internal monitor object instead. This allows the locking model that's
employed to be an implementation detail rather than part of the
class's API.

Classes that override a synchronized method continue to declare
the overriding method as synchronized. This ensures that locking
is consistent across the superclass and its subclass.

Closes gh-6262
2016-07-01 10:44:23 +01:00
Andy Wilkinson
93307bbd5b Merge branch '1.3.x' 2016-06-23 12:59:55 +01:00
Andy Wilkinson
17546628f5 Remove springloaded from samples
springloaded isn't required in any of the samples, yet some of them
make use of it without being a springloaded-specific sample. This
is creating the false impression that springloaded is necessary in
cases where it's not.
2016-06-23 12:58:42 +01:00
Andy Wilkinson
52e8ad4b6b Drop back to Hibernate 5.0.9.Final
The upgrade to Hibernate 5.2.0.Final has provide to be too
problematic to live with. It requires Java 8, is incompatible with
a number of other projects in the Hibernate ecosystem, and it's
unclear for how long it will be maintained. We'd previously used
Hibernate 5.1.0.Final but its maintenance is also unclear with
Hibernate 5.1.1.Final being more than 3 months overdue.

This commit drops back to Hibernate 5.0.9.Final. This has a few
advantages:

- It's Java 7 compatible
- It's had some time to mature and should be reasonably free of
  regressions for those moving from 4.3.x
- It's used in both Wildfly and JBoss EAP so there's a fair chance
  that it will continue to be maintained.

Closes gh-6198
2016-06-21 20:09:21 +01:00
Phillip Webb
7446235ff4 Polish 2016-06-20 20:13:13 -07:00
Andy Wilkinson
5e4f84cf46 Allow maximum HTTP header size to be configured when using Jetty 8
Closes gh-6190
2016-06-20 14:12:49 +01:00
Andy Wilkinson
5b688de8da Fix artifact id of new Tomcat 8.0 SSL sample
See gh-6164
2016-06-20 13:50:55 +01:00
Andy Wilkinson
f28e3d54c5 Upgrade to Tomcat 8.5.3
This commit changes the default version of Tomcat to 8.5.3 while
also retaining support for Tomcat 8.0 and 7.0. The main difference
in 8.5 is that the ServerSocketFactory abstraction that allowed the
TrustStore and KeyStore to be configured programatically no longer
exists. This logic has been replaced with the use of a custom URL
protocol (springbootssl) that provides access to the key store and
trust store of an SslStoreProvider. In addition to working with 8.5,
this approach has the advantage of also working with 8.0 and 7.0.

Closes gh-6164
2016-06-20 13:27:47 +01:00
Stephane Nicoll
2ff9e3cfdc Upgrade to Hibernate 5.2
See gh-6111
2016-06-17 11:14:35 +02:00
Stephane Nicoll
888c5d4589 Polish contribution
Closes gh-6081
2016-06-16 11:33:57 +02:00
Vedran Pavic
8e2e493946 Remove HSQLDB dependency from Batch Starter
This commit removes HSQLDB dependency from Batch Starter as most apps
that use Spring Batch will prefer to use a RDBMS of their choice to store
batch metadata.

Additionally, explicit spring-jdbc dependency has been replaced with JDBC
Starter dependency.

See gh-6081
2016-06-16 11:33:57 +02:00
Vladimir Tsanev
b303b3fe35 Support JSPs in Embedded Jetty
JSPs are now supported in executable WARs with embedded Jetty.

Fixes gh-367
Closes gh-5290
2016-06-15 16:01:54 +02:00
Andy Wilkinson
ff602e60a0 Change default version of Jetty to 9.3
Closes gh-5825
2016-06-15 13:58:47 +01:00
Stephane Nicoll
17dfec7c4e Resume building against Spring Data Hopper snapshots
See gh-6132
2016-06-09 15:54:32 +02:00
Johnny Lim
5de9516255 Fix typos
Closes gh-6114
2016-06-03 07:20:39 -04:00