Commit Graph

5716 Commits (94a737638eb6ac0412da922e0807d96b9ef25fff)
 

Author SHA1 Message Date
Andy Wilkinson 94a737638e Update launch script to specify -jar as last option
The recommended usage for the java executable is:

    java [-options] -jar jarfile [args...]

This commit updates the default launch script to match this recommended
usage by moving -jar to be the last option, after both the
disableJarChecking system property and any JAVA_OPTS.

Closes gh-3930
9 years ago
Andy Wilkinson 1ce0ba6171 Upgrade to Spring Social Twitter 1.1.1.RELEASE
Closes gh-3913
9 years ago
Stephane Nicoll 9a8dcab1db Merge pull request #3967 from izeye/patch-40
* pr/3967:
  Polish Javadoc
9 years ago
izeye 97167ce608 Polish Javadoc
Closes gh-3967
9 years ago
Andy Wilkinson be07a8a4c2 Merge branch 'gh-3943' 9 years ago
Andy Wilkinson bfc0745616 Add test for merging packages from multiple @ServletComponentScans 9 years ago
izeye 20da79e9bd Use mergedPackages in ServletComponentScanRegistrar
Closes gh-3943
9 years ago
Andy Wilkinson c274162e6f Correct since version in javadoc of Any and AllNestedCondition 9 years ago
Andy Wilkinson a9d67213be Override Eclipse’s formatting to keep Checkstyle happy
See gh-3964
9 years ago
Andy Wilkinson 95c8af462e Merge branch 'gh-3955' 9 years ago
Andy Wilkinson 2fd8a58197 Polish contribution
- Rename local variable to avoid shadowing field with the same name
 - Add a test to verify that local.mongo.port is set on the parent
   context

Closes gh-3955
9 years ago
Paweł Doleciński 8f5a753eff Fix propagation of local.mongo.port up the context hierarchy
Previously, a StackOverflowError would occur when using a random port
for embedded mongo as the logic for propagating the property up the
context hierarchy would repeatedly use the leaf context's parent.

This commit updates the logic to look to see if the current context
has a parent, only calling the method again if it does.

Closes gh-3956
9 years ago
Andy Wilkinson b79ca614a1 Replace usage of deprecated API in EmbeddedMongoAutoConfiguration 9 years ago
Stephane Nicoll 4805642931 Merge pull request #3946 from izeye/patch-39
* pr/3946:
  Polish tests
9 years ago
izeye 17d0dc5a86 Polish tests
Closes gh-3946
9 years ago
Phillip Webb 3444ebbc05 Merge branch '1.2.x' 9 years ago
Phillip Webb 11d59df3fd Add registerErrorPageFilter option flag
Update SpringBootServletInitializer with a registerErrorPageFilter flag
that can be used to disable ErrorPageFilter registration.

Fixes gh-3603
9 years ago
Phillip Webb de48223a2e Only handle status errors when sendError is called
Update ErrorPageFilter to only handle errors when `response.sendError`
has been called. This should allow custom @ExceptionHandlers to
completely handle errors and return custom status codes without
triggering the "Cannot forward to error page" log message.

The Javadoc for sendError states:

  "The server defaults to creating the response to look like an
   HTML-formatted server error page containing the specified message"

Where as setStatus states

  "This method is used to set the return status code when there is
   no error "

Fixes gh-2745
9 years ago
Phillip Webb 5f250ebbc1 Add exception endpoints to tomcat-jsp sample
Update `spring-boot-sample-tomcat-jsp` to include endpoints that trigger
exceptions. Primarily to aid testing of the ErrorPageFilter.

See gh-2745
9 years ago
Stephane Nicoll 93700d00de Merge pull request #3936 from eddumelendez/gh-3935
* pr/3936:
  Polish contribution
  Expose actuator endpoints for flyway and liquibase
9 years ago
Stephane Nicoll 0d2797ddd5 Polish contribution
Closes gh-3936
9 years ago
Eddú Meléndez 591f016e90 Expose actuator endpoints for flyway and liquibase
Update the samples to expose the relevant actuator endpoint.

Closes gh-3935
9 years ago
Stephane Nicoll 2a779db74d Upgrade to Spring Integration 4.2.0.RELEASE
Closes gh-3944
9 years ago
Stephane Nicoll 4cdf03a178 Upgrade to Spring AMQP 1.5.0.RELEASE
Closes gh-3940
9 years ago
Phillip Webb 9a779a09b4 Merge branch '1.2.x' 9 years ago
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
9 years ago
Phillip Webb 394e52bce4 Polish PropertySourcesPropertyValues 9 years ago
Phillip Webb 16a1bd0483 Revert "Only format changed lines"
This reverts commit e04fb15574.

Formatting only changed lines doesn't appear to work well.
9 years ago
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
9 years ago
Phillip Webb 3174f898c6 Fix failing logback test
See gh-3924
9 years ago
Phillip Webb 6746a0af7b Merge branch '1.2.x' 9 years ago
Phillip Webb 624350f41e Merge pull request #3605 from tan9/patch-3
* pr/3605:
  Catch more general Hibernate 4.2 LinkageError
9 years ago
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
9 years ago
Phillip Webb b7e9f805c9 Set ignoreUnknownFields=true on ServerProperties
Update ServerProperties so that unknown SERVER_* environment properties
do not cause startup failures.

Fixes gh-3903
9 years ago
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
9 years ago
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
9 years ago
Stephane Nicoll 77eec2e0aa Fix typo
Closes gh-3941
9 years ago
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
9 years ago
Stephane Nicoll e70f02c4a2 Relocate checkstyle configuration
See gh-3928
9 years ago
Phillip Webb 269815dbcf Make LaunchedURLClassLoader constructor public
Restore the public constructor in LaunchedURLClassLoader which was
accidentally removed in commit e07df7e4c6.
9 years ago
Stephane Nicoll 75a7ac6d83 Merge pull request #3933 from izeye/patch-38
* pr/3933:
  Polish doc
9 years ago
izeye 1f91c342e1 Polish doc
Closes gh-3933
9 years ago
Phillip Webb 43528abe1e Try to get cargo working 9 years ago
Phillip Webb c813060f18 Add checkstyle to build
Fixes gh-3928
9 years ago
Phillip Webb e674d751de Polish Javadoc 9 years ago
Phillip Webb e07df7e4c6 Remove redundant modifiers 9 years ago
Phillip Webb 460ca75fce Polish newline at end of file 9 years ago
Phillip Webb d09805fd75 Polish license headers 9 years ago
Phillip Webb 1983b43830 Polish POM descriptions 9 years ago
Phillip Webb 6e29ee4557 Polish 9 years ago