df0a0e563c
Merge branch '1.5.x'
2016-12-15 15:30:19 +01:00
c2ca21bb63
Merge branch '1.4.x' into 1.5.x
2016-12-15 15:30:03 +01:00
26643ef428
Clarify how to exclude devtools with war packaging.
...
Closes gh-7556
2016-12-15 15:28:25 +01:00
263d444d4e
Merge branch '1.5.x'
2016-12-05 11:20:24 -08:00
f6b0652369
Merge branch '1.4.x' into 1.5.x
2016-12-05 11:17:13 -08:00
e430583eaf
Polish
2016-12-05 11:08:38 -08:00
da6360e506
Merge branch '1.5.x'
2016-11-30 15:17:56 +01:00
e63174b93f
Merge branch '1.4.x' into 1.5.x
2016-11-30 15:17:41 +01:00
c51d836a15
Use standard file name for Maven dependencies
...
This commit uses standard files for libraries managed by the repackage
goal of the Maven plugin. Previously, only the name of the file was used
which could lead to duplicate libraries if the name of the target file
deviates from the default. This typically happens when the
`build.finalName` property is specified on a dependent module.
Note that the `maven-war-plugin` has an additional mechanism to customize
the file name structure of dependencies. This feature isn't supported by
the repackage goal so an explicit mention has been added in the
documentation.
Closes gh-7389
2016-11-30 15:13:25 +01:00
633280d1d0
Merge branch '1.5.x'
2016-11-29 15:44:31 +00:00
1595286e04
Prefer @SpringBootApplication-annotated class when finding main class
...
Closes gh-6496
2016-11-29 15:44:10 +00:00
450ab28163
Merge branch '1.5.x'
2016-11-28 17:27:05 -08:00
c6c6524b40
Support custom fat jar layouts
...
Allow support for custom Lyout implementations with both the Maven
and Gradle plugin. Implementations of `LayoutFactory` can now be
specified to allow customization of the layout. In addition a
layout may now implement `CustomLoaderLayout` if it wishes to
write custom loader classes.
See gh-7263
2016-11-28 16:31:53 -08:00
f5b03c81f3
Rework Repacakger timeout code
...
Pull up common timeout code into Repackager and remove the need for
custom subclasses.
See gh-7263
2016-11-28 16:15:39 -08:00
2964e31186
Merge branch '1.5.x'
2016-11-25 11:18:17 +01:00
6e79521fff
Expose skip property consistently
...
This commit makes sure that the `skip` command-line property can be used
for all goals of the maven plugin.
A dedicated sample for integration tests has also been added as this
change may confuse users, especially those who wish to skip a certain
goal and not the plugin execution altogether.
Closes gh-7313
2016-11-25 11:17:58 +01:00
cb7c0b5031
Merge branch '1.5.x'
2016-11-16 16:06:53 -08:00
8038882d46
Polish
...
Closes gh-7403
2016-11-16 13:36:51 -08:00
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
98a3ae9ac4
Merge branch '1.5.x'
2016-10-31 23:13:37 -07:00
97fee46682
Revert Layout changes
...
This reverts commits:
- 974ec92ad6537e0c12c2500a3df6e9
2016-10-31 21:08:15 -07:00
236f03c4bb
Merge branch '1.5.x'
2016-10-31 11:38:54 +01:00
7bb63238ab
Fix typo
...
Closes gh-7253
2016-10-31 11:37:52 +01:00
5f5e3bf6c3
Merge branch '1.5.x'
2016-10-30 11:24:52 +00:00
537e0c12c2
Support for custom layout types to change loader classes
...
A layout can
also optionally change the loader jar that is unpacked in the root
of the repackaged archive by implementing a new method in Layout.
2016-10-30 11:24:29 +00:00
500a3df6e9
Add LayoutFactory in spring.factories
...
Instead of a fixed enum of layout types, user can provide custom
layouts via implementations of LayoutFactory in spring.factories.
2016-10-30 11:24:29 +00:00
d79546da74
Merge branch '1.5.x'
2016-10-17 17:52:29 +03:00
6186262ecc
Switch `excludeDevtools` to true by default
...
Switch the default value of `excludeDevtools` from `false` to `true` as
it is more sensible to exclude such dependency by default.
Closes gh-7170
2016-10-17 17:52:12 +03:00
01900c8342
Merge branch '1.5.x'
2016-10-11 23:42:14 -07:00
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
c50a352999
Merge branch '1.5.x'
2016-10-11 15:37:07 +02:00
28ed59ca6e
Polish contribution
...
Closes gh-6645
2016-10-11 15:36:35 +02:00
3cccc732df
Add workingDirectory option for Maven plugin run/start
...
Add configuration option that specifies the working directory to use to
run/start the application via the Maven plugin.
Closes gh-6243
2016-10-11 15:36:27 +02:00
49a606fa91
Merge branch '1.5.x'
2016-09-28 17:00:56 +02:00
cdd59707fc
Merge branch '1.4.x' into 1.5.x
2016-09-28 17:00:30 +02:00
30a677646f
Polish
...
Closes gh-7030
2016-09-28 16:45:19 +02:00
ea9faa5f6a
Merge branch '1.5.x'
2016-09-27 10:14:57 +02:00
9210bf0822
Merge branch '1.4.x' into 1.5.x
2016-09-27 10:14:37 +02:00
723b46ade4
Move Restarter in integration tests
...
Closes gh-7025
2016-09-27 10:04:38 +02:00
6643ec3713
Next development version
2016-09-21 17:05:50 +02:00
6bd670edbc
Initiate 1.4.x branch
2016-09-21 11:11:24 +02:00
7e9ed5e1a7
Next Development Version
2016-09-21 07:58:07 +00:00
a994b11a73
Polish
2016-09-18 23:38:21 -07:00
caa4c0800f
Polish
...
Closes gh-6872
2016-09-13 09:25:06 +02:00
65b4f61a35
Polish
2016-09-01 18:02:00 +01:00
951f051df9
Polish
2016-09-01 14:39:29 +01:00
ff48a88b91
Enable fork more when devtools is present
...
This commit improves the run goal to automatically fork the process when
devtools is present and log a warning when fork has been disabled via
configuration since devtools will not work on a non-forked process.
We don't want devtools to kick in for integration tests so the logic has
been placed in `RunMojo` requiring a couple of protected methods to
override.
Closes gh-5137
2016-08-31 12:10:35 +02:00
cf07d19ed4
Polish
...
See gh-6792
2016-08-31 09:27:50 +02:00
850141c405
Merge branch '1.3.x'
2016-08-29 15:30:30 +01:00
69e96c6211
Polish
2016-08-29 15:29:54 +01:00
Stephane Nicoll
Phillip Webb
Andy Wilkinson
Dave Syer
Johnny Lim
Spring Buildmaster
Plamen Totev