Commit Graph

946 Commits (fd2b41725299b497d4e5a1969eb3ec89688046f0)

Author SHA1 Message Date
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