You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2025/04/22 22:59:05 UTC
(maven-build-cache-extension) branch MBUILDCACHE-112 updated (2275beb -> 7c6d5df)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MBUILDCACHE-112
in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git
discard 2275beb [MBUILDCACHE-112] Upgrade parent POM to version 44
new 7c6d5df [MBUILDCACHE-112] Upgrade parent POM to version 44
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2275beb)
\
N -- N -- N refs/heads/MBUILDCACHE-112 (7c6d5df)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 5 -----
1 file changed, 5 deletions(-)
(maven-build-cache-extension) 01/01: [MBUILDCACHE-112] Upgrade parent POM to version 44
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MBUILDCACHE-112
in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git
commit 7c6d5df63352a6d53e8777a834675cdd7f9dc249
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Apr 23 00:54:36 2025 +0200
[MBUILDCACHE-112] Upgrade parent POM to version 44
---
pom.xml | 8 +-
.../buildcache/checksum/InputExclusionTest.java | 287 +++++++++++----------
.../org/apache/maven/buildcache/hash/PerfTest.java | 12 +-
.../maven/buildcache/its/CoreExtensionTest.java | 2 +-
.../buildcache/its/IncrementalRestoreTest.java | 1 +
.../apache/maven/buildcache/its/Issue74Test.java | 4 +-
.../apache/maven/buildcache/its/Issue76Test.java | 2 +-
.../maven/buildcache/its/RemoteCacheDavTest.java | 3 +-
.../maven/buildcache/xml/XmlServiceTest.java | 25 +-
9 files changed, 167 insertions(+), 177 deletions(-)
diff --git a/pom.xml b/pom.xml
index b42a1d7..f4d269f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,11 +23,10 @@ under the License.
<parent>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-extensions</artifactId>
- <version>41</version>
+ <version>44</version>
<relativePath />
</parent>
- <groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
<version>1.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -300,11 +299,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.9.0</version>
- </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --git a/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java b/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java
index ec3f283..b1edf4e 100644
--- a/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java
+++ b/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java
@@ -32,11 +32,13 @@
import org.apache.maven.buildcache.xml.config.Exclude;
import org.apache.maven.model.Build;
import org.apache.maven.project.MavenProject;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class InputExclusionTest {
@TempDir
@@ -53,31 +55,31 @@ public void exclusionByFolder() throws IOException {
// Exclude folder 1 + everything inside based on the starting path
ExclusionResolver exclusionResolver =
createExclusionResolver("folder1", "**", EntryType.ALL, MatcherType.FILENAME);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.folder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.subFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.folder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertTrue(exclusionResolver.excludesPath(fsTree.folder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.subFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.folder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
// Exclude everything inside folder 1 based on the glob
exclusionResolver = createExclusionResolver("", "folder1/**", EntryType.ALL, MatcherType.PATH);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.folder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.subFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.folder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.folder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.subFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.folder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
// Exclusion on folder
exclusionResolver = createExclusionResolver("", "folder1", EntryType.DIRECTORY, MatcherType.PATH);
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.folder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.folder1));
exclusionResolver = createExclusionResolver("", "folder1", EntryType.DIRECTORY, MatcherType.FILENAME);
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.folder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.folder1));
exclusionResolver = createExclusionResolver("", "folder1", EntryType.FILE, MatcherType.FILENAME);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.folder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.folder1));
}
/**
@@ -91,25 +93,25 @@ public void exclusionByFileExtension() throws IOException {
// Excludes all json files
ExclusionResolver exclusionResolver =
createExclusionResolver("", "*.json", EntryType.FILE, MatcherType.FILENAME);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
// Excludes all json files under folder 1
exclusionResolver = createExclusionResolver("folder1", "*.json", EntryType.FILE, MatcherType.FILENAME);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
}
/**
@@ -123,50 +125,50 @@ public void exclusionOfOneSpecificFile() throws IOException {
// Exclude the json file in subfolder 1
ExclusionResolver exclusionResolver = createExclusionResolver(
"folder1/subfolder1/other-file.json", "**", EntryType.ALL, MatcherType.FILENAME);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
// Exclude the json file in subfolder 1 by glob v1
exclusionResolver =
createExclusionResolver("folder1/subfolder1", "other-file.json", EntryType.ALL, MatcherType.FILENAME);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
// Exclude the json file in subfolder 1 by glob v2
exclusionResolver =
createExclusionResolver("", "folder1/subfolder1/other-file.json", EntryType.ALL, MatcherType.PATH);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
}
/**
@@ -180,51 +182,51 @@ public void exclusionOfOneSpecificFileWindowsStyle() throws IOException {
// Exclude the json file in subfolder 1
ExclusionResolver exclusionResolver = createExclusionResolver(
"folder1\\subfolder1\\other-file.json", "**", EntryType.ALL, MatcherType.FILENAME);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
// Exclude the json file in subfolder 1 by glob v1
exclusionResolver =
createExclusionResolver("folder1\\subfolder1", "other-file.json", EntryType.ALL, MatcherType.FILENAME);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
// Exclude the json file in subfolder 1 by glob v2 (\ is a meta character in glob syntax + in java syntax, so we
// need to double escape it)
exclusionResolver = createExclusionResolver(
"", "folder1\\\\subfolder1\\\\other-file.json", EntryType.ALL, MatcherType.PATH);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
}
/**
@@ -238,33 +240,33 @@ public void exclusionByPatternInFilename() throws IOException {
// Excludes all files containing the string "my-f" in their filename
ExclusionResolver exclusionResolver =
createExclusionResolver("", "*my-f*", EntryType.ALL, MatcherType.FILENAME);
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
// Excludes all files containing the string "my-f" in their path
exclusionResolver = createExclusionResolver("", "**my-f*", EntryType.ALL, MatcherType.PATH);
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
}
/**
@@ -307,18 +309,18 @@ public void exclusionViaProjectProperties() throws IOException {
Mockito.when(mavenProject.getProperties()).thenReturn(properties);
ExclusionResolver exclusionResolver = createExclusionResolver(mavenProject);
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
- Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
- Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder));
+ assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1));
+ assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1));
+ assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2));
+ assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2));
+ assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2));
}
private FsTree createFsTree() throws IOException {
@@ -399,6 +401,7 @@ private ExclusionResolver createExclusionResolver(
* - my-file.java
* - other-file.json
*/
+ @SuppressWarnings("checkstyle:VisibilityModifier")
private class FsTree {
public Path txtFileRootFolder;
public Path javaFileRootFolder;
diff --git a/src/test/java/org/apache/maven/buildcache/hash/PerfTest.java b/src/test/java/org/apache/maven/buildcache/hash/PerfTest.java
index 3c10f66..c2f0f84 100644
--- a/src/test/java/org/apache/maven/buildcache/hash/PerfTest.java
+++ b/src/test/java/org/apache/maven/buildcache/hash/PerfTest.java
@@ -73,32 +73,32 @@ String doTest(HashFactory hashFactory, HashState state) throws IOException {
}
@Benchmark
- public String SHA1(HashState state) throws IOException {
+ public String checkSHA1(HashState state) throws IOException {
return doTest(HashFactory.SHA1, state);
}
@Benchmark
- public String SHA256(HashState state) throws IOException {
+ public String checkSHA256(HashState state) throws IOException {
return doTest(HashFactory.SHA256, state);
}
@Benchmark
- public String XX(HashState state) throws IOException {
+ public String checkXX(HashState state) throws IOException {
return doTest(HashFactory.XX, state);
}
@Benchmark
- public String XXMM(HashState state) throws IOException {
+ public String checkXXMM(HashState state) throws IOException {
return doTest(HashFactory.XXMM, state);
}
@Benchmark
- public String METRO(HashState state) throws IOException {
+ public String checkMETRO(HashState state) throws IOException {
return doTest(HashFactory.METRO, state);
}
@Benchmark
- public String METRO_MM(HashState state) throws IOException {
+ public String checkMETROMM(HashState state) throws IOException {
return doTest(HashFactory.METRO_MM, state);
}
diff --git a/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java b/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java
index 3214266..4d14222 100644
--- a/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java
+++ b/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java
@@ -43,7 +43,7 @@ void simple(Verifier verifier) throws VerificationException {
}
@Test
- void simple_build_change_version_reuse_build_cache(Verifier verifier) throws VerificationException {
+ void simpleBuildChangeVersionReuseBuildCache(Verifier verifier) throws VerificationException {
verifier.setAutoclean(false);
verifier.setLogFileName("../log-1.txt");
diff --git a/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java b/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java
index 5656fc0..e47e51c 100644
--- a/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java
+++ b/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java
@@ -96,6 +96,7 @@ public class IncrementalRestoreTest {
public static final String SKIPPING_PLUGIN_EXECUTION_CACHED_FAILSAFE_VERIFY =
"Skipping plugin execution (cached): failsafe:verify";
+ @SuppressWarnings("checkstyle:methodlength")
@Test
void simple(Verifier verifier) throws VerificationException, IOException {
verifier.setAutoclean(false);
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java
index d2a45d6..8a4eb78 100644
--- a/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java
+++ b/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java
@@ -41,7 +41,7 @@
@IntegrationTest("src/test/projects/mbuildcache-74-clean-cache-any-artifact")
public class Issue74Test {
- private static final Logger logger = LoggerFactory.getLogger(Issue74Test.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Issue74Test.class);
@Test
void simple(Verifier verifier) throws VerificationException, IOException {
@@ -79,7 +79,7 @@ private static void verifyBuildCacheEntries(final Verifier verifier, long expect
// buildinfo.xml -> local -> hash -> project
Path projectPathInCache = buildInfoXmlPath.getParent().getParent().getParent();
- logger.info("Checking '{}' for cached builds ...", projectPathInCache);
+ LOGGER.info("Checking '{}' for cached builds ...", projectPathInCache);
if (!Files.exists(projectPathInCache)) {
throw new VerificationException(
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java
index b6b6b30..1049dda 100644
--- a/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java
+++ b/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java
@@ -29,7 +29,7 @@ public class Issue76Test {
private static final String PROJECT_NAME = "org.apache.maven.caching.test:mbuildcache-76";
@Test
- void simple_build_change_version_build_install_again(Verifier verifier) throws VerificationException {
+ void simpleBuildChangeVersionBuildInstallAgain(Verifier verifier) throws VerificationException {
verifier.setAutoclean(false);
verifier.setLogFileName("../log-1.txt");
diff --git a/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java b/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java
index dcdac3a..f8ceb22 100644
--- a/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java
+++ b/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java
@@ -284,6 +284,7 @@ private String error(Path directory, String cache, boolean shouldHave) {
return sb.toString();
}
+ @SuppressWarnings("checkstyle:methodlength")
private static void ls(Path currentDir, Consumer<String> out) throws IOException {
class PathEntry implements Comparable<PathEntry> {
@@ -291,7 +292,7 @@ class PathEntry implements Comparable<PathEntry> {
final Path path;
final Map<String, Object> attributes;
- public PathEntry(Path abs, Path root) {
+ PathEntry(Path abs, Path root) {
this.abs = abs;
this.path = abs.startsWith(root) ? root.relativize(abs) : abs;
this.attributes = readAttributes(abs);
diff --git a/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java b/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java
index e9a9172..95b9311 100644
--- a/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java
+++ b/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java
@@ -26,13 +26,8 @@
import java.io.InputStream;
-import org.apache.maven.buildcache.xml.build.Build;
-import org.apache.maven.buildcache.xml.config.CacheConfig;
-import org.apache.maven.buildcache.xml.diff.Diff;
-import org.apache.maven.buildcache.xml.report.CacheReport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.w3c.dom.Document;
public class XmlServiceTest {
@@ -45,11 +40,10 @@ public void testConfig() throws Exception {
dbf.setNamespaceAware(true);
dbf.setSchema(schema);
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse(
- getClass().getResource("build-cache-config-instance.xml").toString());
+ db.parse(getClass().getResource("build-cache-config-instance.xml").toString());
InputStream is = getClass().getResourceAsStream("build-cache-config-instance.xml");
- final CacheConfig cache = new XmlService().loadCacheConfig(is);
+ new XmlService().loadCacheConfig(is);
}
@Test
@@ -61,11 +55,10 @@ public void testReport() throws Exception {
dbf.setNamespaceAware(true);
dbf.setSchema(schema);
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse(
- getClass().getResource("build-cache-report-instance.xml").toString());
+ db.parse(getClass().getResource("build-cache-report-instance.xml").toString());
InputStream is = getClass().getResourceAsStream("build-cache-report-instance.xml");
- final CacheReport cacheReport = new XmlService().loadCacheReport(is);
+ new XmlService().loadCacheReport(is);
}
@Test
@@ -77,11 +70,10 @@ public void testBuild() throws Exception {
dbf.setNamespaceAware(true);
dbf.setSchema(schema);
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse(
- getClass().getResource("build-cache-build-instance.xml").toString());
+ db.parse(getClass().getResource("build-cache-build-instance.xml").toString());
InputStream is = getClass().getResourceAsStream("build-cache-build-instance.xml");
- final Build build = new XmlService().loadBuild(is);
+ new XmlService().loadBuild(is);
}
@Test
@@ -93,10 +85,9 @@ public void testDiff() throws Exception {
dbf.setNamespaceAware(true);
dbf.setSchema(schema);
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc =
- db.parse(getClass().getResource("build-cache-diff-instance.xml").toString());
+ db.parse(getClass().getResource("build-cache-diff-instance.xml").toString());
InputStream is = getClass().getResourceAsStream("build-cache-diff-instance.xml");
- final Diff buildDiff = new XmlService().loadDiff(is);
+ new XmlService().loadDiff(is);
}
}