Commit Graph

6966 Commits (81fdc99fb0c2a74936069d45a8d41f273a939de0)
 

Author SHA1 Message Date
Stephane Nicoll 2a8a3741f5 Merge DriverClassNameProvider in DatabaseDriver
DriverClassNameProvider is unused but was probably restored by a merge
commit at some point. It wasn't obvious and updated that class rather
than `DatabaseDriver`.

This commit updates `DatabaseDriver` and deletes
`DriverClassNameProvider`.

Closes gh-5076
9 years ago
Andy Wilkinson 4597b61626 Merge branch '1.3.x' 9 years ago
Andy Wilkinson ec8f7d3a0f Upgrade to SLF4J 1.7.15
Closes gh-5044
9 years ago
Andy Wilkinson 9c40d43a72 Merge branch '1.3.x' 9 years ago
Andy Wilkinson aab678f499 Upgrade to Undertow 1.3.17.Final
Closes gh-5108
9 years ago
Stephane Nicoll b82fb5e5a6 Merge branch '1.3.x' 9 years ago
Stephane Nicoll 6710c05750 Document `DeprecatedConfigurationProperty`
Closes gh-5118
9 years ago
Stephane Nicoll ebffa493e4 Harmonize ConfigurationProperties bean name
When `@EnableConfigurationProperties` is defined, Spring Boot
automatically registers a bean in the context for each class specified
on the annotation. Previously, the name of the bean only included the
prefix which leads to conflict if two different classes use the same
prefix.

This commit changes the bean name structure to be <prefix>-<fqn> where
prefix is the prefix used on the annotation and <fqn> the fully qualified
name of the target class.

Closes gh-4395
9 years ago
Phillip Webb 2b18e99ac7 Polish 9 years ago
Andy Wilkinson 77d426c284 Merge branch '1.3.x' 9 years ago
Andy Wilkinson a1fefb15ba Merge pull request #5059 from Vedran Pavić
* gh-5059:
  Remove Docker container after launch script test execution
9 years ago
Vedran Pavic 6540b1f383 Remove Docker container after launch script test execution
Closes gh-5059
9 years ago
Andy Wilkinson f12bb26649 Merge branch '1.3.x' 9 years ago
Andy Wilkinson 29c7b93640 Update SpringApplicationBuilder to pass args to parent when it's run
Closes gh-5103
9 years ago
Stephane Nicoll b896de404e Merge pull request #4188 from eddumelendez/gh-4131
* pr/4188:
  Polish contribution
  Add support of Jackson in Jersey
9 years ago
Stephane Nicoll a27176807f Polish contribution
Closes gh-4188
9 years ago
Eddú Meléndez 5776d6a8d7 Add support of Jackson in Jersey
If Jackson is configured for the project, the `ObjectMapper` is now
reused and added in the Jersey's context.

Closes gh-4131
9 years ago
Phillip Webb 410dedc567 Add AssertJ to Eclipse Oomph Setup 9 years ago
Phillip Webb f15f12d7e4 Merge branch 'gh-5083' 9 years ago
Phillip Webb cc5d4b8b7f Add AssertJ checkstyle rule
Closes gh-5083
9 years ago
Phillip Webb c5add2ef08 Use AssertJ in spring-boot-deployment-tests
See gh-5083
9 years ago
Phillip Webb e214fa0949 Use AssertJ in spring-boot-integration-tests
See gh-5083
9 years ago
Phillip Webb 1cc1fc6431 Use AssertJ in spring-boot-samples
See gh-5083
9 years ago
Phillip Webb 962a598531 Use AssertJ in spring-boot-cli
See gh-5083
9 years ago
Phillip Webb 00cfe1d054 Use AssertJ in spring-boot-tools
See gh-5083
9 years ago
Phillip Webb 7f9358f4d8 Use AssertJ in spring-boot-devtools
See gh-5083
9 years ago
Phillip Webb 94677b35f8 Use AssertJ in spring-boot-actuator
See gh-5083
9 years ago
Phillip Webb a5ae81c1c1 Use AssertJ in spring-boot-autoconfigure
See gh-5083
9 years ago
Phillip Webb e19e3209d9 Use AssertJ in spring-boot
See gh-5083
9 years ago
Phillip Webb 8b4d801dd6 Add support for AssertJ
Add AssertJ as a managed dependency and also include it in
spring-boot-starter-test. Also provide a simple adapter class to allow
Hamcrest matchers to be used as AssertJ Conditions.

Fixes gh-5048
9 years ago
Phillip Webb 516afcd2ca Polish 9 years ago
Phillip Webb ed01ae9ebf Use deterministic DataSource config import order
Update DataSourceAutoConfiguration so that pooled datasource
configurations are only loaded via an @Import. If left as nested
classes, the load order is JVM specific and can result in the wrong
configuration being loaded.

Closes gh-2183
9 years ago
Phillip Webb 3d0355434c Drop unneeded version tag from POM.xml 9 years ago
Andy Wilkinson 9dbef5d9b0 Remove use a separate runner thread from the Launcher
Previously, the Launcher was creating a new runner thread that would
call the application's main method. An exception thrown by this thread
is handled differently to one thrown by the JVM's main thread leading
to different exit behaviour. Furthermore, the separate thread isn't
actually necessary.

This commit removew the use of a separate runner thread from the
Launcher. This means that the JVM's exit behaviour will be consistent
and also removes the overhead of createing a starting an extra thread.

Closes gh-5006
9 years ago
Andy Wilkinson 8f57f4ca63 Merge branch '1.3.x' 9 years ago
Andy Wilkinson c0a2c88da1 Stop referring to optional classes in BeanDefinitionLoader’s signature
Previously, BeanDefinitionLoader declared a field of type
GroovyBeanDefinitionReader which is a GroovyObject subclass. This is
problematic as BeanDefinitionLoader is always loaded but Groovy is an
optional dependency. Even on a JVM where class verification is performed
lazily, this can still cause problems if something reflectively tries
to access the class’s declared fields. On a JVM where classes are
verified at load time, it would be impossible to start a Spring Boot
application without having Groovy on the classpath.

This commit changes the field to be a BeanDefinitionReader, removing
the indirect reference to GroovyObject form BeanDefinitionLoader’s
signature. The reader is downcast to a GroovyBeanDefinitionReader in the
body of a method body that will only be invoked when Groovy is on the
classpath.

Closes gh-5040
9 years ago
Phillip Webb 34a864447f Merge branch '1.3.x' 9 years ago
Phillip Webb 43a5b77256 Ensure logback is reset after test
Update SpringBootJoranConfiguratorTests to ensure that logback
is left in a sane state. Prior to this commit, running all tests
in eclipse would fail due to ErrorPageFilterTests expecting
specific log output.
9 years ago
Phillip Webb a80ada64c3 Formatting 9 years ago
Stephane Nicoll 4c3b11030f Merge pull request #5075 from vpavic/update-database-driver
* pr/5075:
  Fix MariaDB driver class name
9 years ago
Vedran Pavic 1bc3eb8f0a Fix MariaDB driver class name
Closes gh-5075
9 years ago
Stephane Nicoll 34d87df425 Clarify use of the `spring.datasource` prefix
Previously, Spring Boot mapped both `DataSourceProperties` and the actual
`DataSource` implementation to the same prefix. This results in a huge
amount of keys in the `spring.datasource` namespace  with no way to
identify those that are valid for the pooled data source in use.

This commit maps the four pooled data sources we support in four isolated
namespace, keeping `spring.datasource` only for the common settings.

These are `spring.datasource.tomcat`, `spring.datasource.hikari`,
`spring.datasource.dbcp` and `spring.datasource.dbcp2` for the Tomcat,
Hikari, Commons DBCP and Commons DBCP2 implementations respectively.

Closes gh-2183
9 years ago
Phillip Webb bbc0dc69eb Polish 9 years ago
Stephane Nicoll 5bfccf42c4 Merge branch '1.3.x' 9 years ago
Karol Rynio 19afae7fe6 Fix typos
Closes gh-5025
9 years ago
Stephane Nicoll 2a5c686a80 Merge pull request #5060 from jvmlet/master
* pr/5060:
  Add ref to Google gRPC starter
9 years ago
jvmlet 71395a728d Add ref to Google gRPC starter
Closes gh-5060
9 years ago
Stephane Nicoll d232475fd1 Merge pull request #5067 from izeye/polish-20160202
* pr/5067:
  Fix typos
9 years ago
Johnny Lim 46540de694 Fix typos
Closes gh-5067
9 years ago
Stephane Nicoll f5edd53d86 Merge branch '1.3.x' 9 years ago