8ffaa54e74
Merge branch '1.5.x'
2017-01-23 23:45:44 -08:00
ca435512c0
Introduce spring-boot-autoconfigure-processor
...
Add an annotation processor that generates properties files for certain
auto-configuration class annotations. Currently attribute values from
@AutoConfigureOrder, @AutoConfigureBefore, @AutoConfigureAfter and
@ConditionalOnClass annotations are stored.
The properties file will allow optimizations to be added in the
`spring-boot-autoconfigure` project. Primarily by removing the need
to ASM parse as many `.class` files.
See gh-7573
2017-01-23 22:14:56 -08:00
6d14a9dc78
Merge branch '1.5.x'
2017-01-20 16:52:53 +00:00
080ff49c8d
Prevent AspectJ from loading aspects too early
...
Previously, AspectJ would find META-INF/aop.xml almost as soon as
the jar was launched, and before LaunchedURLClassLoader had been
created. This meant that AspectJ would attempt to load aspects listed
in META-INF/aop.xml but that were package in BOOT-INF/classes and,
therefore, could not be loaded.
This commit updates the Repackager so that a META-INF/aop.xml file
is moved into BOOT-INF/classes. This ensures that it isn't visible
to the app class loader so it won't be loaded to early. It will
now be loaded by LaunchedURLClassLoader which can also load the
compiled aspects that aop.xml references.
Closes gh-7587
2017-01-20 16:51:51 +00:00
aba09cce73
Merge branch '1.5.x'
2017-01-18 14:25:09 +00:00
ec537b307e
Make start/stop run-levels configurable in INIT-INFO of launch.script
...
See gh-7008
Closes gh-7902
2017-01-18 14:24:29 +00:00
1d4cee9460
Drop support for the old spring-boot Gradle plugin ID
...
Closes gh-7859
2017-01-13 06:47:02 -05:00
f92f019418
Don't mock package private class
...
See gh-7770
2017-01-05 14:39:22 -08:00
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
2017-01-05 14:29:29 -08:00
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
Phillip Webb
Madhura Bhave
Andy Wilkinson
Alessandro Falappa
Stephane Nicoll
Johnny Lim
dreis
Kazuki Shimizu
Gaurav Rawat
Arlo O'Keeffe
Spring Buildmaster