Commit Graph

5918 Commits

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
2015-09-21 14:51:03 +01:00
Andy Wilkinson
1ce0ba6171 Upgrade to Spring Social Twitter 1.1.1.RELEASE
Closes gh-3913
2015-09-21 14:19:40 +01:00
Phillip Webb
d22d0683b2 Fixup build following release 2015-09-16 12:03:23 -04:00
Spring Buildmaster
9409c49c10 Next development version 2015-09-16 09:00:17 -07:00
Stephane Nicoll
9a8dcab1db Merge pull request #3967 from izeye/patch-40
* pr/3967:
  Polish Javadoc
2015-09-15 22:25:40 -04:00
izeye
97167ce608 Polish Javadoc
Closes gh-3967
2015-09-15 22:24:59 -04:00
Andy Wilkinson
be07a8a4c2 Merge branch 'gh-3943' 2015-09-15 17:07:15 -04:00
Andy Wilkinson
bfc0745616 Add test for merging packages from multiple @ServletComponentScans 2015-09-15 17:06:49 -04:00
izeye
20da79e9bd Use mergedPackages in ServletComponentScanRegistrar
Closes gh-3943
2015-09-15 17:06:23 -04:00
Andy Wilkinson
c274162e6f Correct since version in javadoc of Any and AllNestedCondition 2015-09-15 16:43:11 -04:00
Andy Wilkinson
a9d67213be Override Eclipse’s formatting to keep Checkstyle happy
See gh-3964
2015-09-15 07:15:02 -04:00
Andy Wilkinson
95c8af462e Merge branch 'gh-3955' 2015-09-15 06:59:25 -04:00
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
2015-09-15 06:58:53 -04:00
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
2015-09-15 06:56:11 -04:00
Andy Wilkinson
b79ca614a1 Replace usage of deprecated API in EmbeddedMongoAutoConfiguration 2015-09-15 06:41:15 -04:00
Stephane Nicoll
4805642931 Merge pull request #3946 from izeye/patch-39
* pr/3946:
  Polish tests
2015-09-13 18:08:48 -04:00
izeye
17d0dc5a86 Polish tests
Closes gh-3946
2015-09-13 18:08:01 -04:00
Phillip Webb
3444ebbc05 Merge branch '1.2.x' 2015-09-11 13:50:56 -07:00
Phillip Webb
11d59df3fd Add registerErrorPageFilter option flag
Update SpringBootServletInitializer with a registerErrorPageFilter flag
that can be used to disable ErrorPageFilter registration.

Fixes gh-3603
2015-09-11 13:03:10 -07:00
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
2015-09-11 12:27:39 -07:00
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
2015-09-11 12:25:48 -07:00
Stephane Nicoll
93700d00de Merge pull request #3936 from eddumelendez/gh-3935
* pr/3936:
  Polish contribution
  Expose actuator endpoints for flyway and liquibase
2015-09-11 16:24:29 +02:00
Stephane Nicoll
0d2797ddd5 Polish contribution
Closes gh-3936
2015-09-11 16:23:38 +02:00
Eddú Meléndez
591f016e90 Expose actuator endpoints for flyway and liquibase
Update the samples to expose the relevant actuator endpoint.

Closes gh-3935
2015-09-11 16:22:45 +02:00
Stephane Nicoll
2a779db74d Upgrade to Spring Integration 4.2.0.RELEASE
Closes gh-3944
2015-09-11 13:54:39 +02:00
Stephane Nicoll
4cdf03a178 Upgrade to Spring AMQP 1.5.0.RELEASE
Closes gh-3940
2015-09-11 13:50:19 +02:00
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