Merge branch '2.3.x' into 2.4.x

Closes gh-25789
This commit is contained in:
Scott Frederick
2021-03-26 15:16:01 -05:00
16 changed files with 494 additions and 58 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 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.
@@ -40,7 +40,7 @@ class ImagePackagerTests extends AbstractPackagerTests<ImagePackager> {
@Override
protected ImagePackager createPackager(File source) {
return new ImagePackager(source);
return new ImagePackager(source, null);
}
@Override