dreis2211
d8deee7cf6
Update to JDK 17 in launch script tests
...
See gh-29201
2022-01-04 16:24:12 +01:00
Phillip Webb
003fb229fd
Merge branch '2.7.x'
2021-12-16 13:07:22 -08:00
Andy Wilkinson
fe7b13ec46
Upgrade to Spring Framework 6 and Jakarta EE 9
...
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872
See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson
900085628a
Raise the minimum supported version of Java to 17
...
Closes gh-28101
2021-11-30 15:37:40 +00:00
Andy Wilkinson
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson
c80283b85f
Merge branch '2.5.x'
...
Closes gh-28653
2021-11-12 13:05:42 +00:00
Andy Wilkinson
92fd3b79a5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28652
2021-11-12 13:05:14 +00:00
Andy Wilkinson
08aac25c00
Limit logging produced by spring-boot-loader-tests's intTest task
...
Closes gh-28651
2021-11-12 13:04:10 +00:00
Andy Wilkinson
c7a2d61aee
Merge branch '2.4.x'
...
Closes gh-28485
2021-10-29 13:48:36 +01:00
Andy Wilkinson
7fe6f4887c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28484
2021-10-29 13:48:23 +01:00
Andy Wilkinson
22d85e6d7b
Allow tests to be run in parallel across multiple workers
...
Closes gh-19876
2021-10-29 12:48:45 +01:00
Stephane Nicoll
4ebac4cc66
Merge branch '2.5.x'
...
Closes gh-28279
2021-10-11 09:09:15 +02:00
Stephane Nicoll
0103eb123b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28278
2021-10-11 09:09:08 +02:00
dreis2211
ae1167e026
Remove unused settings.xml in integration tests
...
See gh-28269
2021-10-11 09:08:29 +02:00
Andy Wilkinson
0b58d4858d
Merge branch '2.5.x'
...
Closes gh-28200
2021-10-05 11:13:20 +01:00
Andy Wilkinson
322615d9c5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28199
2021-10-05 11:12:48 +01:00
Andy Wilkinson
8c3820f87e
Fix up-to-date checking of syncAppSource tasks
...
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.
This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.
Closes gh-28197
2021-10-05 11:08:22 +01:00
Andy Wilkinson
29637706a9
Merge branch '2.5.x'
...
Closes gh-28166
2021-10-01 14:16:33 +01:00
Andy Wilkinson
14a57adb53
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28165
2021-10-01 14:16:20 +01:00
Andy Wilkinson
35b16ea04e
Minimize dependencies of launch script test app
...
Closes gh-28164
2021-10-01 14:15:52 +01:00
Phillip Webb
4c2c4ec16c
Merge branch '2.5.x'
2021-09-21 11:25:36 -07:00
Phillip Webb
5ba69634c9
Merge branch '2.4.x' into 2.5.x
2021-09-21 11:17:55 -07:00
Phillip Webb
dfd36673f7
Update copyright year of changed files
2021-09-21 11:17:19 -07:00
dreis2211
cf0fcafd13
Polish
...
See gh-27940
2021-09-21 08:08:29 +02:00
Andy Wilkinson
2dfdcf5e88
Merge branch '2.5.x'
...
Closes gh-27754
2021-08-18 13:52:23 +01:00
Andy Wilkinson
0d904b8868
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson
0b7994a679
Polish "Use 2012 for copyright beginning year"
...
See gh-27734
2021-08-18 13:48:29 +01:00
Andy Wilkinson
14db8aec95
Skip server tests on Java 16 as Gradle Plugin is not available
...
See gh-27476
2021-07-23 19:44:29 +01:00
Andy Wilkinson
f830ce5e17
Merge branch '2.5.x'
2021-07-23 17:40:29 +01:00
Andy Wilkinson
27ae302905
Merge branch '2.4.x' into 2.5.x
2021-07-23 17:40:20 +01:00
Andy Wilkinson
931409cdd4
Update copyright header in changed files
2021-07-23 17:39:55 +01:00
Andy Wilkinson
fc9f38351a
Merge branch '2.5.x'
...
Closes gh-27479
2021-07-23 17:34:55 +01:00
Andy Wilkinson
bd3aec4f80
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27478
2021-07-23 17:30:27 +01:00
Andy Wilkinson
d9a24f32b4
Rework spring-boot-server-tests to avoid using Maven
...
Closes gh-27476
2021-07-23 17:30:07 +01:00
Scott Frederick
9f001efa29
Adjust fat jar central directory to account for launch script
...
An upgrade to Apache Commons Compress allows the build plugins to write
the launch script to the fat jar as a proper preamble, making the file
compatible with more jar and zip tooling.
Fixes gh-22336
2021-07-19 15:02:42 -05:00
Andy Wilkinson
a7334deb54
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27234
2021-07-10 12:05:40 +01:00
Andy Wilkinson
57d7ba0836
Switch s-b-server-tests from libs-snapshot to snapshot and milestone
...
Closes gh-27233
2021-07-10 12:04:55 +01:00
Phillip Webb
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -07:00
Stephane Nicoll
d3c817b7ba
Polish "Remove unnecessary throws declaration in tests"
...
See gh-26441
2021-05-17 09:36:53 +02:00
Andy Wilkinson
d18af399f9
Merge branch '2.4.x'
...
Closes gh-26352
2021-05-04 10:22:25 +01:00
Andy Wilkinson
1417c1b0c4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26351
2021-05-04 10:22:12 +01:00
Andy Wilkinson
4c42810df9
Ensure that server tests pick up latest snapshots
...
Closes gh-25921
2021-05-04 09:51:15 +01:00
Andy Wilkinson
47516b50c3
Merge branch '2.4.x'
...
Closes gh-26246
2021-04-27 10:39:54 +01:00
Andy Wilkinson
b1c32f2a8a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26245
2021-04-27 10:39:36 +01:00
Andy Wilkinson
ad67c3d50f
Avoid using yum (which requires http:// access) in launch script tests
...
Fixes gh-26240
2021-04-27 10:39:19 +01:00
Phillip Webb
beaf03a008
Update copyright year of changed files
2021-04-15 12:22:48 -07:00
Andy Wilkinson
67c81100de
Merge branch '2.4.x'
...
Closes gh-25991
2021-04-09 19:07:02 +01:00
Andy Wilkinson
2b9ba96287
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25990
2021-04-09 19:06:38 +01:00
Andy Wilkinson
0bc5c2ba8c
Ensure that containers' static resource handling not MVC's is used
...
Closes gh-25949
2021-04-09 17:48:03 +01:00
dreis2211
a9a37f0dd5
Increase test coverage on Java 16
...
See gh-25809
2021-03-26 19:38:54 +00:00
Stephane Nicoll
6aaf9f47be
Merge branch '2.4.x'
...
Closes gh-25524
2021-03-06 08:16:35 +01:00
dreis2211
1a803448f0
Exclude GradleBuild tasks on JDK 16 for now
...
See gh-25523
2021-03-06 08:15:56 +01:00
Andy Wilkinson
3b235e4960
Merge branch '2.4.x'
...
See gh-25482
2021-03-03 17:56:42 +00:00
Andy Wilkinson
f85c7c9ef1
Merge branch '2.3.x' into 2.4.x
...
See gh-25481
2021-03-03 17:56:16 +00:00
Andy Wilkinson
da3920bd46
Wait for process to exit to avoid race with file deletion
...
See gh-25457
2021-03-03 17:55:37 +00:00
Andy Wilkinson
4a74521174
Merge branch '2.4.x'
...
See gh-25482
2021-03-03 16:43:53 +00:00
Andy Wilkinson
fefd49cce7
Merge branch '2.3.x' into 2.4.x
...
See gh-25481
2021-03-03 16:43:18 +00:00
Andy Wilkinson
c5cfb8750b
Delete files after destroying processes that may be accessing them
...
Closes gh-25457
2021-03-03 16:42:49 +00:00
Andy Wilkinson
59d8c97634
Merge branch '2.4.x'
...
Closes gh-25482
2021-03-03 13:46:58 +00:00
Andy Wilkinson
e984f0ca31
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25481
2021-03-03 13:46:39 +00:00
dreis2211
b0a6e92fb6
Speed up spring-boot-server-tests
...
See gh-25457
2021-03-03 13:34:41 +00:00
Andy Wilkinson
db781a0d84
Merge branch '2.4.x'
...
See gh-25077
2021-02-02 15:14:18 +00:00
Andy Wilkinson
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380
Add junit-platform-launcher dependency by convention
...
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb
d8b6960997
Merge branch '2.4.x'
...
Closes gh-25077
2021-02-01 16:08:57 -08:00
Phillip Webb
257608a3a3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb
939b5dfc26
Add junit-platform-launcher dependency
...
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.
Closes gh-25074
2021-02-01 15:31:28 -08:00
Phillip Webb
82791b4eda
Improve performance of Tomcat 'jar:war:file' URLs
...
Update jar `Handler` fallback logic to directly support Tomcat
'jar:war:file' URLs. This commit allows contents to be accessed without
the JDK needing to extracted the nested jar to the temporary folder.
Closes gh-24553
2020-12-17 22:51:19 -08:00
Phillip Webb
abd0b484bc
Merge branch '2.3.x' into 2.4.x
2020-12-17 22:50:19 -08:00
Phillip Webb
b351288f48
Fix integration test app detection
...
See gh-18631
2020-12-17 22:32:56 -08:00
Phillip Webb
a2a153ade6
Fix name clash with integration test apps
...
Rename "app" projects in `spring-boot-launch-script-tests` and
`spring-boot-loader-tests` to something unique.
See gh-18631
2020-12-17 22:00:12 -08:00
Phillip Webb
0730949325
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24554
2020-12-17 20:47:13 -08:00
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
2020-12-17 20:43:41 -08:00
Stephane Nicoll
60530b9b5b
Merge branch '2.3.x'
...
Closes gh-24348
2020-12-07 11:56:35 +01:00
Stephane Nicoll
07e32bf52e
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24347
2020-12-07 11:55:40 +01:00
Stephane Nicoll
f64b7f8465
Use proper CentOS base image
...
See gh-24344
2020-12-07 11:46:33 +01:00
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
2020-12-07 10:33:29 +01:00
Stephane Nicoll
2e4b338704
Merge branch '2.3.x'
...
Closes gh-23155
2020-09-01 11:32:00 +02:00
Stephane Nicoll
a341d00529
Review instructions for running launch script tests with Gradle
...
Closes gh-20606
2020-09-01 11:30:50 +02:00
Andy Wilkinson
07b6f83c7a
Merge branch '2.3.x'
2020-08-04 18:24:28 +01:00
Andy Wilkinson
1233288df0
Disable JarLaunchScriptIntegrationTests without Docker
...
See gh-21388
2020-08-04 18:23:06 +01:00
Andy Wilkinson
3210bc59ca
Merge branch '2.3.x'
...
Closes gh-22722
2020-08-04 13:33:19 +01:00
Andy Wilkinson
323b097623
Merge branch '2.2.x' into 2.3.x
...
Closes gh-22721
2020-08-04 13:32:49 +01:00
Andy Wilkinson
84ff233590
Polish "Test the launch script when executed directly"
...
See gh-21388
2020-08-04 11:29:53 +01:00
Alexey Vinogradov
02a6a84499
Test the launch script when executed directly
...
See gh-21388
2020-08-04 10:18:35 +01:00
Brian Clozel
89688d61ac
Revert back to /snapshot repository for SNAPTHOTs
...
See gh-22640
2020-07-29 18:36:11 +02:00
Brian Clozel
f185e07573
Add missing libs-snapshot repository declaration
...
See gh-22640
2020-07-29 16:26:24 +02:00
Andy Wilkinson
2e1366f61f
Make spring-boot-dependencies available when building test app
2020-07-24 18:30:52 +01:00
Andy Wilkinson
8436fa9159
Make spring-boot -dependencies and -parent available
...
See gh-22066
2020-06-29 14:46:10 +01:00
Phillip Webb
ff3b05a421
Add json starter to integration test repo
2020-04-30 20:55:35 -07:00
Phillip Webb
ad1248e4ec
Replace "folder" with "directory"
...
Consistently use the term "directory" instead of "folder"
Closes gh-21218
2020-04-28 19:20:24 -07:00
Phillip Webb
bf41da5322
Update copyright year of changed files
2020-04-21 18:12:27 -07:00
Madhura Bhave
1342e4970a
Provide a condition for detecting war deployments
...
Closes gh-19421
2020-04-09 18:52:06 -07:00
Phillip Webb
2198614359
Fix incorrect spring replace due to "
change
2020-01-22 17:11:31 -08:00
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`.
2020-01-22 16:02:38 -08:00
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.
2020-01-22 15:49:52 -08:00
Phillip Webb
b4229239ab
Protect against NPE in server tests
...
Update `AbstractApplicationLauncher` to not attempt to shutdown
the process if startup fails.
2020-01-22 12:54:35 -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
Phillip Webb
fd792cedaf
Polish DisabledIfDockerUnavailable
...
Convert `DisabledIfDockerUnavailable` to be an annotation and make
it slightly less noisy.
2020-01-16 16:54:43 -08:00
Phillip Webb
862462b791
Update copyright year of changed files
2020-01-13 17:04:19 -08:00
Andy Wilkinson
b5ae8b0af5
Disable tests that use Docker when Docker is unavailable
...
Closes gh-19616
2020-01-10 20:35:18 +00:00
Andy Wilkinson
ce99db1902
Port the build to Gradle
...
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Andy Wilkinson
6d8f07d899
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19570
2020-01-08 11:42:56 +00:00
Andy Wilkinson
8b4c6c2cf9
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19415
2019-12-20 14:43:53 +00:00
Andy Wilkinson
f75c73eb7a
Use Testcontainers in the launch script integration tests
...
Closes gh-19366
2019-12-20 13:15:32 +00:00
dreis2211
ded476b5ec
Reduce visibility of test methods
...
See gh-19294
See gh-19287
2019-12-05 11:29:17 +00:00
Andy Wilkinson
79b5fd9d73
Polish "Allow the user that runs the app to be specified via an env var"
...
See gh-16973
2019-09-21 20:14:49 +01:00
Wagner Macedo
b57f35893c
Allow the user that runs the app to be specified via an env var
...
See gh-16973
2019-09-21 17:57:20 +01:00
Andy Wilkinson
1b237de5f5
Use Awaitility in our own tests
...
Closes gh-18227
2019-09-13 20:50:14 +01:00
Andy Wilkinson
9ed6b92ecc
Merge branch '2.1.x'
2019-09-02 17:22:09 +01:00
Andy Wilkinson
b8070a8339
Skip tests on Windows that exceed its file system's limitations
2019-09-02 17:18:20 +01:00
Andy Wilkinson
bbec7b0f37
Merge branch '2.1.x'
...
Closes gh-17994
2019-08-29 12:30:06 +01:00
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
2019-08-29 12:13:40 +01:00
Madhura Bhave
1b10ecbe1b
Merge branch '2.1.x'
2019-07-29 11:08:38 -07:00
Johnny Lim
77a262c542
Polish
...
See gh-17691
2019-07-29 11:01:23 -07:00
Madhura Bhave
4a309ed491
Merge branch '2.1.x'
2019-07-24 16:27:49 -07:00
Madhura Bhave
f13f96d705
Fix customizer for windows tests
...
JettyServerCustomizers beans do not get picked up automatically in 2.1.x
See gh-15553
2019-07-24 16:11:18 -07:00
Madhura Bhave
9bd1187f40
Merge branch '2.1.x'
...
Closes gh-17628
2019-07-24 13:39:45 -07:00
Madhura Bhave
bb85612723
Add concourse pipeline for Windows
...
Closes gh-15553
2019-07-24 13:25:54 -07:00
Phillip Webb
8bc780762a
Merge branch '2.1.x'
2019-07-24 11:42:48 +01:00
Phillip Webb
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
Andy Wilkinson
cc85746942
Merge branch '2.1.x'
...
Closes gh-17575
2019-07-18 17:17:05 +01:00
Andy Wilkinson
591250f75e
Polish "Hide loader classes from Tomcat's ServletContext resource paths"
...
See gh-17538
2019-07-18 17:05:31 +01:00
Phillip Webb
a9ba7080ce
Merge branch '2.1.x'
2019-07-17 21:48:42 +01:00
Phillip Webb
01933f9b06
Merge previously split strings
...
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
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
2019-07-03 11:39:47 -07:00
Madhura Bhave
0a02a3a19c
Move Hibernate52 tests under smoke tests
...
Closes gh-17393
2019-07-02 16:06:06 -07:00
Phillip Webb
605599138e
Merge branch '2.1.x'
2019-06-28 23:56:02 -07:00
Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
Phillip Webb
8edf88a08b
Polish M2Eclipse ignore configuration
...
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
2019-06-27 09:42:14 -07:00
Andy Wilkinson
66f1344f7c
Merge branch '2.1.x'
...
Closes gh-17335
Closes gh-17292
2019-06-27 12:00:34 +01:00
Stephane Nicoll
e560b7f6ba
Remove public modifier on JUnit5 lifecycle methods
...
See gh-17292
2019-06-21 18:09:05 +02:00
Phillip Webb
b3d5cd538d
Add JUnit 5 checkstyle rules
...
Add a rule to enforce JUnit 5 usage and conventions.
Closes gh-17093
2019-06-10 16:16:45 -07:00
Phillip Webb
266d6334b2
Fix checkstyle RedundantModifier test violations
2019-06-07 20:46:33 -07:00
Phillip Webb
cde4f0d688
Fix checkstyle violations
2019-06-07 13:27:14 -07:00
Phillip Webb
866e2b712e
Merge branch '2.0.x' into 2.1.x
2019-06-07 12:35:28 -07:00
Phillip Webb
2c8881a908
Merge branch '1.5.x' into 2.0.x
2019-06-07 12:34:13 -07:00
Andy Wilkinson
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01:00
Andy Wilkinson
aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson
c6c139d980
Merge branch '1.5.x' into 2.0.x
2019-06-07 10:46:31 +01:00
Phillip Webb
d306b31ce9
Merge branch '2.1.x'
2019-06-04 02:08:00 -07:00
Phillip Webb
ccfbd03482
Merge branch '2.0.x' into 2.1.x
2019-06-04 02:07:14 -07:00
Phillip Webb
b442d3b906
Merge branch '1.5.x' into 2.0.x
2019-06-04 01:49:03 -07:00
Phillip Webb
5fba43aa31
Merge branch '1.5.x' into 2.0.x
2019-06-04 00:05:57 -07:00
Phillip Webb
1e44aba772
Fix compiler warnings and polish
...
Fix various compiler warnings and apply a little polish.
2019-04-24 19:37:42 -07:00
Andy Wilkinson
d182ee2246
Merge branch '2.1.x'
...
Closes gh-16637
2019-04-24 10:19:31 +01:00
Andy Wilkinson
ed85735822
Merge branch '2.0.x' into 2.1.x
...
Closes gh-16636
2019-04-24 10:10:01 +01:00
Andy Wilkinson
3e3d7545cc
Merge branch '1.5.x' into 2.0.x
2019-04-24 10:01:50 +01:00
Andy Wilkinson
27990180ab
Merge branch '2.1.x'
...
Closes gh-16626
2019-04-23 14:30:21 +01:00
Andy Wilkinson
73704c84e1
Use latest Docker Java and a compatible version of Jersey
...
Closes gh-16625
2019-04-23 14:29:32 +01:00
Phillip Webb
5f1bbf8c72
Update copyright header of changed files
2019-04-15 17:51:08 -07:00
Madhura Bhave
3c203e9b0d
Update devtools to use @Lazy(false)
...
Fixes gh-16184
2019-04-05 18:02:27 -07:00
Andy Wilkinson
4900505425
Merge branch '2.0.x' into 2.1.x
2019-03-26 13:53:57 +00:00
Andy Wilkinson
fedb40a2bf
Merge branch '1.5.x' into 2.0.x
2019-03-26 13:48:32 +00:00
Andy Wilkinson
36c1c051b8
Merge branch '2.1.x'
2019-03-20 16:55:10 +00:00
Andy Wilkinson
e23f72c8b0
Merge branch '2.0.x' into 2.1.x
2019-03-20 16:53:48 +00:00
Andy Wilkinson
9fbd38ab3c
Merge branch '1.5.x' into 2.0.x
2019-03-20 16:45:26 +00:00
Spring Operator
00ab30362c
Use HTTPS for external links in XML files
...
See gh-16270
2019-03-20 14:33:25 +00:00
Andy Wilkinson
b828b398b5
Merge branch '2.1.x'
2019-03-19 17:11:45 +00:00
Spring Operator
b32c0080c3
Update build and setup configuration to use HTTPS
...
See gh-16247
2019-03-19 17:06:45 +00:00
Andy Wilkinson
a36aa67b52
Merge branch '2.0.x' into 2.1.x
2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed
Update build and setup configuration to use HTTPS
...
See gh-16246
2019-03-19 16:58:31 +00:00
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
2019-03-12 10:05:06 +00:00
Spring Operator
c9c554b834
Update build and setup configuration to use HTTPS
...
See gh-16106
2019-03-12 10:02:44 +00:00
Stephane Nicoll
8ff0a9c5a9
Merge branch '2.1.x'
2019-03-12 10:51:08 +01:00
Johnny Lim
bcfbabe6cd
Polish
...
Closes gh-16193
2019-03-12 10:50:32 +01:00
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
2019-03-06 11:20:51 +00:00
Andy Wilkinson
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
Phillip Webb
ba1ef52e39
Merge branch '2.0.x'
2018-11-29 15:32:48 -08:00
Phillip Webb
893d5666be
Update copyright year for changed files
2018-11-29 15:30:51 -08:00
Madhura Bhave
1bb788f5c2
Merge branch '2.0.x'
2018-11-15 14:17:05 -08:00
Phillip Webb
657a5347be
Use random port for Devtools integration tests
...
Closes gh-15013
2018-11-15 14:02:21 -08:00
Andy Wilkinson
bfb0886495
Tolerate Hibernate 5.2
...
Closes gh-15100
2018-11-08 12:24:22 +00:00
Phillip Webb
80685f81bf
Merge branch '2.0.x'
2018-10-29 22:33:21 -07:00
Phillip Webb
744cdf43e9
Revert "Use random port for DevTools tests"
...
This reverts commit 4630c2292f
.
2018-10-29 22:33:00 -07:00
Phillip Webb
2d305341a4
Merge branch '2.0.x'
2018-10-29 17:43:43 -07:00
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.
2018-10-29 17:42:47 -07:00
Phillip Webb
f3fa20b2d1
Polish
2018-10-29 14:25:45 -07:00
Phillip Webb
6aedb69443
Update copyright year for changed files
2018-10-05 13:31:33 -07:00
Andy Wilkinson
4a222cb4e5
Polish "Log a warning when using fallback for pid and log locations"
...
Closes gh-14519
2018-10-04 15:21:05 +01:00
Stephane Nicoll
0eae32371f
Polish contribution
...
Closes gh-14667
2018-10-03 13:59:32 +02:00
Johnny Lim
335775892b
Polish
...
See gh-14667
2018-10-03 13:57:18 +02:00
Andy Wilkinson
65295e0e14
Merge branch '2.0.x'
2018-09-19 19:52:19 +01:00
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
2018-09-19 18:02:01 +01:00
durigon
7aaeefbc0e
Use Matcher from pre-compiled Pattern rather than String for replaceAll
...
Closes gh-14483
2018-09-17 10:54:54 +01:00
Phillip Webb
a6c9c92f2e
Merge branch '2.0.x'
2018-07-28 01:35:43 +01:00
Phillip Webb
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Andy Wilkinson
76ea2d9dd4
Ensure that the server tests app can resolve milestone poms
2018-05-16 20:23:04 +01:00
Phillip Webb
6e09e497f2
Formatting
2018-05-04 12:06:19 -07:00
Phillip Webb
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
Andy Wilkinson
49089546f8
Merge branch '1.5.x' into 2.0.x
2018-05-02 10:57:29 +01:00
Johnny Lim
b941c5f1a6
Polish
...
Closes gh-12981
2018-04-27 09:29:16 +02:00
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
2018-03-29 19:54:41 -07:00