Commit Graph

7541 Commits

Author SHA1 Message Date
Phillip Webb 8a11620052 Fix failing test due to SPR-14093 2016-03-29 20:56:56 -07:00
Phil Webb 091245052f Update PULL_REQUEST_TEMPLATE.md 2016-03-29 17:08:17 -07:00
Stephane Nicoll 6dd84159f5 Restore JMX property to IntegrationJmxConfiguration
Closes gh-5309
2016-03-29 15:26:38 +02:00
Stephane Nicoll 00ae6ff9e2 Merge pull request #5488 from garyrussell/amqp-update
* pr/5488:
  Upgrade Spring AMQP to 1.6.0.M2
2016-03-29 15:18:12 +02:00
Gary Russell 701561eede Upgrade Spring AMQP to 1.6.0.M2
Closes gh-5488
2016-03-29 15:12:39 +02:00
Stephane Nicoll 0e46fc060c Merge pull request #5521 from eddumelendez/gh-5447
* pr/5521:
  Polish contribution
  Add `defaultValue` property in springProperty tag
2016-03-29 15:11:08 +02:00
Stephane Nicoll a66045fa98 Polish contribution
Closes gh-5521
2016-03-29 15:10:50 +02:00
Eddú Meléndez c86284cea3 Add `defaultValue` property in springProperty tag
This commit adds a `defaultValue` attribute to the `springProperty` tag
of Logback. That attribute can be used to specify a default value.

Closes gh-5447
2016-03-29 14:45:05 +02:00
Stephane Nicoll 54bea72554 Polish Jersey integration tests 2016-03-29 14:36:52 +02:00
Stephane Nicoll c752fac5c0 Expose load-on-startup for Jersey
This commit adds a `spring.jersey.filter.load-on-startup` property used to
customize the startup priority of the Jersey servlet.

Closes gh-5100
2016-03-29 14:18:18 +02:00
Stephane Nicoll 928f2dfc91 Sanitize keys with 'token' by default
This commit updates `Sanitizer` to sanitize by default a key containing
`token`.

Closes gh-5462
2016-03-29 13:28:13 +02:00
Stephane Nicoll 0c1dd1aac5 Merge pull request #5512 from rob-baily/issues-5465
* pr/5512:
  Polish contribution
  Add check for non empty list of factories
2016-03-29 13:05:56 +02:00
Stephane Nicoll 33967927db Polish contribution
Closes gh-5512
2016-03-29 13:04:28 +02:00
Rob Baily 971a7194d8 Add check for non empty list of factories
It was seeen that if a different plugin was used to package Spring Boot
that the project would load but no autoconfiguration actually took
place and many features were mysteriously not working.  Adding a check
to ensure that some factories are always loaded as this is expected.

Closes gh-5465
2016-03-29 12:58:16 +02:00
Stephane Nicoll 1b8f44ae2a Merge pull request #5498 from eddumelendez/gh-5483
* pr/5498:
  Polish contribution
  Add useAlwaysMessageFormat configuration key
2016-03-29 12:55:42 +02:00
Stephane Nicoll 1e0873c86e Polish contribution
Closes gh-5498
2016-03-29 12:55:35 +02:00
Eddú Meléndez 4912b989a5 Add useAlwaysMessageFormat configuration key
Allow to configure the `useAlwaysMessageFormat` attribute of
`MessageSource` via configuration.

Closes gh-5483
2016-03-29 12:50:39 +02:00
Andy Wilkinson 7db9280bf3 Rename the default BuildInfo task to bootBuildInfo
Previously, the default BuildInfo task created by the DSL was called
buildInfo. Due to Gradle's lack of namespacing for tasks, this meant
there was a slight risk that it could clash with another task. It
also didn't following the naming used by Boot's run task which is
named bootRun.

This commit renames the default BuildInfo task to bootBuildInfo to
match bootRun and to hopefully avoid clashes with tasks from other
plugins.

Closes gh-5518
2016-03-29 11:35:38 +01:00
Andy Wilkinson fc463afb89 Merge branch '1.3.x' 2016-03-29 11:16:16 +01:00
Andy Wilkinson 1043239de0 Ignore non-JavaExec run task when finding application's main class
Previously, FindMainClassTask would look for a property named main
on any class named run. This was based on the assumption that the
run task would be a JavaExec task (typically provided by the
application plugin). If the run task was not a JavaExec task (more
accurately, if it did not have a main property) this would result in
a build failure due to trying to read a non-existent property.

This commit updates FindMainClassTask to only use the main property
of the run task if the task is a JavaExec task. This guarantees that
the property will exist on the task, and unlike using any property
named main on a task named run, also guarantee that its value will
refer to a Java class with a main method.

Closes gh-5501
2016-03-29 11:03:47 +01:00
Stephane Nicoll abd86e50e0 Merge branch '1.3.x' 2016-03-29 11:30:28 +02:00
Stephane Nicoll ae095b2c1b Disable JMX Integration support if necessary
This commit fixes `IntegrationAutoConfiguration` to actually rely on the
auto-configured `MBeanServer` rather than attempting to create it again.

If JMX support is disabled, no attempt to register integration-related
MBeans is made.

Closes gh-5309
2016-03-29 11:27:24 +02:00
Stephane Nicoll 87b963b396 Merge branch '1.3.x' 2016-03-29 10:57:02 +02:00
Stephane Nicoll 3363415712 Polish documentation
Add a reference ot underscore notation

Closes gh-5268
2016-03-29 10:56:46 +02:00
Stephane Nicoll f7ffb017ad Relocate static asset
Closes gh-5504
2016-03-29 09:34:27 +02:00
Stephane Nicoll 6bc6cec1dc Merge pull request #5514 from oembedler/master
* pr/5514:
  Add graphql-spring-boot-starter reference
2016-03-29 09:15:12 +02:00
oEmbedler Inc 9cb6414821 Add graphql-spring-boot-starter reference
Closes gh-5514
2016-03-29 09:12:14 +02:00
Phillip Webb 8783f75d03 Add GitHub Issue and PR templates 2016-03-28 17:04:52 -07:00
Phillip Webb 07313d1245 Merge branch '1.3.x' 2016-03-28 12:52:49 -07:00
Phillip Webb 0a7a283f45 Apply logging system properties on reinitialize
Restore Spring Boot 1.3.2 behavior of re-applying system properties
when SLF4J based loggers are re-initialized. Reapplying system
properties is required when using the Spring Cloud config server since
PropertySourceBootstrapConfiguration directly calls the system
initialize method.

Fixes gh-5491
2016-03-28 12:49:05 -07:00
Stephane Nicoll d66ff0e42b Merge pull request #5508 from izeye/polish-20160328
* pr/5508:
  Polish
2016-03-28 11:47:14 +02:00
Johnny Lim 51bbe5e37a Polish
Closes gh-5508
2016-03-28 11:47:02 +02:00
Stephane Nicoll a2d161caf5 Merge pull request #5500 from izeye/tostring
* pr/5500:
  Fix MockDefinition.toString()
2016-03-27 17:52:18 +02:00
Johnny Lim 46517cddd8 Fix MockDefinition.toString()
Closes gh-5500
2016-03-27 17:52:03 +02:00
Phillip Webb 50cb72cb48 Ignore failing Maven goal from Eclipse 2016-03-25 12:46:53 -07:00
Phillip Webb a3bfc29e6e Fix warnings 2016-03-25 12:46:53 -07:00
Phillip Webb 609704a3bf Polish 2016-03-25 12:46:52 -07:00
Phillip Webb c68e5f12ff Formatting 2016-03-25 12:46:52 -07:00
Phillip Webb faba7a9514 Rename internal OutputCapture classes
Rename the internal versions of OutputCapture to prevent accidental
import.

See gh-5492
2016-03-25 12:46:52 -07:00
Phillip Webb f96cd144dc Remove internal EnvironmentTestUtils
Replace the internal EnvironmentTestUtils using in `spring-boot` tests
with Spring's TestPropertySourceUtils.

Fixes gh-5492
2016-03-25 11:23:17 -07:00
Stephane Nicoll aa171d1945 Merge pull request #5458 from jexp/contrib
* pr/5458:
  Polish contribution
  Add Neo4j support
2016-03-25 11:42:38 +01:00
Stephane Nicoll fd437797b6 Polish contribution
This commit polihes the original Neo4j contribution in several areas.

Rather than providing the packages to scan, this commit rearranges the
`EntityScan` and `EntityScanRegistrar` so that the logic can be shared
for other components. If no package is provided, scanning now defaults to
the "auto-configured" package(s) and a `@NodeEntityScan` annotation
allows to override that.

The configuration has also been updated to detect the driver based on the
`uri` property. If the embedded driver is available we use that by
default. If it is not available, we're trying to connect to a Neo4j
server running on localhost. It is possible to disable the embedded mode
or set the `uri` parameter explicitly to deviate from these defaults.

The sample no longer relies on the embedded driver for licensing reason:
rather it expects an instance running on localhost (like other
data-related samples) and gracefully ignore any connection error. A
README has been added in the sample to further explain the available
options;

Closes gh-5458
2016-03-25 11:39:49 +01:00
Michael Hunger 0658cc8aee Add Neo4j support
See gh-5458
2016-03-25 11:26:57 +01:00
Stephane Nicoll a413acee8b Merge branch '1.3.x' 2016-03-25 10:27:08 +01:00
Stephane Nicoll 422f3d12a3 Merge pull request #5489 from garyrussell/amqp-update13
* pr/5489:
  Upgrade Spring AMQP to 1.5.5.RELEASE
2016-03-25 10:26:16 +01:00
Gary Russell 67cffaebcc Upgrade Spring AMQP to 1.5.5.RELEASE
Closes gh-5489
2016-03-25 10:25:43 +01:00
Andy Wilkinson 13d4409f32 Merge branch '1.3.x' 2016-03-24 17:50:51 +00:00
Andy Wilkinson 86a9fc2f9a Upgrade to Undertow 1.3.19.Final
Closes gh-5264
2016-03-24 17:37:49 +00:00
Andy Wilkinson c42f859390 Ensure that ExplodedArchive lists its file in a consistent order
Closes gh-5422
2016-03-24 17:35:40 +00:00
Andy Wilkinson 209c2cf944 Polishing (again) 2016-03-24 17:23:13 +00:00