Commit Graph

2811 Commits

Author SHA1 Message Date
Phillip Webb
2c6ca4d7e3 Merge branch '1.1.x' 2014-08-21 14:26:24 -07:00
Phillip Webb
5ef45c7494 Fix asciidoc incorrect link syntax 2014-08-21 14:25:02 -07:00
Phillip Webb
49805661f0 Merge branch '1.1.x' 2014-08-21 12:44:02 -07:00
Phillip Webb
d0f493cbea Fix InteliJ code formatter instructions
Update CONTRIBUTING.adoc with improved code formatter instructions.

Fixes gh-1271
2014-08-21 12:41:37 -07:00
Phillip Webb
650e326ae7 Align MessageSource path search fix with SPR-12095
Update ExtendedPathMatchingResourcePatternResolver to use similar
code as the fix for SPR-12095.

Fixes gh-1378
2014-08-21 12:09:07 -07:00
Andy Wilkinson
2ed24ddcd5 Merge branch '1.1.x' 2014-08-21 16:26:52 +01:00
Andy Wilkinson
9717b7d840 Preserve JVM args when auto-configuring a Java agent in Gradle bootRun
Fixes #1411
2014-08-21 16:26:36 +01:00
Andy Wilkinson
c75782424c Add jar that should have been added as part of 69c61d0 2014-08-21 16:25:37 +01:00
Andy Wilkinson
0e7757decd Merge branch '1.1.x' 2014-08-21 15:38:13 +01:00
Andy Wilkinson
69c61d0e8e Include transitive file dependencies during Gradle repackaging
Previously, ProjectLibraries only considered a configuration's
direct file dependencies. This meant that a transitive file
dependency that should have been pulled in via a project dependency
was not included in the repackaged jar's lib directory.

ProjectLibraries has been updated to walk down the tree of project
dependencies and create libraries for any file dependencies that
are found.

Fixes gh-1368
2014-08-21 15:27:08 +01:00
Andy Wilkinson
595c81124d Polishing 2014-08-21 09:02:16 +01:00
Phillip Webb
7d4fbacecd Fix invoker to not download remote artifacts
Updates to prevent the maven-invoker-plugin from downloading remote
snapshot jars. Possibly caused by the recent changes to the
spring-boot-dependencies POM.

See gh-1413
2014-08-21 00:52:00 -07:00
Phillip Webb
1a61ffd7d1 Update maven-invoker-plugin to 1.9 2014-08-21 00:43:12 -07:00
Phillip Webb
75578e833a Add repositories section to dependencies POM
Inadvertently missed on commit 7732135a2b

Fixes gh-1413
2014-08-20 18:35:07 -07:00
Phillip Webb
bd4eda383f Create ApplicationHome class
Extract useful logic from StartupInfoLogger to a new ApplicationHome
class.

Fixes gh-1414
2014-08-20 16:40:17 -07:00
Phillip Webb
91e493fd0a Revert "Update travis CI configuration"
This reverts commit c28026bb36.
2014-08-20 16:26:06 -07:00
Phillip Webb
c28026bb36 Update travis CI configuration 2014-08-20 16:23:08 -07:00
Phillip Webb
7732135a2b Add repositories section to dependencies POM
Add a repositories section to the spring-boot-dependencies POM but
strip it out during a CI build. This allows snapshot and milestone
BOM imports to be used but doesn't pollute published POMs and doesn't
prevent a fresh checkout from building.

Fixes gh-1413
2014-08-20 16:18:42 -07:00
Phillip Webb
e6e0cf094b Move more repositories to generated settings.xml 2014-08-20 12:08:30 -07:00
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