Merge branch '3.1.x' into 3.2.x

Closes gh-39091
This commit is contained in:
Andy Wilkinson
2024-01-11 09:56:35 +00:00
150 changed files with 358 additions and 353 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -217,7 +217,7 @@ class ExtractCommandTests {
return FileCopyUtils.copyToString(reader);
}
private static class TestLayers implements Layers {
private static final class TestLayers implements Layers {
@Override
public Iterator<String> iterator() {