Commit Graph

10144 Commits (a90bad37bd876258aa5b6e7a7ac2b1b6d6cce62a)
 

Author SHA1 Message Date
Phillip Webb a90bad37bd Merge branch '1.5.x' 8 years ago
Phillip Webb a35a1022c2 Update force-stop to respect STOP_WAIT_TIME
Closes gh-6223
8 years ago
Phillip Webb 89569db75a Merge pull request #7787 from kazuki43zoo/polish-gh-6223
* pr/7787:
  Add force-stop to launch.script usage
8 years ago
Kazuki Shimizu 40691d07f8 Add force-stop to launch.script usage
See gh-6223
Closes gh-7787
8 years ago
Phillip Webb b27f4e23be Ignore @ImportAutoConfiguration exclude errors
Update `ImportAutoConfigurationImportSelector` to ignore excludes for
classes that aren't loaded. Since the import classes for tests tend to
be much more limited, the exception isn't really helpful.

Closes gh-6809
8 years ago
Phillip Webb b76978ff7e Try to prevent Travis build failures
Update LiveReloadServerTests which seems to be failing intermittently
on Travis.
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
Phillip Webb f8acaae115 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 9ccf47398e Formatting 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 22a384ac28 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 1f3de10101 Merge pull request #7793 from kazuki43zoo:polishing-log-message
* pr/7793:
  Polishing log message and comment
8 years ago
Kazuki Shimizu 85503fcbca Polishing log message and comment
Closes gh-7793
8 years ago
Stephane Nicoll a90a73d1ac Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 7b494cf319 Polish
See gh-7793
8 years ago
Stephane Nicoll 9dfaf4de06 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3ed5a723bb Polish log4j2 sample 8 years ago
Stephane Nicoll 0b67a89bc6 Merge branch '1.5.x' 8 years ago
Stephane Nicoll c230a21a8c Polish CacheManagerCustomizers
Closes gh-7792
8 years ago
Stephane Nicoll 2f3571f173 Defend against lambda transaction customizers
Update `CacheManagerCustomizers` to deal directly with
`ClassCastException` assuming that they are because a customizer is
implemented using a lambda.

Closes gh-7788
8 years ago
Stephane Nicoll 1fa8b1ac91 Defend against lambda transaction customizers
Update `CacheManagerCustomizers` to deal directly with
`ClassCastException` assuming that they are because a customizer is
implemented using a lambda.

Closes gh-7788
8 years ago
Phillip Webb 86a42e4e44 Merge branch '1.5.x' 8 years ago
Phillip Webb 54aeff47a2 Add exclude support to @ImportAutoConfiguration
Update `@ImportAutoConfiguration` with support for an exclude attribute
that works in a similar way to `@EnableAutoConfiguration`.

Also update existing `@Test...` annotation with exclude attribute
aliases.

Fixes gh-6809
8 years ago
Phillip Webb 4d73f3d2e9 Merge branch '1.5.x' 8 years ago
Phillip Webb 75186d42da Merge pull request #6223 from gauravbrills/patch-1
* pr/6223:
  Add `force-stop` support to launch script
8 years ago
Gaurav Rawat 509be7474d Add `force-stop` support to launch script
Update the embedded launch script to support `force-stop`.

Closes gh-6223
8 years ago
Phillip Webb 3c930347c5 Defend against lambda transaction customizers
Update `TransactionManagerCustomizers` to deal directly with
`ClassCastExceptions` assuming that they are because a customizer is
implemented using a lambda.

See gh-7561
8 years ago
Phillip Webb 4b853c2107 Merge pull request #7786 from kazuki43zoo/polish-gh-7561
* pr/7786:
  Remove a nested TransactionProperties
8 years ago
Kazuki Shimizu a7b77e6f9a Remove a nested TransactionProperties
Remove a few nested `TransactionProperties` that should have been
deleted in commit f22744c748.

See gh-7561
Closes gh-7786
8 years ago
Phillip Webb 90fb309f1e Merge branch '1.5.x' 8 years ago
Phillip Webb 8854526c5e Refine 'No log4j2 configuration file found' hiding
Refine commit 1e9e1b04d0 since it unfortunately had the side-effect of
disabling logging when a valid `log4j2.xml` file was found.

The updated code uses a similar technique but instead of accepting
'*' as a file type it now looks for `.springboot` (which it finds
because we ship a `log4j2.springboot` file in out JAR.

Rather than exiting Log4J2's `ConfigurationFactory.Factory`
`getConfiguration` method early, our `SpringBootConfigurationFactory`
is now only triggered on the last call to `getConfiguration`.

Closes gh-4809
8 years ago
Stephane Nicoll 68d95f953a Merge branch '1.5.x' 8 years ago
Stephane Nicoll 7c25ccb0f3 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 1f5970c537 Fix auto-configuration class reference
Closes gh-7781
8 years ago
Stephane Nicoll 301b8bc611 Make the dependency to TransactionAutoConfiguration explicit
Closes gh-7773
8 years ago
Stephane Nicoll 6ba4b3cf86 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 4b641ca211 Polish
Closes gh-7561
8 years ago
Stephane Nicoll 4d1fdb0067 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 082a246f9d Merge pull request #7776 from artembilan:Spring_AMQP_1.7.RC1
* pr/7776:
  Upgrade to Spring AMQP 1.7.0.RC1
8 years ago
Artem Bilan 86ad50f77b Upgrade to Spring AMQP 1.7.0.RC1
Closes gh-7776
8 years ago
Phillip Webb f9bbe43791 Merge branch '1.5.x' 8 years ago
Phillip Webb f22744c748 Add support for TransactionManagerCustomizers
Add a `TransactionManagerCustomizer` callback interface that can be
used to customize auto-configured `PlatformTransactionManagers`.

Also update `...transaction.*` properties under a single unified
`spring.transaction...` key since the existing auto-configurations
would often share a transaction manager (the technology specific
transaction managers are `@ConditionalOnMissingBean` and may use
a manager created by a previous auto-configuration).

See gh-7561
8 years ago
Phillip Webb 601f7c0a69 Polish 8 years ago
Phillip Webb 38271b7397 Merge branch '1.5.x' 8 years ago
Phillip Webb 367963f29f Polish 8 years ago