Commit Graph

1299 Commits (a051e30fe0ac00263ace6d97282a4268d35b83a2)

Author SHA1 Message Date
Andy Wilkinson f34d309548 Formatting 8 years ago
Stephane Nicoll bd0c1cb9c3 Fixup version numbers following release 8 years ago
Spring Buildmaster ed1ce140c0 Next Development Version 8 years ago
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
8 years ago
Andy Wilkinson 9c77708fcb Remove Jetty 9.3 sample that was missed in dbd10a8d
See gh-7985
8 years ago
Andy Wilkinson dbd10a8daa Remove support for Jetty 9.3 and earlier
Closes gh-7985
8 years ago
Andy Wilkinson 0807c27c26 Complete removing support for Tomcat 7
Closes gh-6416
8 years ago
Andy Wilkinson 0f998e2ae1 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 013d45a4d7 Upgrade to Jetty 9.4.1.v20170120
Closes gh-7750
8 years ago
Andy Wilkinson fa22396dae Merge branch '1.5.x' 8 years ago
Andy Wilkinson 1a69a4ff67 Remove unnecessary use of @Autowired in the samples 8 years ago
Phillip Webb 8ffaa54e74 Merge branch '1.5.x' 8 years ago
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
8 years ago
Phillip Webb 3893383cbe Merge branch '1.5.x' 8 years ago
Phillip Webb 5703fb1515 Polish 8 years ago
Andy Wilkinson 863d505994 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 07d9c3fef6 Rename classes and package in new OAuth2 and Actuator sample
Closes gh-8058
8 years ago
Stephane Nicoll 4fe04178b7 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 915c959a28 Polish contribution
Closes gh-7600
8 years ago
Phillip Webb 89f7ec054f Merge branch '1.5.x' 8 years ago
Phillip Webb f3cd0ad22c Polish 8 years ago
Phillip Webb 5502fa2936 Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson 5036fc50fc Merge branch '1.5.x' 8 years ago
Andy Wilkinson 29adf2d85e Ensure that test closes InputStream that reads contents of output files 8 years ago
Andy Wilkinson c2efae06f0 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 2973d3ed4b Polishing 8 years ago
Andy Wilkinson 467350a65d Merge branch '1.5.x' 8 years ago
Andy Wilkinson ed18478054 Give FileWritingMessageHandler more time to sort itself out
See 3927dca3
8 years ago
Andy Wilkinson 3fd597481f Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson f87e8d1def Merge branch '1.5.x' 8 years ago
Andy Wilkinson 8666248d27 Polishing 8 years ago
Andy Wilkinson 1ad7a66f03 Merge branch '1.5.x' 8 years ago
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.
8 years ago
Stephane Nicoll f4f5a70cb2 Merge branch '1.5.x' 8 years ago
Johnny Lim acc36c076d Polish
See gh-8004
8 years ago
Stephane Nicoll 752a91c75b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 7e557662a5 Polish contribution
Closes gh-7916
8 years ago
Praveendra Singh 36de58f0fe Polish samples list in readme
See gh-7916
8 years ago
Andy Wilkinson ae3434ba4c Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson d2201d5284 Correct copyright dates and enforce that starting year is 2012
Closes gh-7923
8 years ago
Phillip Webb b99c2daf31 Fixup broken version number 8 years ago
Phillip Webb c35454e5f4 Merge branch '1.5.x' 8 years ago
Phillip Webb f96294b63b Add LDAP sample
Add an LDAP sample application.

See gh-7733
8 years ago
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
8 years ago
Phillip Webb 18aa9be4fb Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 21bfe52694 Add test to check class resources aren't exposed
Closes gh-7880
8 years ago
Phillip Webb 77f9bb09ca Further Polish Mockito 2 support
See gh-7770
8 years ago
Phillip Webb 7f99153daf Fixup parent POM version number 8 years ago
Phillip Webb 6776ec2704 Merge branch '1.5.x' 8 years ago
Phillip Webb 565f75438e Polish 8 years ago
Dave Syer 21be9ef666 Merge remote-tracking branch 'origin/1.5.x' 8 years ago
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
8 years ago
Phillip Webb 53f1df86a2 Merge branch '1.5.x' 8 years ago
Phillip Webb aacf5d660f Update copyright year for changed files 8 years ago
Phillip Webb be3fe12cf0 Polish 8 years ago
Phillip Webb 273beaa3ce Polish 8 years ago
Stephane Nicoll 4604bb7e8a Merge branch '1.5.x' 8 years ago
Stephane Nicoll c903ff46a7 Polish samples 8 years ago
Stephane Nicoll a19a28062f Fix actuator security in samples
Closes gh-7637
8 years ago
Stephane Nicoll 9dfaf4de06 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3ed5a723bb Polish log4j2 sample 8 years ago
Phillip Webb 519f9c6c54 Merge branch '1.5.x' 8 years ago
Phillip Webb 97d7ffd8e8 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Phillip Webb 49fa702708 Merge branch '1.5.x' 8 years ago
Phillip Webb 85504e74a6 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
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
8 years ago
Stephane Nicoll 80df396e3c Fix parent version 8 years ago
Phillip Webb 291752a317 Merge branch '1.5.x' 8 years ago
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
8 years ago
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
8 years ago
Phillip Webb c3edf9e341 Fixup version numbers following release 8 years ago
Spring Buildmaster 9057f9ae1f Next development version 8 years ago
Phillip Webb 6e02fe59f7 Merge branch '1.5.x' 8 years ago
Phillip Webb 982f41b70c Polish @IntegrationComponentScan auto-configuration
See gh-2037
See gh-7718
8 years ago
Stephane Nicoll ac9eb8a9a9 Fix Maven warning in samples
Closes gh-7716
8 years ago
Phillip Webb 1f417997f3 Merge branch '1.5.x' 8 years ago
Phillip Webb 6121208cbb Polish formatting 8 years ago
Phillip Webb bd74c3d327 Polish formatting 8 years ago
Andy Wilkinson 943262bb97 Raise the minimum supported version of Hibernate to 5.2.x
Closes gh-7586
8 years ago
Madhura Bhave 1cd1054514 Merge branch '1.5.x' 8 years ago
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
8 years ago
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
8 years ago
Andy Wilkinson 2adb002275 Merge branch '1.5.x' 8 years ago
Andy Wilkinson cee2f818d6 Fix m2e error caused by spring-boot-sample-custom-layout 8 years ago
Andy Wilkinson 8a95d5d798 Remove Spring Data GemFire Starter and Sample
Closes gh-7465
8 years ago
Stephane Nicoll 655bffb8eb Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll 2577d79ff1 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll e8d476dbca Fix use of `forceCreation` flag in `maven-jar-plugin` 8 years ago
Stephane Nicoll fcb405ebde Merge branch '1.5.x' 8 years ago
Stephane Nicoll 140379fc5a Fix Maven warnings 8 years ago
Stephane Nicoll cb6a7b79fe Fix build failure 8 years ago
Phillip Webb a055ef8614 Fix parent POM version following 1.5.x merge 8 years ago
Phillip Webb 450ab28163 Merge branch '1.5.x' 8 years ago
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
8 years ago
Phillip Webb e0dfff2b23 Merge branch '1.5.x' 8 years ago
Phillip Webb 88c84ce234 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb ce58e16860 Add additional Tomcat timeout test
Update the Tomcat sample to also test that the connection timeout is
set.

See gh-7425
8 years ago
Andy Wilkinson 95a763d528 Merge branch '1.5.x' 8 years ago
Andy Wilkinson f5dd90815b Polishing: fix some compiler warnings 8 years ago
Phillip Webb 20d7dd5747 Merge branch '1.5.x' 8 years ago
Phillip Webb 1657120286 Move ModifiedClassPathRunner to its own module
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.

Fixes gh-7420
8 years ago
Phillip Webb cb7c0b5031 Merge branch '1.5.x' 8 years ago
Johnny Lim 8038882d46 Polish
Closes gh-7403
8 years ago
Stephane Nicoll 6aa57e8ffe Merge branch '1.5.x' 8 years ago
Stephane Nicoll 2b8801a6b5 Merge branch '1.4.x' into 1.5.x 8 years ago
Emanuel Rabina 6b681ddfab Upgrade Thymeleaf 3 layout dialect in doc
Closes gh-7370
8 years ago
Stephane Nicoll 72e696bcbd Fixup version numbers following release 8 years ago
Spring Buildmaster e712a9ba8c Next Development Version 8 years ago
Stephane Nicoll d32da0d692 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 01e66ecbd5 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 4311cf333f Remove sample reference in build 8 years ago
Stephane Nicoll 4407194c00 Replace sample by integration test
Closes gh-3888
8 years ago
Andy Wilkinson a350b66150 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 025bafd911 Polish new Actuator sample 8 years ago
Phillip Webb 0cdde3b83c Merge branch '1.5.x' 8 years ago
Phillip Webb 81c5753f4d Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Andy Wilkinson 4486d2d209 Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots
Closes gh-7301
See gh-7029
8 years ago
Andy Wilkinson 57450042bb Merge branch '1.5.x' 8 years ago
Andy Wilkinson 7962818294 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample
See gh-6991
Closes gh-7183
8 years ago
Andy Wilkinson e49b5f241e Merge branch '1.5.x' 8 years ago
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.
8 years ago
Phillip Webb 01900c8342 Merge branch '1.5.x' 8 years ago
Phillip Webb d818a09ed8 Polish 8 years ago
Stephane Nicoll c5cc626d48 Remove remote shell support
See gh-7044
8 years ago
Andy Wilkinson fe10ea73b0 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Andy Wilkinson f137ec6a3a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 846f264da8 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Phillip Webb d0d01b92b9 Fixup parent POM version 8 years ago
Phillip Webb 17bb3b51df Merge branch '1.5.x' 8 years ago
Phillip Webb 8fe755d281 Fixup parent POM version 8 years ago
Phillip Webb 6d11931421 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb bd341cbac8 Polish 8 years ago
Phillip Webb 53f50eda39 Merge branch '1.5.x' 8 years ago
Phillip Webb a2315378d4 Formatting 8 years ago
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Phillip Webb f59cc25e2b Fix eclipse warnings 8 years ago
Andy Wilkinson d3d58bb2d2 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 901aa2764b Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Andy Wilkinson f82dc8e043 Upgrade to JMS API 2.0
Closes gh-7049
8 years ago
Andy Wilkinson 4d64c9c93d Merge branch '1.5.x' 8 years ago
Andy Wilkinson 733cfe9f70 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 51eb1ac04d Declare embedded queue up front in samples that use Artemis
Closes gh-7063
8 years ago
Andy Wilkinson 241ab10160 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 2a035d0748 Remove support for Velocity following its deprecation in 1.4
Closes gh-6971
8 years ago
Andy Wilkinson 464915d2cc Remove support for HornetQ following its deprecation in 1.4
See gh-6971
8 years ago
Andy Wilkinson 3e058e038f Merge branch '1.5.x' 8 years ago
Andy Wilkinson cd45ce9104 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 1bb5dc205d Update samples to use Artemis in place of HornetQ
Closes gh-7057
8 years ago
Stephane Nicoll 8b6d7eedc0 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll d117ec45b8 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 85fb273596 Fix spring-boot-antlib version
See gh-6978
8 years ago
Andy Wilkinson aaf435ff2a Suppress Neo4J-related deprecation warnings
See gh-6976
8 years ago
Andy Wilkinson 08842c1273 Suppress Neo4J-related deprecation warnings
See gh-6976
8 years ago
Andy Wilkinson 16a0f72df5 Merge branch '1.5.x' 8 years ago
Andy Wilkinson c108da9d53 Upgrade to Spring Data Ingalls M1
Closes gh-6785
Closes gh-5835
8 years ago
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
8 years ago
Stephane Nicoll 6643ec3713 Next development version 8 years ago
Stephane Nicoll 5684924f60 Polish 8 years ago
Stephane Nicoll 6bd670edbc Initiate 1.4.x branch 8 years ago
Stephane Nicoll 97083300d7 Fixup version numbers following release 8 years ago
Spring Buildmaster 7e9ed5e1a7 Next Development Version 8 years ago
Andy Wilkinson be33827f49 Simplify property validation sample and document need for static bean method
Closes gh-6627
8 years ago
Phillip Webb ede1657d79 Include Jetty EL dependency in starter
Update spring-boot-starter-jetty to include an EL dependency.

Fixes gh-6692
8 years ago
Andy Wilkinson 10402a651f Close context to ensure that logging system is cleaned up
See gh-6688
8 years ago
Andy Wilkinson 07a50bb16c Update the samples to make use of auto-configured TestRestTemplate
Closes gh-6730
8 years ago
Andy Wilkinson 46e03529fb Remove redundant bean declarations from some of the security samples
Closes gh-6740
8 years ago
Stephane Nicoll 96d5def17d Add reference to Caffeine in cache sample 8 years ago
Andy Wilkinson 1b42e1aaa3 Recommend setting spring.thymeleaf.mode: HTML when using Thymeleaf 3
Closes gh-6552
8 years ago
Phillip Webb c7a23eae56 Fixup version numbers following release 8 years ago
Spring Buildmaster 334baaeffd Next development version 8 years ago
Johnny Lim 9627d0ed66 Polish
Closes gh-6487
8 years ago
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
8 years ago
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
8 years ago
Johnny Lim 417fae4e27 Use the managed version for H2 in spring-boot-sample-actuator
Closes gh-6432
8 years ago
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
8 years ago
Andy Wilkinson db83e89922 Add support for Thymeleaf 3 while keeping Thymeleaf 2 as the default
Closes gh-4393
8 years ago
Phillip Webb 43afc149a1 Consider WebAppConfiguration in @SpringBootTest
Update SpringBootTestContextBootstrapper to consider the
`@WebAppConfiguration` annotation and use sensible resourceBasePath
defaults.

Fixes gh-6371
8 years ago
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
8 years ago
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
8 years ago
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
9 years ago
Andy Wilkinson 93307bbd5b Merge branch '1.3.x' 9 years ago
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.
9 years ago
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
9 years ago
Phillip Webb 7446235ff4 Polish 9 years ago
Andy Wilkinson 5e4f84cf46 Allow maximum HTTP header size to be configured when using Jetty 8
Closes gh-6190
9 years ago
Andy Wilkinson 5b688de8da Fix artifact id of new Tomcat 8.0 SSL sample
See gh-6164
9 years ago
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
9 years ago
Stephane Nicoll 2ff9e3cfdc Upgrade to Hibernate 5.2
See gh-6111
9 years ago
Stephane Nicoll 888c5d4589 Polish contribution
Closes gh-6081
9 years ago
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
9 years ago
Vladimir Tsanev b303b3fe35 Support JSPs in Embedded Jetty
JSPs are now supported in executable WARs with embedded Jetty.

Fixes gh-367
Closes gh-5290
9 years ago
Andy Wilkinson ff602e60a0 Change default version of Jetty to 9.3
Closes gh-5825
9 years ago
Stephane Nicoll 17dfec7c4e Resume building against Spring Data Hopper snapshots
See gh-6132
9 years ago
Johnny Lim 5de9516255 Fix typos
Closes gh-6114
9 years ago
Phillip Webb b84330663d Update spring-boot-sample-test REST code
Update RemoteVehicleDetailsService and the related test to use the new
RestTemplateBuilder class and @RestClientTest annotation.

See gh-6030
See gh-5507
9 years ago
Stephane Nicoll f257b6a0b5 Polish "Add activemq starter" contribution
Closes gh-6010
9 years ago
Andy Wilkinson ccd19ce2c3 Merge branch '1.3.x' 9 years ago
Andy Wilkinson 275651e89a Skips Cassandra and Elasticsearch tests on Windows
Neither Cassandra nor Elasticsearch starts reliably on Windows. This
commit adds a custom class rule to the associated sample application
tests to skip them on Windows. A class rule is used rather than a
Unit assumption as we want to avoid starting Elasticsearch (done by
the application context) and Cassandra (done by a test execution
listener) and an assumption would be too late.
9 years ago
Phillip Webb bcfa2e6676 Make TestRestTemplate not extend RestTemplate
Update TestRestTemplate so that it no longer directly extends
RestTemplate. Prior to this commit it was possible that TestRestTemplate
could interfere with user defined RestTemplate beans.

TestRestTemplate offers the same methods as RestTemplate so should be
a drop-in replacement. If access is needed to the actual underlying
template the `getRestTemplate()` method should be used.

Fixes gh-5915
9 years ago
Andy Wilkinson 1947b92481 Avoid exception from dropping non-existent constraint in Data REST sample
Hibernate 5.1 logs an ugly but benign exception when using an in-memory
HSQL database when it tries to drop a non-existent constraint.

This commit changes the Spring Data REST sample to use H2 rather than
HSQL. This prevents the unwanted exception from occurring as Hibernate's
H2 dialect returns false from dropConstraints.
9 years ago
Phillip Webb 4023637b07 Remove accidentally comitted SampleTest 9 years ago
Phillip Webb 6cdbdf9ad3 Polish 9 years ago
Stephane Nicoll dcb4fe8304 Add JMX support to the Spring Integration starter
Closes gh-1440
9 years ago
Andy Wilkinson 5c0d400c23 Align Hibernate 5 join table names with those from SpringNamingStrategy
Previously, the name of a join table when using Hibernate 5 would
differ from those when using Hibernate 4 with the default
SpringNamingStrategy.

This commit introduces SpringImplicitNamingStrategy which customises the
name of join tables to match those produced by SpringNamingStrategy.

Closes gh-5880
9 years ago
Andy Wilkinson 46407c6763 Align JPA sample with Hibernate 5.1’s table naming
The name of the table for a many-to-many relationship has changed in
Hibernate 5.1.

This commit updates the JPA sample’s import.sql accordingly. It also
updates the repository integration tests to verify that the data has
been imported successfully.

Closes gh-5880
9 years ago
Johnny Lim 38dc9ec441 Polish 9 years ago
Stephane Nicoll 8cbbb577a0 Fixup version numbers following release 9 years ago
Stephane Nicoll 9e60340c0e Upgrade to EhCache 3.0.1
Closes gh-5898
9 years ago
Spring Buildmaster 819a9574a6 Next Development Version 9 years ago
Andy Wilkinson 3348ed5bb3 Make use of new GetMapping and PostMapping annotations
Closes gh-5277
9 years ago
Stephane Nicoll 1d6b1d7d57 Fix broken build 9 years ago
Stephane Nicoll 72c2454218 Fixup version numbers following release 9 years ago
Spring Buildmaster 376bbe68d8 Next Development Version 9 years ago
Andy Wilkinson e8e728106e Don’t expect a charset attribute on a text/css Content-Type
Following the encoding change made in 428a10a, the character encoding
of a response is no longer forced.

See gh-5459
9 years ago
Phillip Webb 30e295b5c4 Fix spring-boot-sample-test dependencies 9 years ago
Phillip Webb 2d243f0668 Don't apply multiple session configurations
Add additional @ConditionalOnMissingBean guards to session
configurations to ensure that the first wins. Also reorder imports
to prefer Redis over JDBC.

See gh-5158
9 years ago
Stephane Nicoll ebb4b067a2 Use error attributes in custom error page 9 years ago
Phillip Webb 6d069de79f Add convention based status error pages
Update `spring-boot-sample-web-mustache` to show how convention based
status error pages can be used.

See gh-2691
9 years ago
Phillip Webb 609cb52cd4 Move to relocated web classes
Refactor code to move from recently deprecated classes.

Closes gh-5822
9 years ago
Phillip Webb aea18671c1 Restructure web related classes
Reorganize web related classes for better separation of concerns.
Mainly this involves moving classes from `o.s.b.context.embedded`
that aren't directly tied to embedded servlet containers to
`o.s.b.web` and relocating everything from `o.s.b.context.web`.

See gh-5822
9 years ago
Phillip Webb a7cb689f95 Move @LocalServerPort annotation
Move the @LocalServerPort to org.springframework.boot.context.embedded
since it's only really useful when working with embedded servlet
containers.

See gh-5822
9 years ago
Stephane Nicoll c85948ac0c Fix cache sample README
Closes gh-5800
9 years ago
Stephane Nicoll 4c877a67a2 Fix cache sample README
Closes gh-5807
9 years ago
Eddú Meléndez 81bf3867e3 Fix spring-boot-sample-cache Infinispan example
Closes gh-5800
Closes gh-5806
9 years ago
Eddú Meléndez 7b9844f5de Polish spring-boot-sample-cache README
Closes gh-5807
9 years ago
Fabrizio Cucci c51efda2dc Fix spring-boot-sample-data-neo4j description
Replace "Redis" with "Neo4j".

Closes gh-5812
9 years ago
cjstehno 309f8484a7 Fix remote shell to support custom banners
Update the remote shell to use the `Banner` interface when possible.

Fixes gh-3988
Closes gh-5453
9 years ago
Stephane Nicoll f71a207a81 Polish 9 years ago
Fabrizio Cucci 3c901fef42 Removed redundant override of the configure method
Since the `SampleJerseyApplication` class is already passed in the
`SpringApplicationBuilder` constructor, there is no need to override the
configure method of the `SpringBootServletInitializer` class.

Closes gh-5773
9 years ago
Andy Wilkinson 71e665ba87 Update the spring-boot-samples README
Closes gh-5748
9 years ago
Stephane Nicoll 0cfcbeb40e Add dependency management for Ehcache 3
Closes gh-5725
9 years ago
Andy Wilkinson b9d7a39693 Update sample-parent-context following changes to integration starter
See gh-5528
9 years ago
Andy Wilkinson c068285586 Streamline Integration Starter and add Java DSL to it
This commit streamlines the Integration Starter by removing the file
http, ip, and stream modules as they are not always used by a majority
of apps that use Spring Integration and can also pull in other, unwanted
dependencies.

Additionally, a dependency on spring-integration-java-dsl has been
added. This makes it easy for users to configure Spring Integration
using Java configuration (the recommended approach), rather than via
XML. The Integration sample has been updated to use the DSL. Further
improvements could be made once the sample is using Java 8.

Closes gh-5528
9 years ago
Johnny Lim 6d48ee9593 Polish
Closes gh-5714
9 years ago
Phillip Webb 15dee60049 Restore spring-boot-starter-ws
Rename spring-boot-starter-webservices back to spring-boot-starter-ws.
Unfortunately the starter exists in Spring Boot 1.3 so we can't rename
it without consequence.

See gh-5711
9 years ago
Phillip Webb 5881c9c74f Polish 9 years ago
Andy Wilkinson 06c1dd87c9 Fix spring-boot-sample-test pom following Selenium changes in 35270e9 9 years ago
Stephane Nicoll cc0fc07c0e Move `shell.*` to `management.shell.*`
This commit moves the `shell` namespace to `management.shell`

Closes gh-5703
9 years ago
Stephane Nicoll f364d713dd Add `LocalManagementPort`
Add an annotation alias for the actual management port, similar to what
was done for the main context (`LocalServerPort`).

See gh-5548
9 years ago
Stephane Nicoll f561d9d9d8 Polish auto-configuration for Spring Web Services
Closes gh-5645
9 years ago
Vedran Pavic a7b3a913c2 Add auto-configuration for Spring Web Services
Closes gh-1045
9 years ago
Johnny Lim 90d897eb9d Polish
Closes gh-5685
9 years ago
Andy Wilkinson 69499bf329 Make configuration of acceptors and selectors compatible with Jetty 8
The ServerConnector class doesn’t exist in Jetty 8 so we have to
resort to reflection to create and configure a SelectChannelConnector
instead.

Closes gh-5649
See gh-5380
9 years ago
Phillip Webb fa142d929a Restore Jetty 8 compatibility
Acceptors and Selectors aren't supported with Jetty 8.

See gh-5380
9 years ago
Phillip Webb 944a49bd58 Tweak Elasticsearch sample timeout 9 years ago
Stephane Nicoll 99ae6dac53 Customize Couchbase's socket connect timeout
Our Windows build is failing currently because the couchbase server does
not handle a socket connection within a second (the default). This commit
adds a property to customize this option and set it to 10 sec in the
sample.

While investigating this issue, it turns out that while
`CouchbaseConfiguration` is public, it is not really possible to extend
it in user's configuration. This commit fixes this problem and add a test
that demonstrates how it can be used.

Closes gh-5657
9 years ago
Stephane Nicoll 82207ffce5 Attempt to fix Windows build
The couchbase instance in our windows infra seems super slow. Trying to
workaround that issue by increasing the connect timeout from 5 to 10 sec.

See gh-5651
9 years ago
Stephane Nicoll b374c288fa Fix configuration location 9 years ago
Phillip Webb 43d1d92611 Rework ImageBanner Support
Refactor several aspects of the ImageBanner:

- Extract a few new classes and methods from the previous code
- Directly encode ANSI rather than using `${}` properties
- Rework the scaling algorithm to prefer a fixed width
- Allow ImageBanner and TextBanner to be used together
- Rename several of the `banner.image` properties
- Add support for a left hand margin
- Add property meta-data

See gh-4647
9 years ago
Andy Wilkinson 66830ea1e5 Try to make SampleCassandraApplicationTests' port config more robust 9 years ago
Phillip Webb 48800f1818 Polish contribution 9 years ago
Gytis Trikleris a2adc5a130 Add Narayana JTA support
Add support for JBoss Narayana.

Fixes gh-5552
9 years ago
Phillip Webb 1b146f89f0 Fix failing test 9 years ago
Phillip Webb 01c9d72644 Polish 9 years ago
Andy Wilkinson fc6c57413b Update docs to fully reflect BOOT-INF executable archive layout changes
Closes gh-5195
9 years ago
Phillip Webb 1088f70923 Add Hibernate 4 sample
Add a sample showing how Hibernate 4 can be used if necessary.

See gh-2763
9 years ago
Andy Wilkinson e0f9da5afe Remove dependency management for Spring Shell
While the benign exception that Gemfire outputs is unfortunate, it
isn't sufficient justification for adding dependency management for
Spring Shell.

Closes gh-5444
9 years ago
Stephane Nicoll d4a1365a2a Polish contribution
Closes gh-5444
9 years ago
John Blum 67f92bff1e Polish Pivotal GemFire starter and sample
Closes gh-5439
9 years ago
Stephane Nicoll 05ef0818f8 Polish contribution
Closes gh-5511
9 years ago
Huang YunKun 6a2ff3f02a Upgrade elasticsearch to 2.2.0
Closes gh-5443
9 years ago
Phillip Webb b398b3319c Rename @SpringApplicationTest -> @SpringBootTest
Rename @SpringApplicationTest to SpringBootTest and
@SpringApplicationContextLoader to @SpringBootContextLoader.

Fixes gh-5562
9 years ago
Phillip Webb 4d404b214c Migrate away from @SpringApplicationConfiguration
Refactor internal tests to no longer use @SpringApplicationConfiguration

See gh-5562
9 years ago
Dave Syer 72db5becd6 Add comment to pom in sample explaining provided deps 9 years ago
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
9 years ago
Johnny Lim a28dd9d9e6 Polish
Closes gh-5532
9 years ago
Stephane Nicoll f7ffb017ad Relocate static asset
Closes gh-5504
9 years ago
Phillip Webb 50cb72cb48 Ignore failing Maven goal from Eclipse 9 years ago
Phillip Webb a3bfc29e6e Fix warnings 9 years ago
Stephane Nicoll fd437797b6 Polish contribution
This commit polihes the original Neo4j contribution in several areas.

Rather than providing the packages to scan, this commit rearranges the
`EntityScan` and `EntityScanRegistrar` so that the logic can be shared
for other components. If no package is provided, scanning now defaults to
the "auto-configured" package(s) and a `@NodeEntityScan` annotation
allows to override that.

The configuration has also been updated to detect the driver based on the
`uri` property. If the embedded driver is available we use that by
default. If it is not available, we're trying to connect to a Neo4j
server running on localhost. It is possible to disable the embedded mode
or set the `uri` parameter explicitly to deviate from these defaults.

The sample no longer relies on the embedded driver for licensing reason:
rather it expects an instance running on localhost (like other
data-related samples) and gracefully ignore any connection error. A
README has been added in the sample to further explain the available
options;

Closes gh-5458
9 years ago
Michael Hunger 0658cc8aee Add Neo4j support
See gh-5458
9 years ago
Andy Wilkinson 13d4409f32 Merge branch '1.3.x' 9 years ago
Andy Wilkinson 58ca9a1c5d Add a BuildInfo task for generating build.properties with Gradle
The commit adds a new BuildInfo task that can be used to generate
a build.properties file, intended for inclusion in the Actuator's
info endpoint.

A default instance of the task can be configure using the plugin's
DSL:

springBoot {
	buildInfo()
}

Additional properties can also be configured using the DSL:

springBoot {
	buildInfo {
		additionalProperties = [
			'foo': 'bar'
		]
	}
}

When configured via the DSL, the Java plugin's classes task is
configured to depend on the build info task. Alternatively, if more
control is required, the task can be declared and configured manually:

task buildInfo(type: org.springframework.boot.gradle.buildinfo.BuildInfo) {
	additionalProperties = [
		'foo': 'bar'
	]
}

classes {
	dependsOn buildInfo
}

See gh-2559
9 years ago
Phillip Webb 247bdf9c84 Add a new spring-boot-sample-test application
Add a sample application that demonstrates recently added testing
features.

See gh-4901
9 years ago
Phillip Webb 0829a1bde8 Drop superfluous annotations
Update internal tests to drop annotations that can now
be inferred.

Fixes gh-5470
9 years ago
Phillip Webb c28f552883 Migrate SpringJUnit4ClassRunner to SpringRunner
Replace all existing SpringJUnit4ClassRunner references with the new
SpringRunner alias.

Fixes gh-5292
9 years ago
Phillip Webb 2f815a907a Migrate existing tests from deprecated package
Update the existing tests to use the relocated `spring-boot-test`
classes. Restructuring was achieved using the following command:

find . -type f -name '*.java' -exec sed -i '' \
-e s/org.springframework.boot.test.ConfigFileApplicationContextInitializer/\
org.springframework.boot.test.context.ConfigFileApplicationContextInitializer/g \
-e s/org.springframework.boot.test.EnvironmentTestUtils/\
org.springframework.boot.test.util.EnvironmentTestUtils/g \
-e s/org.springframework.boot.test.IntegrationTest/\
org.springframework.boot.test.context.IntegrationTest/g \
-e s/org.springframework.boot.test.IntegrationTestPropertiesListener/\
org.springframework.boot.test.context.IntegrationTestPropertiesListener/g \
-e s/org.springframework.boot.test.OutputCapture/\
org.springframework.boot.test.rule.OutputCapture/g \
-e s/org.springframework.boot.test.SpringApplicationConfiguration/\
org.springframework.boot.test.context.SpringApplicationConfiguration/g \
-e s/org.springframework.boot.test.SpringApplicationContextLoader/\
org.springframework.boot.test.context.SpringApplicationContextLoader/g \
-e s/org.springframework.boot.test.SpringBootMockServletContext/\
org.springframework.boot.test.mock.web.SpringBootMockServletContext/g \
-e s/org.springframework.boot.test.TestRestTemplate/\
org.springframework.boot.test.web.client.TestRestTemplate/g \
-e s/org.springframework.boot.test.WebIntegrationTest/\
org.springframework.boot.test.context.web.WebIntegrationTest/g {} \;

See gh-5293
9 years ago
Andy Wilkinson 19d8c5e6f6 Complete the move to constructor injection in configuration classes
This is a follow-on from the work done in 5009933. Now that SPR-14015
has been fixed, constructor injection can also be used for parameterised
dependencies, including optional dependencies that are injected via
an ObjectProvider.

Closes gh-5306
9 years ago
Phillip Webb 8d08e816a7 Fix tests that fail when Redis is unavailable 9 years ago
n27 e41d42171b Improve ActiveMQ connection pool configuration
Closes gh-1598
9 years ago
Stephane Nicoll caf11e4445 Add Couchbase cache support
This commit updates the cache auto-configuration to provide a
`CouchbaseCacheManager` if a `Bucket` has been configured.

The global customizer infrastructure allows to further tune the cache
manager if necessary.

Closes gh-5176
9 years ago
Stephane Nicoll 10012cfddc Rename Maven plugin mojo
Rename the goal from `generate-build-info` to `build-info` for consistency.

See gh-2559
9 years ago
ddbullfrog 21c630828e Fix typo
Closes gh-5424
9 years ago
Stephane Nicoll 2526a54e31 Polish contribution
Closes gh-5337
9 years ago
Stephane Nicoll e67f2e2983 Separate Couchbase setup from Spring Data
This commit separates the basic setup of Couchbase from Spring Data so
that a `Bucket` and `Cluster` bucket beans are exposed even if Spring
Data is not available.

A basic setup happens if `spring.couchbase.bootstrap-hosts` is specified,
configuring the `default` bucket with no authentication unless specified
otherwise.

If Spring Data is available, those beans are re-used by default to
configure the `CouchbaseTemplate` and other repository-related beans.

Closes gh-5347
9 years ago
Stephane Nicoll dddea70985 Collect and display build information
This commit updates the Maven plugin to generate a
`META-INF/boot/build.properties` file with various build-specific
settings (group, artifact, name, version and build time). Additionally,
the plugin can be configured to write an arbitrary number of additional
properties.

A new `BuildProperties` bean is automatically exposed when such a file is
present. If that bean is present, an `InfoContributor` is automatically
created to expose that information under the `build` key.

As for the git contributor, it is possible to only display the core
settings or everything using the `management.info.build.mode` property.

See gh-2559
9 years ago
Andy Wilkinson 86d87f6b8a Deprecate support for Velocity
Support for Velocity has been deprecated in Spring Framework 4.3 with
the plan being to remove it in 5.0. This commit deprecates Spring
Boot's support in 1.4, with the plan being to remove it in 2.0.

Closes gh-5276
9 years ago