Commit Graph

26836 Commits (cfd5cb5496f384a25dc6f4c18ef92d49afa5f3b6)
 

Author SHA1 Message Date
Phillip Webb c8e966002a Fixup prepare-forward-merge for master
Fix the regex so that merges to master are supported.
5 years ago
Phillip Webb 9a235197dc Propagate manifest to exploded jars
Update `LaunchedURLClassLoader` so that packages defined from exploded
archive folders have manifest attributes applied to them. Prior to this
calling `package.getImplementationTitle()` would only return the a
manifiest attribute when running non-exploded.

The root cause of this issue is the way that `URLClassLoader` handles
the different URL types. For URLs that reference a jar the manifest is
available. For URLs that reference a folder it isn't. When running
exploded we use a URL that references to the `BOOT-INF/classes` folder
directly. To fix the issue we now attempt to detect when `definePackage`
is being called directly, and replace `null` entries with actual
manifest values.

Fixes gh-21705
5 years ago
Stephane Nicoll 400a168ce9 Merge branch '2.2.x' into 2.3.x
Closes gh-21720
5 years ago
Stephane Nicoll 221e248b66 Merge pull request #21671 from dreis2211
* pr/21671:
  Remove usages of deprecated Connector.setAttribute()

Closes gh-21671
5 years ago
dreis2211 9bb22ffb69 Remove usages of deprecated Connector.setAttribute()
See gh-21671
5 years ago
Stephane Nicoll 79a5ca2941 Merge branch '2.2.x' into 2.3.x 5 years ago
Stephane Nicoll eb38eeaf30 Polish 5 years ago
Stephane Nicoll baef6c803d Merge pull request #21692 from making
* pr/21692:
  Fix event name in documentation

Closes gh-21692
5 years ago
Toshiaki Maki 0cd526c266 Fix event name in documentation
See gh-21692
5 years ago
Stephane Nicoll e936e9aa6a Merge pull request #21653 from ThierrySquirrel
* pr/21653:
  Polish "Add reference to rocketmq-spring-boot-starter"
  Add reference to rocketmq-spring-boot-starter

Closes gh-21653
5 years ago
Stephane Nicoll 4624bf6552 Polish "Add reference to rocketmq-spring-boot-starter"
See gh-21653
5 years ago
ThierrySquirrel c547567882 Add reference to rocketmq-spring-boot-starter
See gh-21653
5 years ago
Andy Wilkinson 4fdd1a64c9 Merge branch '2.2.x' into 2.3.x
Closes gh-21718
5 years ago
Andy Wilkinson 1a52009cfb Migrate CustomServletPathSampleActuatorTests to JUnit Jupiter
Closes gh-21717
5 years ago
Andy Wilkinson 0415c307c7 Merge branch '2.2.x' into 2.3.x
Closes gh-21683
5 years ago
Andy Wilkinson 97533a5364 Merge branch '2.1.x' into 2.2.x
Closes gh-21682
5 years ago
Andy Wilkinson 20f0b41099 Upgrade CI to Docker 19.03.9
Closes gh-21681
5 years ago
Phillip Webb 7561123cd9 Merge branch '2.2.x' into 2.3.x
Closes gh-21709
5 years ago
Phillip Webb 10fdd65063 Add prepare-forward-merge script
Add a git hook script that can be used to prepare a sensible merge
commit message.

Closes gh-21688
5 years ago
Phillip Webb ba53d10060 Merge branch '2.2.x' into 2.3.x
Closes gh-21706
5 years ago
Phillip Webb 39caf45155 Allow forward merge to work with .x patterns
Closes gh-21687
5 years ago
Phillip Webb 4a6e08c817 Add logging to forward-merge script
Add some logging to aid with development.
5 years ago
Phillip Webb 4a0d372675 Merge branch '2.2.x' into 2.3.x 5 years ago
Phillip Webb b6474f2ca1 Remove accidentally committed hook file 5 years ago
Andy Wilkinson 24138c104c Use highlightjs for syntax highlighting in Asciidoctor's HTML output
Closes gh-21701
5 years ago
Andy Wilkinson c0f748e143 Always apply retry plugin but only retry on CI
Previously, the retry plugin was only applied on CI as we do not want
tests to be retried in local builds. Unfortunately, this arrangement
led to test tasks from CI builds having additional doFirst and doLast
actions and an additional property. These differences meant that the
output from a test task that has run on CI could not be used by a
local build.

This commit changes our configuration of the test retry plugin so
that it is now always applied. To retain the behaviour of only
retrying tests on CI, max retries is configured to 3 on CI and 0 for
local builds.

Closes gh-21698
5 years ago
Phillip Webb 4d37430bfe Use servlet context that can access classloader
Update `SpringBootServletInitializer` to use the `ServletContext` that
was provided to the initial `onStartup` call rather than the
one from the `ServletContextEvent`. This allows the `getClassLoader()`
call to complete without throwing an `UnsupportedOperationException`.

Fixes gh-21684
5 years ago
Scott Frederick 29253264b4 Improve Docker API 5xx error messages
This commit improves the error messages returned by the Spring Boot
build plugins when a 5xx status code is returned from the Docker
API while attempting to build an image. If the error response has
contents containing a JSON structure with a "message" key, the value
associated with that key will be included in the exception message
and in the build plugin output error.

Fixes gh-21515
5 years ago
Andy Wilkinson 1486ce5ae0 Merge pull request #21673 from dreis2211
* gh-21673:
  Polish Slack notification when no build scan was published

Closes gh-21673
5 years ago
dreis2211 0f6767f274 Polish Slack notification when no build scan was published
See gh-21673
5 years ago
Andy Wilkinson 9bfb088931 Upgrade to Gradle Enterprise Plugin 3.3.3
Closes gh-21675
5 years ago
Andy Wilkinson 23b329be07 Upgrade to Gradle Enterprise Conventions Plugin 0.0.3
Closes gh-21674
5 years ago
Andy Wilkinson daeca9f332 Restore Boot 2.2's compile-scoped dependencies
Fixes gh-21507
5 years ago
Andy Wilkinson 210e565741 Use dirMode and fileMode to configure CLI archive entry permissions
Closes gh-21453
5 years ago
Andy Wilkinson d30a0ee811 Ensure that the build uses UTF-8 encoding everywhere by default
Closes gh-21664
5 years ago
Andy Wilkinson a2bfdb5b33 Merge branch '2.2.x' into 2.3.x
Closes gh-21663
5 years ago
Andy Wilkinson 29c2a0471d Add Oracle DB dependency management under com.oracle.database
Closes gh-20333
5 years ago
Phillip Webb e39d7971fb Merge branch '2.2.x' into 2.3.x 5 years ago
Phillip Webb 864daab03a Merge branch '2.1.x' into 2.2.x 5 years ago
Phillip Webb b5fe3c3494 Refine YAML type restriction error
Closes gh-21596
5 years ago
Phillip Webb ebb3f5f286 Merge branch '2.2.x' into 2.3.x
Closes gh-21660
5 years ago
Phillip Webb 4fc0dec6c4 Support wrapped random property sources
Update `SpringConfigurationPropertySource` so that wrapped random
property sources can be used. It's assumed that wrapped random
sources will use the name of the source as the prefix.

Closes gh-21595
5 years ago
Madhura Bhave 2dc8048d08 Add missing since tags
Closes gh-21576
5 years ago
Phillip Webb 2589f980d5 Merge branch '2.2.x' into 2.3.x
Closes gh-21655
5 years ago
Phillip Webb 09a47c9aad Fix containsDescendantOf for random sources
Fix the `containsDescendantOf` logic for random property sources to
ensure that ancestors are correctly matched.

Closes gh-21654
5 years ago
Andy Wilkinson f0bc8ee73c Fix version placeholder replacement in Gradle plugin docs
Closes gh-21640
5 years ago
Phillip Webb 7104d8d81e Polish 5 years ago
Phillip Webb fc4efe3bf0 Fix Maven plugin help support
Update `MavenPluginPlugin` to fix HelpMojo support.

Closes gh-21556
5 years ago
Madhura Bhave 1f28141f3e Use the right property in test 5 years ago
Phillip Webb 4dff0beb80 Merge branch '2.2.x' into 2.3.x
Closes gh-21645
5 years ago