Commit Graph

24788 Commits

Author SHA1 Message Date
Phillip Webb e513fe4666 Add layertools jarmode
Add a new `spring-boot-layertools` module which provides jarmode support
for working with layers. The module works with both classic fat jars,
as well as layered jars.

Closes gh-19849
2020-01-22 01:26:55 -08:00
Phillip Webb 73a42050d6 Add jarmode support to the loader code
Update the `Launcher` class to allow a packaged jar to be  launched in
a different mode. The launcher now checks for a `jarmode` property and
attempts to find a `JarMode` implementation using the standard
`spring.factories` mechanism.

Closes gh-19848
2020-01-22 01:23:11 -08:00
Phillip Webb d5a70688cb Reserve layer names for future use
Update layered jar support so that the name `ext` and any name
starting `springboot` are reserved.

See gh-19767
2020-01-22 01:13:54 -08:00
Phillip Webb 3af4930f75 Add cloudnativebuildpack to dependencies
Update the managed dependencies to include the recently added
`spring-boot-cloudnativebuildpack` module.

See gh-19828
2020-01-22 01:10:57 -08:00
Phillip Webb 7d8f8d47c8 Fix packager code to generate layer index file
Update `Packager` to create the layer index file when repackaging.

Closes gh-19767
2020-01-21 23:26:19 -08:00
Phillip Webb bfd2ca7fd9 Polish Gradle expression references
Expand all expression `$` references to the full `${...}` form.
2020-01-21 18:33:33 -08:00
Andy Wilkinson 89237634c7 Fix classpath used for Gradle Plugin integration tests in Eclipse
See gh-19841
2020-01-21 14:59:07 +00:00
Stephane Nicoll 1faa6b3b1f Merge pull request #19790 from scottfrederick
* pr/19790:
  Polish "Upgrade to Infinispan 10.1.1.Final"
  Upgrade to Infinispan 10.1.1.Final

Closes gh-19790
2020-01-21 15:11:29 +01:00
Stephane Nicoll 4d70f58bc8 Polish "Upgrade to Infinispan 10.1.1.Final"
See gh-19790
2020-01-21 14:53:09 +01:00
Scott Frederick 511258f486 Upgrade to Infinispan 10.1.1.Final
See gh-19790
2020-01-21 14:46:56 +01:00
Stephane Nicoll 08967bca3e Merge branch '2.2.x'
Closes gh-19843
2020-01-21 14:44:01 +01:00
Stephane Nicoll 84324c438b Merge branch '2.1.x' into 2.2.x
Closes gh-19842
2020-01-21 14:34:44 +01:00
Stephane Nicoll 34c263a828 Polish actuator dependencies and test resources
This commit removes references of cache infra following the move to
Micrometer. We no longer ships an infinispan specific binder so the
dependency has been removed as well.

Closes gh-19838
2020-01-21 14:20:28 +01:00
Andy Wilkinson 1e72fa202c Rework loader-tools resource generation to work with Buildship
Previously, the generated resources were added as an output to the
main source set. This worked on the command line, but resulted in
the META-INF folder that contains the loader jar not being on the
classpath of downstream projects in Eclipse.

This commit changes loader-tools to add the generated resources
as a srcDir to the main source set. This results in it appearing on
the classpath of other projects in Eclipse that depend on loader-tools
such as the Gradle plugin, thereby allowing its tests to be run in
the IDE as well as on the command line.

Fixes gh-19841
2020-01-21 12:52:02 +00:00
Andy Wilkinson 4486da8ef3 Use JavaExec to invoke Ant with required dependencies on its classpath
Previously, we were adding dependencies to Ant's ClassLoader within
Gradle. It is suspected that this was causing sporadic loader
contraint violations as types that Gradle itself uses (from Commons
Compress) were then available from two different ClassLoaders.

This commit reworks the Ant smoke test to use JavaExec and Ant's
launcher to run the build. This allows us to make the necessary
dependencies available to Ant in an isolated manner. The javac
invocation within Ant is now forked to allow it to find the tools jar
even when the build itself is running on a JRE.

Closes gh-19839
2020-01-21 12:13:03 +00:00
Andy Wilkinson 62a848f1b1 Register JNA's native library integration in LinuxSocketDomain
See gh-19836
2020-01-21 11:09:31 +00:00
Stephane Nicoll ef13f04938 Merge pull request #19797 from dreis2211
* pr/19797:
  Revisit documentation that mentions Gradle "compile" configuration

Closes gh-19797
2020-01-21 11:10:13 +01:00
dreis2211 991bcf5ce4 Revisit documentation that mentions Gradle "compile" configuration
See gh-19797
2020-01-21 11:09:41 +01:00
Stephane Nicoll d421c63747 Disable integration test on Linux
See gh-19836
2020-01-21 10:46:55 +01:00
Stephane Nicoll ffd7670843 Attempt to make DockerApiIntegrationTests work on Linux 2020-01-21 10:19:56 +01:00
Stephane Nicoll 308d9baec0 Merge pull request #19826 from dreis2211
* pr/19826:
  Reinstate running of OutputCaptureRuleTests

Closes gh-19826
2020-01-21 09:48:03 +01:00
dreis2211 042694bc53 Reinstate running of OutputCaptureRuleTests
See gh-19826
2020-01-21 09:47:41 +01:00
Stephane Nicoll cd5691b0f0 Merge pull request #19835 from dreis2211
* pr/19835:
  Add UTF-8 encoding to spring-boot-starter-parent POM

Closes gh-19835
2020-01-21 09:43:34 +01:00
dreis2211 088e79f446 Add UTF-8 encoding to spring-boot-starter-parent POM
See gh-19835
2020-01-21 09:36:38 +01:00
Phillip Webb cb4928ad51 Add build-image support to the maven plugin
Add a new `build-image` goal to the Maven plugin to allow Docker images
to be create via using the cloud native buildpack.

See gh-19830
2020-01-20 23:48:47 -08:00
Phillip Webb 16e6bc89ed Create a new ImagePackager tools class
Pull functionality from `Repackager` into a new `Packager` base class
and develop a variant for Docker image creation. The new `ImagePackager`
class provides a general purpose way to construct jar entries without
being tied to an actual file. This will allow us to link it to a
buildpack and provide application content directly.

Closes gh-19834
2020-01-20 23:48:47 -08:00
Phillip Webb aa1954717c Add cloud native buildpack module
Add a Java implementation of the buildpacks.io specification allowing
projects to be packaged into OCI containers. The `builder` class
provides a Java equivalent of `pack build` command and is based on
the `pack` CLI Go code published at https://github.com/buildpacks/pack.

Closes gh-19828
2020-01-20 23:48:47 -08:00
Stephane Nicoll 7fe79f3574 Merge branch '2.2.x' 2020-01-20 21:08:17 +01:00
Spring Buildmaster b6bed9fccd Next development version (v2.2.5.BUILD-SNAPSHOT) 2020-01-20 19:12:49 +00:00
Andy Wilkinson 29d8b6db5a Merge branch '2.2.x'
Closes gh-19822
2020-01-20 15:18:18 +00:00
Andy Wilkinson f708aace65 Merge branch '2.1.x' into 2.2.x
Fixes gh-19821
2020-01-20 15:18:00 +00:00
Stephane Nicoll 67bba7c64a Merge branch '2.2.x'
Closes gh-19820
2020-01-20 16:13:03 +01:00
Stephane Nicoll 94b14600e8 Merge pull request #19819 from nosan
* pr/19819:
  Polish "Document RedisCacheManagerBuilderCustomizer"
  Document RedisCacheManagerBuilderCustomizer

Closes gh-19819
2020-01-20 16:12:38 +01:00
Stephane Nicoll 3dba4c8f4e Polish "Document RedisCacheManagerBuilderCustomizer"
See gh-19819
2020-01-20 16:02:38 +01:00
Dmytro Nosan 61d8bacd23 Document RedisCacheManagerBuilderCustomizer
See gh-19819
2020-01-20 16:02:20 +01:00
Andy Wilkinson c85f19b75b Revert "Add profiles directly to the application environment for tests"
This reverts commit 487b9cbf96.

Fixes gh-19788
2020-01-20 15:01:09 +00:00
Stephane Nicoll 59abba34c7 Merge pull request #19817 from Abdullah8006
* pr/19817:
  Polish README.adoc

Closes gh-19817
2020-01-20 15:09:12 +01:00
Abdullah Khan 5c8f3c36aa Polish README.adoc
See gh-19817
2020-01-20 15:08:18 +01:00
Andy Wilkinson 235b74ca12 Merge branch '2.2.x'
Closes gh-19814
2020-01-20 11:33:56 +00:00
Andy Wilkinson 7693d332fa Upgrade to Dependency Management Plugin 1.0.9.RELEASE
Closes gh-19783
2020-01-20 11:32:09 +00:00
Stephane Nicoll cde95790f6 Merge branch '2.2.x'
Closes gh-19812
2020-01-20 11:47:53 +01:00
Stephane Nicoll 938c7a6d9f Merge branch '2.1.x' into 2.2.x
Closes gh-19763 in 2.2.4
2020-01-20 11:25:48 +01:00
Stephane Nicoll 11efe172e9 Upgrade Java 11 version in CI image
Closes gh-19763
2020-01-20 11:25:10 +01:00
Stephane Nicoll 4ab19c3cfb Upgrade to Reactor Dysprosium-SR4
Closes gh-19809
2020-01-20 09:24:43 +01:00
Stephane Nicoll 39257247cf Merge branch '2.2.x' 2020-01-20 09:23:45 +01:00
Stephane Nicoll ae561ce59b Upgrade to Reactor Dysprosium-SR4
Closes gh-19795
2020-01-20 09:22:38 +01:00
Andy Wilkinson 468eca91e9 Apply Java conventions to projects that only apply Java base plugin
Fixes gh-19806
2020-01-19 20:02:13 +00:00
Andy Wilkinson bfdb49f2a2 Retry when findAvailableTcpPort returns an unavailable port
Closes gh-19801
2020-01-18 12:25:13 +00:00
Andy Wilkinson aeca44d3d7 Revise credhub references for Gradle Enterprise cache user 2020-01-18 12:07:22 +00:00
Andy Wilkinson 55d7f8b876 Restore previous credhub references for cache username and password
The references with . in them did not work, resulting in pushing to
the remote cache being disabled.
2020-01-18 10:29:24 +00:00