Commit Graph

363 Commits (main)

Author SHA1 Message Date
Phillip Webb 0730949325 Merge branch '2.3.x' into 2.4.x
Closes gh-24554
4 years ago
Phillip Webb c4e41305d5 Prevent Tomcat URL "reflective access" warnings
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.

Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.

Fixes gh-18631
4 years ago
Stephane Nicoll 60530b9b5b Merge branch '2.3.x'
Closes gh-24348
4 years ago
Stephane Nicoll 07e32bf52e Merge branch '2.2.x' into 2.3.x
Closes gh-24347
4 years ago
Stephane Nicoll f64b7f8465 Use proper CentOS base image
See gh-24344
4 years ago
Stephane Nicoll a5a8545801 Switch integration tests to CentOS 7
This commit upgrades the docker image for CentOS to Centos 7.9 as
CentOs 6 is EOL since November 30. Given that CentOS 7 does no longer
support SysVinit, this commit also updates the integration tests to not
test this OS anymore.

Closes gh-24344
4 years ago
Stephane Nicoll 2e4b338704 Merge branch '2.3.x'
Closes gh-23155
4 years ago
Stephane Nicoll a341d00529 Review instructions for running launch script tests with Gradle
Closes gh-20606
4 years ago
Andy Wilkinson 07b6f83c7a Merge branch '2.3.x' 4 years ago
Andy Wilkinson 1233288df0 Disable JarLaunchScriptIntegrationTests without Docker
See gh-21388
4 years ago
Andy Wilkinson 3210bc59ca Merge branch '2.3.x'
Closes gh-22722
4 years ago
Andy Wilkinson 323b097623 Merge branch '2.2.x' into 2.3.x
Closes gh-22721
4 years ago
Andy Wilkinson 84ff233590 Polish "Test the launch script when executed directly"
See gh-21388
4 years ago
Alexey Vinogradov 02a6a84499 Test the launch script when executed directly
See gh-21388
4 years ago
Brian Clozel 89688d61ac Revert back to /snapshot repository for SNAPTHOTs
See gh-22640
4 years ago
Brian Clozel f185e07573 Add missing libs-snapshot repository declaration
See gh-22640
4 years ago
Andy Wilkinson 2e1366f61f Make spring-boot-dependencies available when building test app 4 years ago
Andy Wilkinson 8436fa9159 Make spring-boot -dependencies and -parent available
See gh-22066
4 years ago
Phillip Webb ff3b05a421 Add json starter to integration test repo 5 years ago
Phillip Webb ad1248e4ec Replace "folder" with "directory"
Consistently use the term "directory" instead of "folder"

Closes gh-21218
5 years ago
Phillip Webb bf41da5322 Update copyright year of changed files 5 years ago
Madhura Bhave 1342e4970a Provide a condition for detecting war deployments
Closes gh-19421
5 years ago
Phillip Webb 2198614359 Fix incorrect spring replace due to `"` change 5 years ago
Phillip Webb e0013454b5 Use parentheses when declaring dependencies
Update all dependencies declarations to use the form `scope(reference)`
rather than `scope reference`.

Prior to this commit we declared dependencies without parentheses unless
we were forced to add them due to an `exclude`.
5 years ago
Phillip Webb 0209cd3e4c Polish quote form used in Gradle scripts
Replace Gradle single quote strings with the double quote form
whenever possible. The change helps to being consistency to the
dependencies section where mostly single quotes were used, but
occasionally double quotes were required due to `${}` references.
5 years ago
Phillip Webb b4229239ab Protect against NPE in server tests
Update `AbstractApplicationLauncher` to not attempt to shutdown
the process if startup fails.
5 years ago
Phillip Webb bfd2ca7fd9 Polish Gradle expression references
Expand all expression `$` references to the full `${...}` form.
5 years ago
Phillip Webb fd792cedaf Polish DisabledIfDockerUnavailable
Convert `DisabledIfDockerUnavailable` to be an annotation and make
it slightly less noisy.
5 years ago
Phillip Webb 862462b791 Update copyright year of changed files 5 years ago
Andy Wilkinson b5ae8b0af5 Disable tests that use Docker when Docker is unavailable
Closes gh-19616
5 years ago
Andy Wilkinson ce99db1902 Port the build to Gradle
Closes gh-19609
Closes gh-19608
5 years ago
Andy Wilkinson 6d8f07d899 Merge branch '2.1.x' into 2.2.x
Closes gh-19570
5 years ago
Andy Wilkinson 8b4c6c2cf9 Merge branch '2.1.x' into 2.2.x
Closes gh-19415
5 years ago
Andy Wilkinson f75c73eb7a Use Testcontainers in the launch script integration tests
Closes gh-19366
5 years ago
dreis2211 ded476b5ec Reduce visibility of test methods
See gh-19294
See gh-19287
5 years ago
Andy Wilkinson 79b5fd9d73 Polish "Allow the user that runs the app to be specified via an env var"
See gh-16973
5 years ago
Wagner Macedo b57f35893c Allow the user that runs the app to be specified via an env var
See gh-16973
5 years ago
Andy Wilkinson 1b237de5f5 Use Awaitility in our own tests
Closes gh-18227
5 years ago
Andy Wilkinson 9ed6b92ecc Merge branch '2.1.x' 5 years ago
Andy Wilkinson b8070a8339 Skip tests on Windows that exceed its file system's limitations 5 years ago
Andy Wilkinson bbec7b0f37 Merge branch '2.1.x'
Closes gh-17994
5 years ago
Andy Wilkinson 9961647c7f Improve handling of reserved characters in MetaInfResourceManager
Previously, MetaInfResourceManager that we use with Undertow to serve
static resources from jar's META-INF/resources did not correctly
handle characters in the path that should be percent-encoded when
used in a URL.

This commit updates MetaInfResourceManager to encode the path before
it is used to create a URL. Prior to this encoding, encoded slashes
(%2F) are decoded as, unlike other encoded characters in the request's
URL, encoded slashes are not decoded prior to calling the
ResourceManager.

Fixes gh-17853
5 years ago
Madhura Bhave 1b10ecbe1b Merge branch '2.1.x' 5 years ago
Johnny Lim 77a262c542 Polish
See gh-17691
5 years ago
Madhura Bhave 4a309ed491 Merge branch '2.1.x' 5 years ago
Madhura Bhave f13f96d705 Fix customizer for windows tests
JettyServerCustomizers beans do not get picked up automatically in 2.1.x

See gh-15553
5 years ago
Madhura Bhave 9bd1187f40 Merge branch '2.1.x'
Closes gh-17628
5 years ago
Madhura Bhave bb85612723 Add concourse pipeline for Windows
Closes gh-15553
5 years ago
Phillip Webb 8bc780762a Merge branch '2.1.x' 5 years ago
Phillip Webb fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 5 years ago
Phillip Webb 913e831f4e Merge '1.5.x' into 2.0.x 5 years ago
Andy Wilkinson cc85746942 Merge branch '2.1.x'
Closes gh-17575
5 years ago
Andy Wilkinson 591250f75e Polish "Hide loader classes from Tomcat's ServletContext resource paths"
See gh-17538
5 years ago
Phillip Webb a9ba7080ce Merge branch '2.1.x' 5 years ago
Phillip Webb 01933f9b06 Merge previously split strings
Merge some string lines that were previously split because of the
90 chars wide formatting.
5 years ago
Phillip Webb a66c4d3096 Unify method visibility of private classes
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.

Closes gh-7316
5 years ago
Madhura Bhave 0a02a3a19c Move Hibernate52 tests under smoke tests
Closes gh-17393
5 years ago
Phillip Webb 605599138e Merge branch '2.1.x' 5 years ago
Phillip Webb 92bff3c328 Merge branch '2.0.x' into 2.1.x 5 years ago
Phillip Webb cfeb0239b7 Merge branch '1.5.x' into 2.0.x 5 years ago
Phillip Webb 8edf88a08b Polish M2Eclipse ignore configuration
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
5 years ago
Andy Wilkinson 66f1344f7c Merge branch '2.1.x'
Closes gh-17335
Closes gh-17292
5 years ago
Stephane Nicoll e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
5 years ago
Phillip Webb b3d5cd538d Add JUnit 5 checkstyle rules
Add a rule to enforce JUnit 5 usage and conventions.

Closes gh-17093
6 years ago
Phillip Webb 266d6334b2 Fix checkstyle RedundantModifier test violations 6 years ago
Phillip Webb cde4f0d688 Fix checkstyle violations 6 years ago
Phillip Webb 866e2b712e Merge branch '2.0.x' into 2.1.x 6 years ago
Phillip Webb 2c8881a908 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson b18fffaf14 Move tests to JUnit 5 wherever possible 6 years ago
Andy Wilkinson aef92b9295 Merge branch '2.1.x'
Closes gh-17079
6 years ago
Andy Wilkinson 24925c3dae Merge branch '2.0.x' into 2.1.x
Closes gh-17078
6 years ago
Andy Wilkinson c6c139d980 Merge branch '1.5.x' into 2.0.x 6 years ago
Phillip Webb d306b31ce9 Merge branch '2.1.x' 6 years ago
Phillip Webb ccfbd03482 Merge branch '2.0.x' into 2.1.x 6 years ago
Phillip Webb b442d3b906 Merge branch '1.5.x' into 2.0.x 6 years ago
Phillip Webb 5fba43aa31 Merge branch '1.5.x' into 2.0.x 6 years ago
Phillip Webb 1e44aba772 Fix compiler warnings and polish
Fix various compiler warnings and apply a little polish.
6 years ago
Andy Wilkinson d182ee2246 Merge branch '2.1.x'
Closes gh-16637
6 years ago
Andy Wilkinson ed85735822 Merge branch '2.0.x' into 2.1.x
Closes gh-16636
6 years ago
Andy Wilkinson 3e3d7545cc Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 27990180ab Merge branch '2.1.x'
Closes gh-16626
6 years ago
Andy Wilkinson 73704c84e1 Use latest Docker Java and a compatible version of Jersey
Closes gh-16625
6 years ago
Phillip Webb 5f1bbf8c72 Update copyright header of changed files 6 years ago
Madhura Bhave 3c203e9b0d Update devtools to use @Lazy(false)
Fixes gh-16184
6 years ago
Andy Wilkinson 4900505425 Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson fedb40a2bf Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 6 years ago
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 6 years ago
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 6 years ago
Spring Operator 00ab30362c Use HTTPS for external links in XML files
See gh-16270
6 years ago
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 6 years ago
Spring Operator b32c0080c3 Update build and setup configuration to use HTTPS
See gh-16247
6 years ago
Andy Wilkinson a36aa67b52 Merge branch '2.0.x' into 2.1.x 6 years ago
Spring Operator 3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
6 years ago
Andy Wilkinson 28cf63354a Merge pull request #16106 from Spring Operator
* gh-16106:
  Drop AnyEdit from Eclipse setup as it is not available over HTTPS
  Update build and setup configuration to use HTTPS

Closes gh-16106
6 years ago
Spring Operator c9c554b834 Update build and setup configuration to use HTTPS
See gh-16106
6 years ago
Stephane Nicoll 8ff0a9c5a9 Merge branch '2.1.x' 6 years ago
Johnny Lim bcfbabe6cd Polish
Closes gh-16193
6 years ago
Andy Wilkinson d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
6 years ago
Andy Wilkinson 61d04db0d7 Minimize and centralize assumptions about build output
Closes gh-15471
6 years ago
Andy Wilkinson bbf0932f0f Exclude jcl-over-slf4j in favour of spring-jcl
Closes gh-15392
6 years ago
Phillip Webb ba1ef52e39 Merge branch '2.0.x' 6 years ago
Phillip Webb 893d5666be Update copyright year for changed files 6 years ago
Madhura Bhave 1bb788f5c2 Merge branch '2.0.x' 6 years ago
Phillip Webb 657a5347be Use random port for Devtools integration tests
Closes gh-15013
6 years ago
Andy Wilkinson bfb0886495 Tolerate Hibernate 5.2
Closes gh-15100
6 years ago
Phillip Webb 80685f81bf Merge branch '2.0.x' 6 years ago
Phillip Webb 744cdf43e9 Revert "Use random port for DevTools tests"
This reverts commit 4630c2292f.
6 years ago
Phillip Webb 2d305341a4 Merge branch '2.0.x' 6 years ago
Phillip Webb 4630c2292f Use random port for DevTools tests
Change the `RemoteApplicationLauncher` to use a random port and also
protect against an NPE if the launch fails.
6 years ago
Phillip Webb f3fa20b2d1 Polish 6 years ago
Phillip Webb 6aedb69443 Update copyright year for changed files 6 years ago
Andy Wilkinson 4a222cb4e5 Polish "Log a warning when using fallback for pid and log locations"
Closes gh-14519
6 years ago
Stephane Nicoll 0eae32371f Polish contribution
Closes gh-14667
6 years ago
Johnny Lim 335775892b Polish
See gh-14667
6 years ago
Andy Wilkinson 65295e0e14 Merge branch '2.0.x' 6 years ago
Andy Wilkinson bff93a67ce Fix remote DevTools restart when a previously added class is then changed
Previously, if a class was added and then changed, a restart would be triggered
and things would behave as if the class had been deleted. This occurred
because, when looking for additional classes that were not on the original
classpath, only files that had been added were considered. The subsequent
change to the class was noticed as a modified rather than an addition,
resulting in the class being skipped.

This commit updates the resource resolver to only ignore deleted files and
consider both added files and modified files when looking for additional
resources.

Closes gh-14205
6 years ago
durigon 7aaeefbc0e Use Matcher from pre-compiled Pattern rather than String for replaceAll
Closes gh-14483
6 years ago
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 6 years ago
Phillip Webb 7fc455654a Fix checkstyle ternary issues
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
6 years ago
Andy Wilkinson 76ea2d9dd4 Ensure that the server tests app can resolve milestone poms 7 years ago
Phillip Webb 6e09e497f2 Formatting 7 years ago
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 49089546f8 Merge branch '1.5.x' into 2.0.x 7 years ago
Johnny Lim b941c5f1a6 Polish
Closes gh-12981
7 years ago
Phillip Webb 69cbf1318c Second attempt to fix server test CI failures
Switch process redirection off and instead consume streams
and copy to System.out/System.err.

See gh-12689
7 years ago
Phillip Webb 7498e7f2cd Revert "Attempt to fix server test CI failures"
This reverts commit 32782429af.
7 years ago
Phillip Webb 32782429af Attempt to fix server test CI failures
Switch surefire configuration so that forking isn't used. This seems to
prevent the "Corrupted STDOUT by directly writing to native stream"
errors and will hopefully reduce failures on the CI server.

See gh-12689
7 years ago
Phillip Webb a4b0be089d Polish 7 years ago
Andy Wilkinson a809e8f316 Polish usage of settings.xml to configure repository
See gh-12293
7 years ago
Andy Wilkinson d0b8a84821 Use settings.xml to pass repository into server integration tests
Closes gh-12293
7 years ago
Andy Wilkinson 35b7a16917 Merge branch '1.5.x' 7 years ago
Stephane Nicoll 306c79f0de Merge branch '1.5.x' 7 years ago
Phillip Webb 4b9c3c137e Polish Collection.toArray
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
7 years ago
Andy Wilkinson e1ab62668f Merge branch '1.5.x' 7 years ago
Andy Wilkinson 76a450dfba Format with Eclipse Oxygen SR2 7 years ago
Phillip Webb c3ec316890 Move Application* and *FileWriter classes
Move `ApplicationHome`, `ApplicationPid` and `ApplicationTemp` to the
`system` package. Since `system` package is now much lower level, the
existing `FileWriter` implementations also needed to move to prevent
package tangles.

Fixes gh-8614
7 years ago
Phillip Webb 3ff772957b Add WebServerApplicationContext abstraction
Add a new `WebServerApplicationContext` interface that provides a common
abstraction for all application contexts that create and manage the
lifecycle of an embedded `WebServer`.

Allows server namespaces to become a first-class concept (rather
subverting `ConfigurableWebApplicationContext.getNamespace()`) and
allow us to drop `getServerId()` from `WebServerInitializedEvent`.

Also helps to improve `ManagementContextAutoConfiguration` and
`ManagementContextFactory`.

Fixes gh-11881
7 years ago
Andy Wilkinson 9542f5182c Move scripts for new launch script tests to correct location
See gh-11397
7 years ago
Phillip Webb 886b39293c Merge branch '1.5.x' 7 years ago
Phillip Webb b234501af3 Polish 7 years ago
Phillip Webb 6d93573db0 Merge branch '1.5.x' 7 years ago
Stephane Nicoll a5fd3fbfbd Merge branch '1.5.x' 7 years ago
Stephane Nicoll f8af6c8134 Merge branch '1.5.x' 7 years ago
Phillip Webb 49c685b7c0 Merge branch '1.5.x' 7 years ago
Johnny Lim 483d123d9b Fix imports order for Checkstyle
Closes gh-11587
7 years ago
Madhura Bhave 32557e4987 Fix imports 7 years ago
Phillip Webb b3ec2c9d1d Polish 7 years ago
Andy Wilkinson d439b73758 Use docker-java 3.0.x for launch script integration tests 7 years ago
Johnny Lim 0f0c6e0729 Polish
Closes gh-11536
7 years ago
Madhura Bhave 8102dc78cb Remove redundant throws declarations 7 years ago
Madhura Bhave 100c2ce86f Remove spring-boot-security-tests module
Closes gh-11321
7 years ago
Stephane Nicoll d5c32333d5 Merge branch '1.5.x' 7 years ago
Andy Wilkinson e216560896 Merge branch '1.5.x' 7 years ago
Johnny Lim bd0dcfb172 Utilize StandardCharsets
Closes gh-10972
7 years ago
Andy Wilkinson 66b55defa0 Adapt to password encoder changes in Spring Security
Closes gh-10762
7 years ago
Phillip Webb 748e0779b6 Update copyright year for changed files 7 years ago
Phillip Webb 455505a108 Rename embedded servlet tests
Rename `spring-boot-integration-tests-embedded-servlet-container` to
`spring-boot-server-tests`.

See gh-9316
7 years ago
Phillip Webb b6a83eb8f5 Allow integration tests to use custom repos
Update integration tests so that they can use a custom local Maven
repository.

See gh-9316
7 years ago
Phillip Webb 4ff65d58a4 Fix integration test POMs
Update integration test POMs to use CI friendly version numbers.

See gh-9316
7 years ago
Phillip Webb 8670151045 Fix the way integration tests find version numbers
Update the integration tests so that the version number is found using
the main POM.xml files. Without this change `${revision}` would be
used.

See gh-9316
7 years ago
Phillip Webb 2855010841 Fix sample POMs
Update sample POMs to follow CI friendly Maven conventions.

See gh-9316
7 years ago
Phillip Webb 89b0ba2c14 Relocate test projects under `spring-boot-tests`
Move integration and deployment tests under a single `spring-boot-tests`
module.

See gh-9316
7 years ago