Commit Graph

7479 Commits (55ad905d98b257c3c1b4981f0cc44ba194bf6950)
 

Author SHA1 Message Date
Andy Wilkinson 55ad905d98 Merge pull request #5623 from Eddú Meléndez
* gh-5623:
  Upgrade to Spring Data Hopper SR1
9 years ago
Eddú Meléndez cc7fe7b85a Upgrade to Spring Data Hopper SR1
Closes gh-5623
9 years ago
Andy Wilkinson e5a253e689 Improve diagnostics when OnBeanCondition type deduction fails
When @ConditionalOnBean or @ConditionalOnMissingBean are used on a
@Bean method, they will, in the absence of any other configuration,
attempt to deduce the bean's type by examining the method's return
type. This deduction can fail. See gh-4841, gh-4934, and gh-5624
for some examples of possible failure causes. Previously, this
failure was only logged as a debug message leaving the user with a
misleading message suggesting that the @ConditionalOnBean or
@ConditionalOnMissingBean annotation was not configured correctly.

This commit improves the diagnostics by mention the possibility of
type deduction in the exception message and including the exception
that caused deduction to fail as the cause.

Closes gh-4934
9 years ago
Andy Wilkinson a37ae5d556 Polish test property source changes made in 69b08291
TestPropertySourcesInitializer needs to be ordered with a high
precedence, specifically higher than
ContextIdApplicationContextInitializer, to ensure that any properties
used in setting the context’s id are available in the environment.

Closes gh-4828
9 years ago
Dave Syer 9b121dcbaa Make MustacheViewResolver extend AbstractTemplateViewResolver
The Mustache support should still be usable outside a web application
because the properties only use web stuff in that context and don't
have any field or method signatures that depend on web.

Fixes gh-5626
9 years ago
Andy Wilkinson 69b0829199 Align precedence of @SpringBootTest properties with @TestPropertySource
This commit updates the precedence of properties configured using
@SpringBootTest to align with @TestPropertySource. Properties configured
using properties on @SpringBootTest are now added to the same property
source as those configured using properties on @TestPropertySource so
the precedence described in the javadoc of @TestPropertySource now
applies in full. Additionally, if both @TestPropertySource properties
and @SpringBootTest properties configure the same property, the value
from @TestPropertySource will win.

Closes gh-4828
9 years ago
Stephane Nicoll 5f5db1703c Merge pull request #5622 from eddumelendez/gh-5621
* pr/5622:
  Add dependency jackson-module-kotlin
9 years ago
Eddú Meléndez e50aac73ed Add dependency jackson-module-kotlin
Auto-detection for Kotlin Jackson Module was added in Spring 4.3.0.RC1.
This commit provides the dependency management to handle the right
version.

Closes gh-5622
9 years ago
Phillip Webb 75c76838b5 Add Narayana reference documentation
Closes gh-5552
9 years ago
Phillip Webb 9f1466c9a3 Refine Narayana log directory logic
Refine the log directory logic used by Narayana so that it is consistent
with Atomikos and Bitronix.

See gh-5552
9 years ago
Phillip Webb ec33c59f6b Polish 9 years ago
Phillip Webb 1abfed2f23 Add Javadoc dependencies 9 years ago
Phillip Webb 69a80596ba Merge pull request #5552 from gytis/spring-boot-starter-jta-narayana
* spring-boot-starter-jta-narayana:
  Polish contribution
  Add Narayana JTA support
9 years ago
Phillip Webb 48800f1818 Polish contribution 9 years ago
Gytis Trikleris a2adc5a130 Add Narayana JTA support
Add support for JBoss Narayana.

Fixes gh-5552
9 years ago
Phillip Webb 1b146f89f0 Fix failing test 9 years ago
Phillip Webb 01c9d72644 Polish 9 years ago
Andy Wilkinson d1a487333d Merge branch '1.3.x' 9 years ago
Andy Wilkinson 7f3d4adfef Merge pull request #5289 from Vladimir Tsanev
* gh-5289:
  Polish contribution
  Update JarURLConnection to support jar:file://… URLs
9 years ago
Andy Wilkinson 74e27db486 Polish contribution 9 years ago
Vladimir Tsanev a0f76eab47 Update JarURLConnection to support jar:file://… URLs
Previously, JarURLConnection would fail when created with a URL that
began with jar:file:// as the double-slash is not included in jarFile.getUrl().getFile().

This commit updates JarURLConnection to normalise the value return from
url.getFile() to remove a double-slash when present.

Fixes gh-5287
Closes gh-5289
9 years ago
Andy Wilkinson 6b13acfc93 Merge pull request #4361 from Christopher Smith
* gh-4361:
  Add dependency management for org.hibernate:hibernate-java8
9 years ago
Christopher Smith 4f6726ba10 Add dependency management for org.hibernate:hibernate-java8
Closes gh-4361
9 years ago
Andy Wilkinson f1f5066786 Merge branch '1.3.x' 9 years ago
Andy Wilkinson d6ad4dcc11 Merge pull request #5397 from Vedran Pavic
* gh-5397:
  Improve repeatability of launch script tests
9 years ago
Vedran Pavic 9e287ef611 Improve repeatability of launch script tests
Previously, tags were used for CentOS and Ubuntu images that may
change over time. This commit updates the Dockerfiles to use fixed
base images. For Ubuntu, a fixed tag is available. For CentOS we
have to resort to using the digest.

Closes gh-5397
9 years ago
Andy Wilkinson 1d4e52cc2b Merge branch '1.3.x' 9 years ago
Andy Wilkinson 30626b52aa Merge pull request #5394 from Christian Brunotte
* gh-5394:
  Update launch.script so popd does not print directory name to stdout
9 years ago
Christian Brunotte 677080b8e2 Update launch.script so popd does not print directory name to stdout
Closes gh-5394
9 years ago
Andy Wilkinson 571973a51a Merge branch '1.3.x' 9 years ago
Andy Wilkinson 0f6b76cf7b Merge pull request #5615 from Johnny Lim
* gh-5615:
  Remove a duplicate test
9 years ago
Johnny Lim ec83d97443 Remove a duplicate test
Closes gh-5615
9 years ago
Andy Wilkinson fc6c57413b Update docs to fully reflect BOOT-INF executable archive layout changes
Closes gh-5195
9 years ago
Stephane Nicoll 0ba605dbb2 Upgrade to Spring Framework 4.3.0.RC1
Closes gh-5616
9 years ago
Stephane Nicoll 9524da343f Merge pull request #5614 from izeye/polish-20160406
* pr/5614:
  Polish
9 years ago
Johnny Lim a55315b5b5 Polish
Closes gh-5614
9 years ago
Phillip Webb 37fa3a3b04 Merge pull request #5102 from sebastiankirsch
* gh-4913:
  Allow per-http-method MetricsFilter submissions
9 years ago
sebastiankirsch a15684e67e Allow per-http-method MetricsFilter submissions
Add `endpoints.metrics.filter.gauge-submissions` and
`endpoints.metrics.filter.counter-submissions` properties which can be
used to fine-tune how MetricsFilter submits metrics.

Use `per-http-method` to group by the the HTTP method, `merged` to
combine or both (`merged,per-http-method`) to submit both in forms.

Closes gh-5102
9 years ago
Phillip Webb 40e51021ba Merge pull request #5535 from gazal-k/gh-1826
* gh-1826:
  Add Liquibase rollback file support
9 years ago
Mohamed Gazal 3623eeda0c Add Liquibase rollback file support
Add a `liquibase.rollback-file` property which can be used to write
a rollback file when migrations occur.

Fixes gh-1826
Closes gh-5535
9 years ago
Phillip Webb f43123f2fa Merge branch 'gh-2763' 9 years ago
Phillip Webb 1088f70923 Add Hibernate 4 sample
Add a sample showing how Hibernate 4 can be used if necessary.

See gh-2763
9 years ago
Phillip Webb 0db1194007 Upgrade to Hibernate 5.1
Upgrade to Hibernate 5.1, whilst still retaining compatibility with
Hibernate 4.3. This commit introduces the following changes:

* Add SpringPhysicalNamingStrategy to provides lowercase/underscore
  table names support. This should be equivalent to the previous
  SpringNamingStrategy that was used with Hibernate 4. No
  ImplicitNamingStrategy is provided since the Hibernate 5 defaults
  appear to be roughly equivalent to the conventions used in Spring
  Boot 1.3
  spring.jpa.hibernate.naming.

* Migrate  `spring.jpa.hibernate.naming-strategy` to
  `spring.jpa.hibernate.naming.strategy` and provide additional
  properties for physical and implicit.

* Add `spring.jpa.hibernate.use-new-id-generator-mappings` property and
  default to `false` when on Hibernate 5 to retain back compatibility.

See gh-2763
9 years ago
Andy Wilkinson 7fc990a3cb Add dependency management for more Selenium modules
Previously, we only had dependency management for
selenium-htmlunit-driver. It depends on three other Selenium modules
for which dependency management was not provided. This means that there
was a risk that a mixture of versions would end up on the classpath.

This commit adds dependency management for the Selenium modules upon
which selenium-htmlunit-driver depends.

Closes gh-5520
9 years ago
Andy Wilkinson b4ea90c2cc Reinstate dependency management for GemFire
Closes gh-5444
9 years ago
Andy Wilkinson e0f9da5afe Remove dependency management for Spring Shell
While the benign exception that Gemfire outputs is unfortunate, it
isn't sufficient justification for adding dependency management for
Spring Shell.

Closes gh-5444
9 years ago
Andy Wilkinson 6121d105fc Update JarLauncher to filter BOOT-INF/classes correctly
Previously, JarLauncher considered any entry whose name began with
BOOT-INF/classes/ as being a nested entry. This was incorrect as it
meant that subdirectories of BOOT-INF/classes/ would be added to the
classpath rather than just BOOT-INF/classes/ itself.

This commit updates JarLauncher so that only directory entries with a
name equal to BOOT-INF/classes are used.

Closes gh-5610
9 years ago
Andy Wilkinson 87de7e6382 Return the correct manifest for a JarFile create from a nested directory
Previously, if a JarFile was created from a directory nested inside
another jar file, it would look for the manifest in
pathFromRoot/META-INF/MANIFEST.MF. This is incorrect as, unlike a
JarFile created from a jar file, the archives are one and the same
so the manifests should be too.

This commit updates JarFile so that its aware of how it was created
(direct from a file, from a nested directory, from a nested jar). If
it was created from a file or from a nested jar, it uses its manifest.
If it was created from a nested directory, it uses the manifest of the
root archive.

Closes gh-5609
9 years ago
Andy Wilkinson 268641d3e2 Upgrade to Spring Session 1.2.0.RC1
Closes gh-5608
9 years ago
Andy Wilkinson 8c2ff00234 Upgrade to Neo4J OGM 2.0.0
Closes gh-5607
9 years ago