c0012a4bfe
Merge branch '1.5.x'
2017-01-05 17:04:48 +01:00
c06ff7061f
Revert Shade annotation processor dependencies
...
This commit reverts 45d5b60
2017-01-05 17:04:34 +01:00
4bfecc1307
Merge branch '1.5.x'
2017-01-04 23:52:40 -08:00
45d5b60f6d
Shade annotation processor dependencies
...
Update the annotation processor to be completely self contained. The
single required dependency is now "shaded" into the jar.
Fixes gh-7883
2017-01-04 23:02:24 -08:00
cc7c2ebb87
Migrate to android-json
...
Migrate from `org.json:json` to the clean room Apache 2.0 licensed
version that was developed for Android.
Fixes gh-5929
2017-01-04 23:00:06 -08:00
4cb7d86aec
Drop annotation processor spring-core dependency
...
Remove the spring-core dependency from the annotation processor.
Fixes gh-7882
2017-01-04 22:58:28 -08:00
4dc30938d0
Merge branch '1.5.x'
2017-01-04 21:39:34 +00:00
803eddf6b2
Update test to reflect quoting of STOP_WAIT_TIME in launch.script
2017-01-04 21:39:16 +00:00
3967c525c8
Merge branch '1.5.x'
2017-01-04 21:31:26 +00:00
c5e7d83e2d
Fix shellcheck warnings for literal { and } characters in launch.script
...
Closes gh-7870
2017-01-04 21:30:42 +00:00
be71f666d2
Merge branch '1.5.x'
2017-01-04 20:40:57 +00:00
75cb545361
Update launch.script to use a consistent location for pid file
...
Closes gh-6924
2017-01-04 20:39:51 +00:00
506f6497c0
Merge branch '1.5.x'
2017-01-04 09:56:19 +01:00
f915ae197a
Polish
2017-01-04 09:53:45 +01:00
f8c7890a45
Merge branch '1.5.x'
2017-01-03 15:36:47 -08:00
cee576b8b2
Reduce memory footprint of AsciiBytes.hashCode
...
Update `AsciiBytes.hashCode(int hash, String string)` so that it no
longer copies the backing array of the string.
Closes gh-7851
2017-01-03 15:36:11 -08:00
6fd27566af
Merge branch '1.5.x'
2017-01-03 13:15:09 +00:00
6ced8abb86
Update the copyright header to 2017
2017-01-03 13:14:55 +00:00
6b1a80ac2a
Merge branch '1.5.x'
2017-01-03 13:12:40 +00:00
dac249fb0d
Replace use of Gradle API that's bean deprecated in 3.x
...
Closes gh-7734
2017-01-03 13:05:48 +00:00
4026fa563f
Merge branch '1.5.x'
2017-01-02 19:54:26 -08:00
41b83085a6
Restore `kill -9` to launch.script force-stop
...
Restore the `-9` flag to the send `kill` call which was inadvertently
lost in commit a35a1022c2
2017-01-02 19:47:54 -08:00
a90bad37bd
Merge branch '1.5.x'
2016-12-30 13:29:18 -08:00
a35a1022c2
Update force-stop to respect STOP_WAIT_TIME
...
Closes gh-6223
2016-12-30 13:23:47 -08:00
40691d07f8
Add force-stop to launch.script usage
...
See gh-6223
Closes gh-7787
2016-12-30 13:19:36 -08:00
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
aacf5d660f
Update copyright year for changed files
2016-12-30 11:53:51 -08:00
4d73f3d2e9
Merge branch '1.5.x'
2016-12-29 22:22:04 -08:00
509be7474d
Add `force-stop` support to launch script
...
Update the embedded launch script to support `force-stop`.
Closes gh-6223
2016-12-29 22:20:05 -08:00
519f9c6c54
Merge branch '1.5.x'
2016-12-28 15:35:32 -08:00
8b69856fc9
Polish
2016-12-28 15:23:26 -08:00
49fa702708
Merge branch '1.5.x'
2016-12-27 15:06:22 -08:00
85504e74a6
Merge branch '1.4.x' into 1.5.x
2016-12-27 15:05:15 -08:00
3a709511c4
Notify BuildContext of changed build-info file
...
Update Maven plugin to inform the BuildContext when changes are made to
the `build-info` file. Prior to this commit Eclipse could continually
trigger refreshes whenever "Refresh using native hooks or polling" was
enabled and the file was written to `src/main/resources`.
Closes gh-7741
2016-12-27 13:20:22 -08:00
31bde8ffc9
Merge branch '1.5.x'
2016-12-27 11:59:38 +01:00
2fe98f8f85
Merge branch '1.4.x' into 1.5.x
2016-12-27 11:59:25 +01:00
022f7e86a0
Align library file naming mapping
...
This commit aligns the mapping from library to name to the default
behaviour of the `maven-war-plugin`. Previously, our plugin would use
the full version of the library (i.e. including build timestamp if there
is one), rather than using the `baseVersion` property.
Closes gh-7743
2016-12-27 11:59:01 +01:00
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
6e02fe59f7
Merge branch '1.5.x'
2016-12-21 22:32:43 -08:00
e12b4a944f
Polish
2016-12-21 20:18:04 -08:00
8b47561f7e
Merge branch '1.5.x'
2016-12-20 21:56:04 -08:00
534a9db6fd
Make stop wait time in the launch script configurable
...
Create a parameter `STOP_WAIT_TIME` for the startup script
that configures the time in seconds to wait for a normal
shutdown. Because of #4941 we also send a shutdown half
way the countdown.
Fixes gh-7121
2016-12-20 15:15:12 -08:00
1f417997f3
Merge branch '1.5.x'
2016-12-19 13:21:18 -08:00
6121208cbb
Polish formatting
2016-12-19 12:47:03 -08:00
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
bd74c3d327
Polish formatting
2016-12-19 12:25:09 -08:00
1782d778db
Merge branch '1.5.x'
2016-12-15 20:07:55 +00:00
6fb1fb580d
Upgrade to Dependency Management Plugin 1.0.0.RC1
...
Closes gh-7636
2016-12-15 20:07:35 +00:00
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
1302d1b0e4
Merge branch '1.5.x'
2016-12-15 14:16:28 +01:00
dd7d81a580
INIT INFO Required Start/Stop as embedded launch script properties
...
Expose the Required-Start and Require-Stop lines in the launch script
INIT INFO section as customizable embedded launch script properties.
This way one can express dependencies fron other init services by simply
changing the configuration in the build script.
Closes gh-7555
2016-12-15 14:14:50 +01:00
a86678cc31
Merge branch '1.5.x'
2016-12-14 19:33:34 +01:00
6d1b752ffe
Polish
...
Closes gh-7552
2016-12-14 19:14:24 +01:00
6eaa8d7c56
Merge branch '1.5.x'
2016-12-08 11:38:23 +00:00
53287eadf6
Merge branch '1.4.x' into 1.5.x
2016-12-08 11:38:13 +00:00
2d8344d46d
Ensure that JarLauncher doesn't cause root jar to be on class path twice
...
Closes gh-7595
2016-12-08 11:34:22 +00: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
39c0f229c2
Merge branch '1.5.x'
2016-12-02 11:34:00 +00:00
0df03a95f0
Merge branch '1.4.x' into 1.5.x
2016-12-02 11:33:52 +00:00
5a5e2db134
Quote $jarfile when creating arguments in launch script
...
Previously, if the pathname of fully executable contained any space
characters, the launch script would fail to locate the jar file
This commit fixes this issue by quoting the jarfile.
Closes gh-7535
2016-12-02 11:31:51 +00:00
bd2415463c
Merge branch '1.5.x'
2016-12-01 12:13:02 +01:00
3a7969b8bb
Remove redundant StringBuilder
...
Closes gh-7538
2016-12-01 12:11:04 +01: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
0568afc6cb
Merge branch '1.5.x'
2016-11-30 08:31:41 +01:00
423f8037ce
Polish
...
Closes gh-7530
2016-11-30 08:31:13 +01:00
e7275b62dc
Merge branch '1.5.x'
2016-11-30 08:27:30 +01:00
fabe35fdc4
Remove redundant toString() invocation
...
Closes gh-7527
2016-11-30 08:23:03 +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
4da5245e69
Merge branch '1.5.x'
2016-11-29 15:22:20 +01:00
f84fd19eaa
Polish contribution
...
Closes gh-7491
2016-11-29 15:20:53 +01:00
b3220985bb
Detect default values defined in the parent
...
Closes gh-5434
2016-11-29 15:20:10 +01:00
9c374e7755
Merge branch '1.5.x'
2016-11-29 08:03:08 +01:00
06e44c71ec
Merge branch '1.4.x' into 1.5.x
2016-11-29 08:02:50 +01:00
88b83a909c
Remove redundant toString() invocation
...
Closes gh-7510
2016-11-29 08:01:27 +01: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
b4c3f4f504
Merge branch '1.5.x'
2016-11-28 15:37:43 -08:00
5ed00b3501
Merge branch '1.4.x' into 1.5.x
2016-11-28 15:27:07 -08:00
357d072a60
Polish
2016-11-28 15:14:46 -08:00
e15b3e463f
Fix compatibility with JDK9
...
Cast runtime object retrieved reflectively to their public interface
counterpart.
See gh-7226
2016-11-28 11:30:34 +01: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
c714880001
Merge branch '1.5.x'
2016-11-23 14:05:10 +00:00
655ab9871b
Merge branch '1.4.x' into 1.5.x
2016-11-23 14:04:59 +00:00
5e79657d4b
Treat URLs for same file in nested archive and from jar root as equal
...
Consider the following two URLs:
jar:file:/test.jar!/BOOT-INF/classes!/foo.txt
jar:file:/test.jar!/BOOT-INF/classes/foo.txt
They both reference the same foo.txt file in the BOOT-INF/classes
directory of test.jar, however the first URL does so via the
nested BOOT-INF/classes archive. Previously, this difference in the
URLs would lead to PathMatchingResourcePatternResolver returning two
resources for foo.txt when asked to find all resources matching the
pattern classpath*:/**/*.txt.
This commit updates our Handler that is used for jar: URLs to consider
the two URLs above to be equivalent such that url1 is equal to url2
and the two urls will produce the same hash code.
Closes gh-7449
2016-11-23 14:04:45 +00:00
bc6b2a9c75
Merge branch '1.5.x'
2016-11-22 13:54:49 +00:00
5c11059e1d
Make launch script's logFilename and pidFilename configurable via properties
...
Closes gh-7234
2016-11-22 13:54:16 +00: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
e26a3e3766
Merge branch '1.5.x'
2016-11-15 13:14:44 +00:00
22e456a177
Merge branch '1.4.x' into 1.5.x
2016-11-15 13:14:30 +00:00
c2730ac63f
Polish formatting and address warnings
2016-11-15 11:48:35 +00:00
Stephane Nicoll
Phillip Webb
Andy Wilkinson
Johnny Lim
dreis
Kazuki Shimizu
Gaurav Rawat
Arlo O'Keeffe
Spring Buildmaster
Lucas Saldanha
Alessandro Falappa
Pei-Tang Huang
Oscar Utbult
Hrishikesh Joshi
Dave Syer
Christian Koops