root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
5,742 Commits 23 Branches 353 Tags 301 MiB
Commit Graph

5742 Commits

Author SHA1 Message Date
Phillip Webb 9a779a09b4 Merge branch '1.2.x' 2015-09-10 20:08:08 -07:00
Phillip Webb 86d5c19259 Don't mix collection values from different sources 
Update PropertySourcesPropertyValues so that collection values are only
added from a single PropertySource. Prior to this commit, given the
following:

    PropertySource-A
     list[0]=x

    PropertySource-B
     list[0]=y
     list[1]=z

PropertySourcesPropertyValues would take `x` from A and `z` from B,
resulting in a binding of `[x,z]`. The updated code now returns the
more logical `[x]`.

Fixes gh-2611
 2015-09-10 19:39:55 -07:00
Phillip Webb 394e52bce4 Polish PropertySourcesPropertyValues 2015-09-10 18:14:52 -07:00
Phillip Webb 16a1bd0483 Revert "Only format changed lines" 
This reverts commit e04fb15574.

Formatting only changed lines doesn't appear to work well.
 2015-09-10 17:38:59 -07:00
Phillip Webb e97042507b Restore cargo downloads directory to /tmp 
Using the $home directory seems to be causing intermittent failures on
the CI box.

See gh-3861
 2015-09-10 15:29:34 -07:00
Phillip Webb 3174f898c6 Fix failing logback test 
See gh-3924
 2015-09-10 15:18:11 -07:00
Phillip Webb 6746a0af7b Merge branch '1.2.x' 2015-09-10 15:02:20 -07:00
Phillip Webb 624350f41e Merge pull request #3605 from tan9/patch-3 
* pr/3605:
  Catch more general Hibernate 4.2 LinkageError
 2015-09-10 14:58:44 -07:00
Pei-Tang Huang a5430d8a0c Catch more general Hibernate 4.2 LinkageError 
Update HibernateJpaAutoConfiguration to catch LinkageError rather than
NoClassDefFoundError. Required due to the fact that JBoss EAP 6 wraps
NoClassDefFoundErrors.

Fixes gh-3605
 2015-09-10 14:58:26 -07:00
Phillip Webb b7e9f805c9 Set ignoreUnknownFields=true on ServerProperties 
Update ServerProperties so that unknown SERVER_* environment properties
do not cause startup failures.

Fixes gh-3903
 2015-09-10 14:49:41 -07:00
Phillip Webb e69a5879b0 Merge pull request #3926 from trecloux/gh-3924_propagate-log-level-to-JUL 
* gh-3926:
  Propagates logback log levels to java.util.logging
 2015-09-10 14:45:40 -07:00
Thomas Recloux 22e0a50a11 Propagates logback log levels to java.util.logging 
Adds the LevelChangePropagator logback listener in order to propagate
Logback's log level changes to java.util.logging loggers.

Logback documentation :
http://logback.qos.ch/manual/configuration.html#LevelChangePropagator

Fixes gh-3924
Closes gh-3926
 2015-09-10 14:44:45 -07:00
Stephane Nicoll 77eec2e0aa Fix typo 
Closes gh-3941
 2015-09-10 19:35:09 +02:00
Stephane Nicoll 002d3bd85d Add fast profile 
Checkstyle and animal sniffer takes a significant amount of time when
building the project.

Add a "fast" profile that flips the `disable.checks` property. Can be
enabled either via `-Pfast` or `-Ddisable.checks=true`.

See gh-3928
 2015-09-10 15:23:20 +02:00
Stephane Nicoll e70f02c4a2 Relocate checkstyle configuration 
See gh-3928
 2015-09-10 09:40:26 +02:00
Phillip Webb 269815dbcf Make LaunchedURLClassLoader constructor public 
Restore the public constructor in LaunchedURLClassLoader which was
accidentally removed in commit e07df7e4c6.
 2015-09-09 09:20:34 -07:00
Stephane Nicoll 75a7ac6d83 Merge pull request #3933 from izeye/patch-38 
* pr/3933:
  Polish doc
 2015-09-09 17:37:23 +02:00
izeye 1f91c342e1 Polish doc 
Closes gh-3933
 2015-09-09 17:37:09 +02:00
Phillip Webb 43528abe1e Try to get cargo working 2015-09-08 19:15:35 -07:00
Phillip Webb c813060f18 Add checkstyle to build 
Fixes gh-3928
 2015-09-08 17:01:42 -07:00
Phillip Webb e674d751de Polish Javadoc 2015-09-08 17:01:36 -07:00
Phillip Webb e07df7e4c6 Remove redundant modifiers 2015-09-08 17:01:30 -07:00
Phillip Webb 460ca75fce Polish newline at end of file 2015-09-08 16:05:22 -07:00
Phillip Webb d09805fd75 Polish license headers 2015-09-08 16:05:05 -07:00
Phillip Webb 1983b43830 Polish POM descriptions 2015-09-08 16:05:01 -07:00
Phillip Webb 6e29ee4557 Polish 2015-09-08 16:04:30 -07:00
Phillip Webb 67402405db Reformat code 2015-09-08 14:56:40 -07:00
Phillip Webb 2615990ffb Organize imports 2015-09-08 14:40:35 -07:00
Phillip Webb 0335053139 Merge branch '1.2.x' 2015-09-08 14:37:16 -07:00
Phillip Webb e04fb15574 Only format changed lines 
Update Eclipse cleanup actions to only format changed lines. This will
hopefully help to prevent so many false diffs caused by differences
between Eclipse Luna and Eclipse Mars.
 2015-09-08 14:27:29 -07:00
Phillip Webb 15686ed4fd Reformat code 2015-09-08 14:07:06 -07:00
Phillip Webb 0f6b60d8c8 Organize imports 2015-09-08 14:05:00 -07:00
Phillip Webb 653d2b2b4e Tweak eclipse settings 
- Update whitespace after inline generics
- Use a more sensible import order
- Update Javadoc warning settings
 2015-09-08 13:40:47 -07:00
Phillip Webb 026c3019df Polish 2015-09-08 13:37:28 -07:00
Andy Wilkinson b31e578489 Upgrade to Spring REST Docs 1.0.0.RC1 2015-09-08 21:10:38 +01:00
Stephane Nicoll f7a1db8e25 Polish 2015-09-08 16:17:04 +02:00
Stephane Nicoll 5453f7c59c Fix broken build 
Commit c85f4df0ee broke the build as some tests are expecting HSQL to be
used. We now specify the name of the database rather than specifying the
jdbc url.
 2015-09-08 16:16:13 +02:00
Stephane Nicoll ac582709e7 Clarify doc 
Closes gh-3858
 2015-09-08 14:04:39 +02:00
Stephane Nicoll 03302667d9 Fix meta-data 
Closes gh-3922
 2015-09-08 12:55:02 +02:00
Stephane Nicoll c85f4df0ee Polish 
Upgrade sample to use H2 and expose the web console by default.
 2015-09-08 10:20:46 +02:00
Stephane Nicoll 15fd30e920 Merge pull request #3917 from izeye/patch-37 
* pr/3917:
  Fix a broken link in the doc
 2015-09-07 19:01:50 +02:00
izeye 99a14c3f58 Fix a broken link in the doc 
Closes gh-3917
 2015-09-07 19:01:29 +02:00
Stephane Nicoll ed78b34dfd Merge pull request #3909 from johnktims/patch-1 
* pr/3909:
  Fix typo
 2015-09-07 08:48:50 +02:00
John Tims 4ae07e66ac Fix typo 
Closes gh-3909
 2015-09-07 08:48:27 +02:00
Stephane Nicoll 1a71eb1f3b Move spring-restdocs version to dependency management 
Closes gh-3905
 2015-09-06 15:38:43 +02:00
Phillip Webb 690da89c82 Fix warnings 2015-09-05 00:21:09 -07:00
Phillip Webb 85bb347fba Add eclipse specific profile to set execution env 
Update the parent POM to include a new profile which is automatically
enabled by eclipse.

The profile duplicates `default` and also set the compiler version to
1.8. This means that M2E sets the execution environment to `JavaSE-1.8`
but the command line build still compiles 1.6 compatible code.

Fixes gh-3618
 2015-09-04 22:17:25 -07:00
Phillip Webb 899537deb0 Use dashed property form in documentation 2015-09-03 15:47:55 -07:00
Phillip Webb 8e0e825e8d Merge pull request #3741 from ilayaperumalg/jar-launcher-access 
* gh-3741:
  Make it easier to subclass Launchers
 2015-09-03 15:07:43 -07:00
Ilayaperumal Gopinathan 61ac04aa4c Make it easier to subclass Launchers 
Change constructors from `package private` to `protected` for subclasses
to use.

Closes gh-3741
 2015-09-03 14:40:23 -07:00