Phillip Webb
a1f1ab7a50
Upgrade maven-plugin-plugin to 3.3
2014-08-20 12:08:30 -07:00
Phillip Webb
ac98e5b5ab
Polish profile ordering
2014-08-20 10:28:59 -07:00
Phillip Webb
fc90b95eb0
Polish module ordering
2014-08-20 10:28:24 -07:00
Dave Syer
171b2e452b
Make ServerProperties bean conditional on being a webapp
2014-08-20 09:09:19 +01:00
Phillip Webb
a9d0815e0c
Merge branch '1.1.x'
2014-08-19 14:44:10 -07:00
Phillip Webb
c7045f5294
Remove duplicate dependencies from data-rest
...
Update `spring-boot-starter-data-rest` to remove duplicate jackson
dependencies.
2014-08-19 14:43:14 -07:00
Phillip Webb
de7ff0670d
Polish
2014-08-19 14:22:46 -07:00
Andy Wilkinson
90b12d738b
Merge branch '1.1.x'
2014-08-19 19:44:11 +01:00
Andy Wilkinson
896a85b575
Add settings.xml used by AetherGrapeEngineTests
2014-08-19 19:43:46 +01:00
Andy Wilkinson
cee8c9f4ea
Merge branch '1.1.x'
2014-08-19 17:56:10 +01:00
Andy Wilkinson
5f9fddd44a
Explicitly apply mirror and auth settings to remote repos in the CLI
...
Previously, the CLI relied on Aether using the session's mirror
selector and authentication selector to customize the configured
repositories. These selectors are only used to configure what Aether
calls recessive repositories (repositories discovered when resolving
an artifact), rather than the explicitly configured repositories that
are typically used.
This commit updates AetherGrapeEngine to apply mirror and
authentication configuration to every added repository, bringing its
behaviour for these two settings into line with what it already does
for proxy configuration.
Fixes #1354
2014-08-19 17:55:54 +01:00
Dave Syer
399238384f
Merge branch '1.1.x'
2014-08-19 14:16:44 +01:00
Dave Syer
8e84151f8f
Normalize search path in PropertiesLauncher
...
* Windows: allow absolute file paths without file:/// prefix
* All: only add nested archives (not directories), so loader.path=lib/*
behaves the same as -classpath=lib/* (except for adding zip files)
Fixes gh-1352
2014-08-19 14:16:10 +01:00
Dave Syer
ccfc47091c
Fix URL filtering when loading from a directory
...
The ExplodedArchive would erroneously always attempt to filter
its contents (and thereby shield them from a classloader that wrapped
it) even if they haven't been explicitly provided.
See gh-1352
2014-08-19 14:16:10 +01:00
Andy Wilkinson
8e5556bcfa
Merge branch '1.1.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
2014-08-19 13:11:15 +01:00
Andy Wilkinson
fbd429c6c1
Upgrade to HTTP Client 4.3.5
...
Closes #1409
2014-08-19 12:13:28 +01:00
Andy Wilkinson
7ea61f6d72
Upgrade to org.apache.httpcomponents:httpasyncclient 4.0.2
...
Closes #1408
2014-08-19 12:13:28 +01:00
Andy Wilkinson
0eaee3e833
Upgrade to mysql-connector-java 5.1.32
...
Closes #1407
2014-08-19 12:13:28 +01:00
Andy Wilkinson
0917760522
Upgrade to Jackson 2.3.4
...
Closes #1406
2014-08-19 12:13:28 +01:00
Andy Wilkinson
c1d6e5e897
Upgrade to Tomcat 7.0.55
...
Closes #1405
2014-08-19 12:13:21 +01:00
Andy Wilkinson
601794c617
Upgrade to Spring Integration 4.0.3
...
Closes #1404
2014-08-19 11:55:09 +01:00
Andy Wilkinson
0e3d49512f
Upgrade to Reactor 1.1.4 and Reactor Spring 1.1.3
...
Closes #1402
Closes #1403
2014-08-19 11:54:11 +01:00
Andy Wilkinson
e3769889f5
Upgrade to mongo-java-driver 2.12.3
...
Closes #1401
2014-08-19 11:52:04 +01:00
Andy Wilkinson
77147bfe5c
Upgrade to HornetQ 2.4.3.Final
...
Closes #1400
2014-08-19 11:51:14 +01:00
Andy Wilkinson
58061bd852
Upgrade to AspectJ 1.8.2
...
Closes #1399
2014-08-19 11:47:34 +01:00
Andy Wilkinson
2892247491
Upgrade to Spring Security 3.2.5
...
Closes #1398
2014-08-19 11:30:28 +01:00
Andy Wilkinson
2668e152ff
Upgrade to Hibernate 4.3.6
...
Closes #1389
2014-08-19 11:29:29 +01:00
Stephane Nicoll
8e38c9cb18
Merge pull request #1396 from matsev/cleaning-up-maven-plugin-dependencies
...
* cleaning-up-maven-plugin-dependencies:
Delete duplicate version numbers of Maven plugins
2014-08-19 11:26:17 +02:00
Mattias Severson
326516a305
Delete duplicate version numbers of Maven plugins
...
The Maven plugin version numbers are defined in the pluginManagement
of the spring-boot-dependencies pom.xml. Consequently, they can be
deleted in the spring-boot-starter-parent pom.xml to avoid version
conflicts and duplicated version management.
2014-08-19 11:25:52 +02:00
Dave Syer
eb4aee6c45
Improve error logging in InstallCommand
2014-08-19 07:40:33 +01:00
Phillip Webb
54625cc2a0
Make LaunchedURLClassLoader lock provider static
...
Fixes gh-1380
2014-08-18 20:08:03 -07:00
Phillip Webb
fc7823bc42
Merge branch '1.1.x'
2014-08-18 17:55:21 -07:00
Phillip Webb
7685d18ed8
Add clean support for samples
...
Use ant-run to clean spring-boot-samples when `clean` is invoked on
the main project.
2014-08-18 17:29:50 -07:00
Phillip Webb
5c34b07742
Fix DefaultCounterService.reset
...
Fix DefaultCounterService.reset to call the reset method of the
underlying MetricWriter.
Fixes gh-1391
2014-08-18 17:28:23 -07:00
Phillip Webb
baec9f50a8
Merge branch '1.1.x'
2014-08-18 14:39:32 -07:00
Phillip Webb
2188e3553c
Prevent tests from picking up empty starter dirs
...
Update StarterDependenciesIntegrationTests to only consider starter
folders that contain POM files.
Fixes gh-1395
2014-08-18 14:38:02 -07:00
Phillip Webb
83bd36d8e0
Merge branch '1.1.x'
...
Conflicts:
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
2014-08-18 13:02:44 -07:00
Phillip Webb
eb721b1e9f
Find 'messages*.properties' in all jar URLs
...
Update the the PathMatchingResourcePatternResolver used in the
MessageSourceAutoConfiguration condition to deal with the fact
that `classpath*:` patterns do not work with URLClassLoaders when
the pattern doesn't include a folder.
The ExtendedPathMatchingResourcePatternResolver works by searching
all classpath URLs when the `findAllClassPathResources` method is
called with an empty location.
Fixes gh-1378
2014-08-18 12:58:41 -07:00
Dave Syer
1fe1399959
Add install command
...
Fixes gh-1393
2014-08-18 18:01:22 +01:00
Phillip Webb
6e6bc25c44
Polish
2014-08-18 09:57:03 -07:00
Dave Syer
457cea60e6
Add ServiceLoader for AST transformations
...
The loading is via a marker interface SpringBootAstTransformation
to avoid clashing with other services registered as org.groovy.*
Fixes gh-1392
2014-08-18 16:15:06 +01:00
Dave Syer
91d3edc220
Tidy imports
2014-08-18 14:57:28 +01:00
Andy Wilkinson
ecdd291254
Upgrade to Joda Time 2.4
...
Closes #1388
2014-08-18 10:14:03 +01:00
Andy Wilkinson
5338dc2ade
Upgrade to Jackson 2.4.2
...
Closes #1387
2014-08-18 09:56:56 +01:00
Phillip Webb
b3ba86390f
Relax EntityManagerFactoryBuilder Map generic
...
Relax the generic signature on EntityManagerFactoryBuilder.properties
so that any object type can be added.
Fixed gh-1376
2014-08-15 11:49:25 -07:00
Phillip Webb
ebd0d265f8
Polish
2014-08-15 11:49:13 -07:00
Phillip Webb
8476a79dd2
Add support for RelaxedDataBinder aliases
...
Update RelaxedDataBinder to support property aliases and change
DataSourceBuilder to use them.
Fixes gh-1384
2014-08-15 10:46:06 -07:00
Phillip Webb
a6e6e1e07a
Rename Banner.write method to printBanner
...
Rename Banner.write to Banner.printBanner for consistency with the
now deprecated SpringApplication.printBanner method.
2014-08-15 10:14:03 -07:00
Phillip Webb
d0231d0dbe
Merge pull request #1363 from Stummi/master
...
* pull1363:
Support programmatic banners via setter
2014-08-15 10:11:22 -07:00
Michael Stummvoll
36ab01c048
Support programmatic banners via setter
...
Introduce an easy way for the user to provide an custom programmatic
banner to the Application as alternative to the static banner.txt file,
without the need to override SpringApplication class.
Fixes gh-1363
2014-08-15 10:08:31 -07:00