This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch MNG-7129-maven-caching
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d273afa3e6a309f8ae5105140d8db5678147d3c9
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Dec 10 16:10:35 2021 +0100
Align package name and schemas to the build-cache name
---
pom.xml | 8 +--
.../{caching => buildcache}/CacheContext.java | 4 +-
.../{caching => buildcache}/CacheController.java | 2 +-
.../CacheControllerImpl.java | 54 ++++++++++----------
.../maven/{caching => buildcache}/CacheDiff.java | 18 +++----
.../CacheLifecycleParticipant.java | 4 +-
.../{caching => buildcache}/CacheRepository.java | 6 +--
.../maven/{caching => buildcache}/CacheResult.java | 6 +--
.../maven/{caching => buildcache}/CacheUtils.java | 4 +-
.../CachingMojosExecutionStrategy.java | 22 ++++----
.../DefaultMultiModuleSupport.java | 10 ++--
.../DefaultNormalizedModelProvider.java | 4 +-
.../DefaultPluginScanConfig.java | 4 +-
.../DefaultProjectInputCalculator.java | 8 +--
.../DefaultRestoredArtifactHandler.java | 4 +-
.../HttpCacheRepositoryImpl.java | 20 ++++----
.../LifecyclePhasesHelper.java | 4 +-
.../LocalCacheRepository.java | 8 +--
.../LocalCacheRepositoryImpl.java | 26 +++++-----
.../MojoParametersListener.java | 2 +-
.../MultiModuleSupport.java | 2 +-
.../NormalizedModelProvider.java | 2 +-
.../{caching => buildcache}/PluginScanConfig.java | 4 +-
.../PluginScanConfigImpl.java | 8 +--
.../ProjectInputCalculator.java | 4 +-
.../RemoteCacheRepository.java | 6 +--
.../RemoteCacheRepositoryProvider.java | 4 +-
.../{caching => buildcache}/RestoreStatus.java | 2 +-
.../RestoredArtifactHandler.java | 2 +-
.../ScanConfigProperties.java | 2 +-
.../{caching => buildcache}/WagonConfigurator.java | 2 +-
.../{caching => buildcache}/WagonProvider.java | 2 +-
.../WagonRemoteCacheRepository.java | 18 +++----
.../{caching => buildcache}/Xpp3DomUtils.java | 2 +-
.../artifact/RestoredArtifact.java | 2 +-
.../checksum/DependencyNotResolvedException.java | 2 +-
.../checksum/DigestUtils.java | 6 +--
.../{caching => buildcache}/checksum/KeyUtils.java | 4 +-
.../checksum/MavenProjectInput.java | 38 +++++++-------
.../{caching => buildcache}/checksum/WalkKey.java | 2 +-
.../hash/CloseableBuffer.java | 6 +--
.../maven/{caching => buildcache}/hash/Hash.java | 2 +-
.../hash/HashAlgorithm.java | 2 +-
.../{caching => buildcache}/hash/HashChecksum.java | 2 +-
.../{caching => buildcache}/hash/HashFactory.java | 2 +-
.../{caching => buildcache}/hash/HexUtils.java | 2 +-
.../hash/ReflectionUtils.java | 2 +-
.../maven/{caching => buildcache}/hash/SHA.java | 2 +-
.../hash/ThreadLocalBuffer.java | 2 +-
.../hash/ThreadLocalDigest.java | 2 +-
.../maven/{caching => buildcache}/hash/XX.java | 2 +-
.../maven/{caching => buildcache}/hash/XXMM.java | 2 +-
.../maven/{caching => buildcache}/xml/Build.java | 26 +++++-----
.../{caching => buildcache}/xml/CacheConfig.java | 16 +++---
.../xml/CacheConfigImpl.java | 58 +++++++++++-----------
.../{caching => buildcache}/xml/CacheSource.java | 2 +-
.../{caching => buildcache}/xml/CacheState.java | 2 +-
.../{caching => buildcache}/xml/DtoUtils.java | 16 +++---
.../{caching => buildcache}/xml/XmlService.java | 42 ++++++++--------
.../mdo/{cache-build.mdo => build-cache-build.mdo} | 10 ++--
.../{cache-config.mdo => build-cache-config.mdo} | 10 ++--
.../mdo/{cache-diff.mdo => build-cache-diff.mdo} | 10 ++--
.../{cache-report.mdo => build-cache-report.mdo} | 12 ++---
src/site/markdown/remote-cache.md | 8 +--
.../{caching => buildcache}/BuildInfoTest.java | 22 ++++----
.../checksum/MavenProjectInputTest.java | 2 +-
.../checksum/SHAHashTest.java | 8 +--
.../checksum/XXHashTest.java | 10 ++--
.../{caching => buildcache}/hash/HexUtilsTest.java | 2 +-
.../its/BuildExtensionTest.java | 6 +--
.../its/CoreExtensionTest.java | 6 +--
.../its/junit/IntegrationTest.java | 2 +-
.../its/junit/IntegrationTestExtension.java | 4 +-
.../{caching => buildcache}/its/junit/Test.java | 2 +-
.../xml/XmlServiceTest.java | 34 ++++++-------
.../java/org/apache/maven/buildcache}/Test.java | 2 +-
.../java/org/apache/maven/buildcache}/Test.java | 2 +-
.../xml/build-cache-build-instance.xml} | 4 +-
.../xml/build-cache-config-instance.xml} | 4 +-
.../xml/build-cache-diff-instance.xml} | 4 +-
.../xml/build-cache-report-instance.xml} | 4 +-
81 files changed, 345 insertions(+), 345 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f5f0a6..d57af98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,10 +260,10 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<models>
- <model>src/main/mdo/cache-config.mdo</model>
- <model>src/main/mdo/cache-build.mdo</model>
- <model>src/main/mdo/cache-diff.mdo</model>
- <model>src/main/mdo/cache-report.mdo</model>
+ <model>src/main/mdo/build-cache-config.mdo</model>
+ <model>src/main/mdo/build-cache-build.mdo</model>
+ <model>src/main/mdo/build-cache-diff.mdo</model>
+ <model>src/main/mdo/build-cache-report.mdo</model>
</models>
<version>1.0.0</version>
</configuration>
diff --git a/src/main/java/org/apache/maven/caching/CacheContext.java
b/src/main/java/org/apache/maven/buildcache/CacheContext.java
similarity index 94%
rename from src/main/java/org/apache/maven/caching/CacheContext.java
rename to src/main/java/org/apache/maven/buildcache/CacheContext.java
index f0b362d..0841aeb 100644
--- a/src/main/java/org/apache/maven/caching/CacheContext.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheContext.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
-import org.apache.maven.caching.xml.build.ProjectsInputInfo;
+import org.apache.maven.buildcache.xml.build.ProjectsInputInfo;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
diff --git a/src/main/java/org/apache/maven/caching/CacheController.java
b/src/main/java/org/apache/maven/buildcache/CacheController.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/CacheController.java
rename to src/main/java/org/apache/maven/buildcache/CacheController.java
index 4239f4c..b866bae 100644
--- a/src/main/java/org/apache/maven/caching/CacheController.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheController.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
b/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java
similarity index 95%
rename from src/main/java/org/apache/maven/caching/CacheControllerImpl.java
rename to src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java
index 8d4f795..c25a98c 100644
--- a/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.File;
import java.io.FileNotFoundException;
@@ -52,24 +52,24 @@ import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.maven.SessionScoped;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.caching.artifact.RestoredArtifact;
-import org.apache.maven.caching.hash.HashAlgorithm;
-import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.CacheSource;
-import org.apache.maven.caching.xml.DtoUtils;
-import org.apache.maven.caching.xml.XmlService;
-import org.apache.maven.caching.xml.build.Artifact;
-import org.apache.maven.caching.xml.build.CompletedExecution;
-import org.apache.maven.caching.xml.build.DigestItem;
-import org.apache.maven.caching.xml.build.ProjectsInputInfo;
-import org.apache.maven.caching.xml.build.Scm;
-import org.apache.maven.caching.xml.config.PropertyName;
-import org.apache.maven.caching.xml.config.TrackedProperty;
-import org.apache.maven.caching.xml.diff.Diff;
-import org.apache.maven.caching.xml.report.CacheReport;
-import org.apache.maven.caching.xml.report.ProjectReport;
+import org.apache.maven.buildcache.artifact.RestoredArtifact;
+import org.apache.maven.buildcache.hash.HashAlgorithm;
+import org.apache.maven.buildcache.hash.HashFactory;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheSource;
+import org.apache.maven.buildcache.xml.DtoUtils;
+import org.apache.maven.buildcache.xml.XmlService;
+import org.apache.maven.buildcache.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.build.CompletedExecution;
+import org.apache.maven.buildcache.xml.build.DigestItem;
+import org.apache.maven.buildcache.xml.build.ProjectsInputInfo;
+import org.apache.maven.buildcache.xml.build.Scm;
+import org.apache.maven.buildcache.xml.config.PropertyName;
+import org.apache.maven.buildcache.xml.config.TrackedProperty;
+import org.apache.maven.buildcache.xml.diff.Diff;
+import org.apache.maven.buildcache.xml.report.CacheReport;
+import org.apache.maven.buildcache.xml.report.ProjectReport;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.MojoExecutionEvent;
import org.apache.maven.plugin.Mojo;
@@ -87,14 +87,14 @@ import static
java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.replace;
import static org.apache.commons.lang3.StringUtils.split;
-import static org.apache.maven.caching.CacheResult.empty;
-import static org.apache.maven.caching.CacheResult.failure;
-import static org.apache.maven.caching.CacheResult.partialSuccess;
-import static org.apache.maven.caching.CacheResult.rebuilded;
-import static org.apache.maven.caching.CacheResult.success;
-import static org.apache.maven.caching.HttpCacheRepositoryImpl.BUILDINFO_XML;
-import static
org.apache.maven.caching.checksum.KeyUtils.getVersionlessProjectKey;
-import static
org.apache.maven.caching.checksum.MavenProjectInput.CACHE_IMPLEMENTATION_VERSION;
+import static org.apache.maven.buildcache.CacheResult.empty;
+import static org.apache.maven.buildcache.CacheResult.failure;
+import static org.apache.maven.buildcache.CacheResult.partialSuccess;
+import static org.apache.maven.buildcache.CacheResult.rebuilded;
+import static org.apache.maven.buildcache.CacheResult.success;
+import static
org.apache.maven.buildcache.HttpCacheRepositoryImpl.BUILDINFO_XML;
+import static
org.apache.maven.buildcache.checksum.KeyUtils.getVersionlessProjectKey;
+import static
org.apache.maven.buildcache.checksum.MavenProjectInput.CACHE_IMPLEMENTATION_VERSION;
/**
* CacheControllerImpl
diff --git a/src/main/java/org/apache/maven/caching/CacheDiff.java
b/src/main/java/org/apache/maven/buildcache/CacheDiff.java
similarity index 96%
rename from src/main/java/org/apache/maven/caching/CacheDiff.java
rename to src/main/java/org/apache/maven/buildcache/CacheDiff.java
index 1d8646a..f740faa 100644
--- a/src/main/java/org/apache/maven/caching/CacheDiff.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheDiff.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.ArrayList;
import java.util.HashMap;
@@ -28,14 +28,14 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.build.Build;
-import org.apache.maven.caching.xml.build.CompletedExecution;
-import org.apache.maven.caching.xml.build.DigestItem;
-import org.apache.maven.caching.xml.build.ProjectsInputInfo;
-import org.apache.maven.caching.xml.build.PropertyValue;
-import org.apache.maven.caching.xml.diff.Diff;
-import org.apache.maven.caching.xml.diff.Mismatch;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.build.Build;
+import org.apache.maven.buildcache.xml.build.CompletedExecution;
+import org.apache.maven.buildcache.xml.build.DigestItem;
+import org.apache.maven.buildcache.xml.build.ProjectsInputInfo;
+import org.apache.maven.buildcache.xml.build.PropertyValue;
+import org.apache.maven.buildcache.xml.diff.Diff;
+import org.apache.maven.buildcache.xml.diff.Mismatch;
/**
* Utility class for comparing 2 builds
diff --git
a/src/main/java/org/apache/maven/caching/CacheLifecycleParticipant.java
b/src/main/java/org/apache/maven/buildcache/CacheLifecycleParticipant.java
similarity index 95%
rename from
src/main/java/org/apache/maven/caching/CacheLifecycleParticipant.java
rename to
src/main/java/org/apache/maven/buildcache/CacheLifecycleParticipant.java
index aa5546f..4b46266 100644
--- a/src/main/java/org/apache/maven/caching/CacheLifecycleParticipant.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheLifecycleParticipant.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.maven.AbstractMavenLifecycleParticipant;
import org.apache.maven.MavenExecutionException;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheConfig;
import org.apache.maven.execution.MavenSession;
@SessionScoped
diff --git a/src/main/java/org/apache/maven/caching/CacheRepository.java
b/src/main/java/org/apache/maven/buildcache/CacheRepository.java
similarity index 90%
rename from src/main/java/org/apache/maven/caching/CacheRepository.java
rename to src/main/java/org/apache/maven/buildcache/CacheRepository.java
index fc4c439..5851011 100644
--- a/src/main/java/org/apache/maven/caching/CacheRepository.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheRepository.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.IOException;
import java.util.Optional;
import javax.annotation.Nonnull;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.report.CacheReport;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.report.CacheReport;
import org.apache.maven.execution.MavenSession;
/**
diff --git a/src/main/java/org/apache/maven/caching/CacheResult.java
b/src/main/java/org/apache/maven/buildcache/CacheResult.java
similarity index 95%
rename from src/main/java/org/apache/maven/caching/CacheResult.java
rename to src/main/java/org/apache/maven/buildcache/CacheResult.java
index caf049e..65ad7a8 100644
--- a/src/main/java/org/apache/maven/caching/CacheResult.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheResult.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.CacheSource;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.CacheSource;
import static java.util.Objects.requireNonNull;
diff --git a/src/main/java/org/apache/maven/caching/CacheUtils.java
b/src/main/java/org/apache/maven/buildcache/CacheUtils.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/CacheUtils.java
rename to src/main/java/org/apache/maven/buildcache/CacheUtils.java
index f5fcabf..edfd283 100644
--- a/src/main/java/org/apache/maven/caching/CacheUtils.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.File;
import java.io.IOException;
@@ -37,7 +37,7 @@ import java.util.zip.ZipOutputStream;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.caching.xml.build.Scm;
+import org.apache.maven.buildcache.xml.build.Scm;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecution;
diff --git
a/src/main/java/org/apache/maven/caching/CachingMojosExecutionStrategy.java
b/src/main/java/org/apache/maven/buildcache/CachingMojosExecutionStrategy.java
similarity index 94%
rename from
src/main/java/org/apache/maven/caching/CachingMojosExecutionStrategy.java
rename to
src/main/java/org/apache/maven/buildcache/CachingMojosExecutionStrategy.java
index 8b3c0c3..74307d8 100644
--- a/src/main/java/org/apache/maven/caching/CachingMojosExecutionStrategy.java
+++
b/src/main/java/org/apache/maven/buildcache/CachingMojosExecutionStrategy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.List;
import java.util.Map;
@@ -25,12 +25,12 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.CacheState;
-import org.apache.maven.caching.xml.DtoUtils;
-import org.apache.maven.caching.xml.build.CompletedExecution;
-import org.apache.maven.caching.xml.config.TrackedProperty;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheState;
+import org.apache.maven.buildcache.xml.DtoUtils;
+import org.apache.maven.buildcache.xml.build.CompletedExecution;
+import org.apache.maven.buildcache.xml.config.TrackedProperty;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.MojoExecutionEvent;
import org.apache.maven.lifecycle.LifecycleExecutionException;
@@ -47,10 +47,10 @@ import org.codehaus.plexus.util.ReflectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.maven.caching.CacheUtils.mojoExecutionKey;
-import static
org.apache.maven.caching.checksum.KeyUtils.getVersionlessProjectKey;
-import static org.apache.maven.caching.xml.CacheState.DISABLED;
-import static org.apache.maven.caching.xml.CacheState.INITIALIZED;
+import static org.apache.maven.buildcache.CacheUtils.mojoExecutionKey;
+import static
org.apache.maven.buildcache.checksum.KeyUtils.getVersionlessProjectKey;
+import static org.apache.maven.buildcache.xml.CacheState.DISABLED;
+import static org.apache.maven.buildcache.xml.CacheState.INITIALIZED;
/**
* <p>
diff --git
a/src/main/java/org/apache/maven/caching/DefaultMultiModuleSupport.java
b/src/main/java/org/apache/maven/buildcache/DefaultMultiModuleSupport.java
similarity index 96%
rename from
src/main/java/org/apache/maven/caching/DefaultMultiModuleSupport.java
rename to
src/main/java/org/apache/maven/buildcache/DefaultMultiModuleSupport.java
index 251c91c..e40924c 100644
--- a/src/main/java/org/apache/maven/caching/DefaultMultiModuleSupport.java
+++ b/src/main/java/org/apache/maven/buildcache/DefaultMultiModuleSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.File;
import java.util.ArrayList;
@@ -33,10 +33,10 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.checksum.KeyUtils;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.config.Discovery;
-import org.apache.maven.caching.xml.config.MultiModule;
+import org.apache.maven.buildcache.checksum.KeyUtils;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.config.Discovery;
+import org.apache.maven.buildcache.xml.config.MultiModule;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
diff --git
a/src/main/java/org/apache/maven/caching/DefaultNormalizedModelProvider.java
b/src/main/java/org/apache/maven/buildcache/DefaultNormalizedModelProvider.java
similarity index 98%
rename from
src/main/java/org/apache/maven/caching/DefaultNormalizedModelProvider.java
rename to
src/main/java/org/apache/maven/buildcache/DefaultNormalizedModelProvider.java
index 391a873..4924702 100644
--- a/src/main/java/org/apache/maven/caching/DefaultNormalizedModelProvider.java
+++
b/src/main/java/org/apache/maven/buildcache/DefaultNormalizedModelProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.Collection;
import java.util.List;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheConfig;
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
diff --git
a/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
b/src/main/java/org/apache/maven/buildcache/DefaultPluginScanConfig.java
similarity index 93%
rename from src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
rename to src/main/java/org/apache/maven/buildcache/DefaultPluginScanConfig.java
index 6e945ea..08b0d46 100644
--- a/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
+++ b/src/main/java/org/apache/maven/buildcache/DefaultPluginScanConfig.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import javax.annotation.Nonnull;
-import org.apache.maven.caching.xml.config.DirScanConfig;
+import org.apache.maven.buildcache.xml.config.DirScanConfig;
/**
* DefaultPluginScanConfig
diff --git
a/src/main/java/org/apache/maven/caching/DefaultProjectInputCalculator.java
b/src/main/java/org/apache/maven/buildcache/DefaultProjectInputCalculator.java
similarity index 95%
rename from
src/main/java/org/apache/maven/caching/DefaultProjectInputCalculator.java
rename to
src/main/java/org/apache/maven/buildcache/DefaultProjectInputCalculator.java
index c9785bb..c775cfd 100644
--- a/src/main/java/org/apache/maven/caching/DefaultProjectInputCalculator.java
+++
b/src/main/java/org/apache/maven/buildcache/DefaultProjectInputCalculator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -25,9 +25,9 @@ import java.util.concurrent.ConcurrentMap;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.checksum.MavenProjectInput;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.build.ProjectsInputInfo;
+import org.apache.maven.buildcache.checksum.MavenProjectInput;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.build.ProjectsInputInfo;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.project.MavenProject;
diff --git
a/src/main/java/org/apache/maven/caching/DefaultRestoredArtifactHandler.java
b/src/main/java/org/apache/maven/buildcache/DefaultRestoredArtifactHandler.java
similarity index 98%
rename from
src/main/java/org/apache/maven/caching/DefaultRestoredArtifactHandler.java
rename to
src/main/java/org/apache/maven/buildcache/DefaultRestoredArtifactHandler.java
index b88d4e9..564fc0e 100644
--- a/src/main/java/org/apache/maven/caching/DefaultRestoredArtifactHandler.java
+++
b/src/main/java/org/apache/maven/buildcache/DefaultRestoredArtifactHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -36,7 +36,7 @@ import javax.inject.Named;
import javax.inject.Singleton;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.maven.caching.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheConfig;
import org.apache.maven.project.MavenProject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
b/src/main/java/org/apache/maven/buildcache/HttpCacheRepositoryImpl.java
similarity index 95%
rename from src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
rename to src/main/java/org/apache/maven/buildcache/HttpCacheRepositoryImpl.java
index d1d2555..748fcee 100644
--- a/src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/HttpCacheRepositoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -40,14 +40,14 @@ import org.apache.http.entity.InputStreamEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.checksum.MavenProjectInput;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.CacheSource;
-import org.apache.maven.caching.xml.XmlService;
-import org.apache.maven.caching.xml.build.Artifact;
-import org.apache.maven.caching.xml.report.CacheReport;
-import org.apache.maven.caching.xml.report.ProjectReport;
+import org.apache.maven.buildcache.checksum.MavenProjectInput;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheSource;
+import org.apache.maven.buildcache.xml.XmlService;
+import org.apache.maven.buildcache.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.report.CacheReport;
+import org.apache.maven.buildcache.xml.report.ProjectReport;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.slf4j.Logger;
@@ -62,7 +62,7 @@ public class HttpCacheRepositoryImpl implements
RemoteCacheRepository
{
public static final String BUILDINFO_XML = "buildinfo.xml";
- public static final String CACHE_REPORT_XML = "cache-report.xml";
+ public static final String CACHE_REPORT_XML = "build-cache-report.xml";
private static final Logger LOGGER = LoggerFactory.getLogger(
HttpCacheRepositoryImpl.class );
diff --git a/src/main/java/org/apache/maven/caching/LifecyclePhasesHelper.java
b/src/main/java/org/apache/maven/buildcache/LifecyclePhasesHelper.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/LifecyclePhasesHelper.java
rename to src/main/java/org/apache/maven/buildcache/LifecyclePhasesHelper.java
index 08c9039..bef2c5a 100644
--- a/src/main/java/org/apache/maven/caching/LifecyclePhasesHelper.java
+++ b/src/main/java/org/apache/maven/buildcache/LifecyclePhasesHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.apache.maven.caching.xml.Build;
+import org.apache.maven.buildcache.xml.Build;
import org.apache.maven.lifecycle.DefaultLifecycles;
import org.apache.maven.lifecycle.Lifecycle;
import org.apache.maven.plugin.MojoExecution;
diff --git a/src/main/java/org/apache/maven/caching/LocalCacheRepository.java
b/src/main/java/org/apache/maven/buildcache/LocalCacheRepository.java
similarity index 89%
rename from src/main/java/org/apache/maven/caching/LocalCacheRepository.java
rename to src/main/java/org/apache/maven/buildcache/LocalCacheRepository.java
index 682d6c1..e164edb 100644
--- a/src/main/java/org/apache/maven/caching/LocalCacheRepository.java
+++ b/src/main/java/org/apache/maven/buildcache/LocalCacheRepository.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Optional;
import javax.annotation.Nonnull;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.CacheSource;
-import org.apache.maven.caching.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.CacheSource;
+import org.apache.maven.buildcache.xml.build.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
diff --git
a/src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
b/src/main/java/org/apache/maven/buildcache/LocalCacheRepositoryImpl.java
similarity index 95%
rename from src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
rename to
src/main/java/org/apache/maven/buildcache/LocalCacheRepositoryImpl.java
index 2a51945..f94190c 100644
--- a/src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/LocalCacheRepositoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.File;
import java.io.IOException;
@@ -45,13 +45,13 @@ import javax.inject.Named;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.CacheSource;
-import org.apache.maven.caching.xml.XmlService;
-import org.apache.maven.caching.xml.build.Artifact;
-import org.apache.maven.caching.xml.build.Scm;
-import org.apache.maven.caching.xml.report.CacheReport;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheSource;
+import org.apache.maven.buildcache.xml.XmlService;
+import org.apache.maven.buildcache.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.build.Scm;
+import org.apache.maven.buildcache.xml.report.CacheReport;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
@@ -65,8 +65,8 @@ import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.HOURS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.maven.caching.CacheUtils.getMultimoduleRoot;
-import static
org.apache.maven.caching.checksum.MavenProjectInput.CACHE_IMPLEMENTATION_VERSION;
+import static org.apache.maven.buildcache.CacheUtils.getMultimoduleRoot;
+import static
org.apache.maven.buildcache.checksum.MavenProjectInput.CACHE_IMPLEMENTATION_VERSION;
/**
* Local cache repository implementation.
@@ -113,7 +113,7 @@ public class LocalCacheRepositoryImpl implements
LocalCacheRepository
LOGGER.info( "Local build found by checksum {}",
context.getInputInfo().getChecksum() );
try
{
- org.apache.maven.caching.xml.build.Build dto =
xmlService.loadBuild( localBuildInfoPath.toFile() );
+ org.apache.maven.buildcache.xml.build.Build dto =
xmlService.loadBuild( localBuildInfoPath.toFile() );
return Optional.of( new Build( dto, CacheSource.LOCAL ) );
}
catch ( Exception e )
@@ -137,7 +137,7 @@ public class LocalCacheRepositoryImpl implements
LocalCacheRepository
LOGGER.info( "Downloaded build found by checksum {}",
context.getInputInfo().getChecksum() );
try
{
- org.apache.maven.caching.xml.build.Build dto =
xmlService.loadBuild( buildInfoPath.toFile() );
+ org.apache.maven.buildcache.xml.build.Build dto =
xmlService.loadBuild( buildInfoPath.toFile() );
return Optional.of( new Build( dto, CacheSource.REMOTE ) );
}
catch ( Exception e )
@@ -281,7 +281,7 @@ public class LocalCacheRepositoryImpl implements
LocalCacheRepository
{
try
{
- final org.apache.maven.caching.xml.build.Build dto
= xmlService.loadBuild( file );
+ final org.apache.maven.buildcache.xml.build.Build
dto = xmlService.loadBuild( file );
final Pair<Build, Path> buildInfoAndFile =
Pair.of( new Build( dto, CacheSource.LOCAL ),
path );
final String cachedVersion =
dto.getArtifact().getVersion();
diff --git a/src/main/java/org/apache/maven/caching/MojoParametersListener.java
b/src/main/java/org/apache/maven/buildcache/MojoParametersListener.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/MojoParametersListener.java
rename to src/main/java/org/apache/maven/buildcache/MojoParametersListener.java
index c378f73..dd0b39b 100644
--- a/src/main/java/org/apache/maven/caching/MojoParametersListener.java
+++ b/src/main/java/org/apache/maven/buildcache/MojoParametersListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/org/apache/maven/caching/MultiModuleSupport.java
b/src/main/java/org/apache/maven/buildcache/MultiModuleSupport.java
similarity index 96%
rename from src/main/java/org/apache/maven/caching/MultiModuleSupport.java
rename to src/main/java/org/apache/maven/buildcache/MultiModuleSupport.java
index 6a747fa..b90512c 100644
--- a/src/main/java/org/apache/maven/caching/MultiModuleSupport.java
+++ b/src/main/java/org/apache/maven/buildcache/MultiModuleSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.Optional;
import org.apache.maven.project.MavenProject;
diff --git
a/src/main/java/org/apache/maven/caching/NormalizedModelProvider.java
b/src/main/java/org/apache/maven/buildcache/NormalizedModelProvider.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/NormalizedModelProvider.java
rename to src/main/java/org/apache/maven/buildcache/NormalizedModelProvider.java
index 5e33b4f..b72d998 100644
--- a/src/main/java/org/apache/maven/caching/NormalizedModelProvider.java
+++ b/src/main/java/org/apache/maven/buildcache/NormalizedModelProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
diff --git a/src/main/java/org/apache/maven/caching/PluginScanConfig.java
b/src/main/java/org/apache/maven/buildcache/PluginScanConfig.java
similarity index 92%
rename from src/main/java/org/apache/maven/caching/PluginScanConfig.java
rename to src/main/java/org/apache/maven/buildcache/PluginScanConfig.java
index 47125dd..a238803 100644
--- a/src/main/java/org/apache/maven/caching/PluginScanConfig.java
+++ b/src/main/java/org/apache/maven/buildcache/PluginScanConfig.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import javax.annotation.Nonnull;
-import org.apache.maven.caching.xml.config.DirScanConfig;
+import org.apache.maven.buildcache.xml.config.DirScanConfig;
/**
* PluginScanConfig
diff --git a/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
b/src/main/java/org/apache/maven/buildcache/PluginScanConfigImpl.java
similarity index 95%
rename from src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
rename to src/main/java/org/apache/maven/buildcache/PluginScanConfigImpl.java
index a7eb382..a311f21 100644
--- a/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/PluginScanConfigImpl.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.util.List;
import javax.annotation.Nonnull;
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.xml.config.DirScanConfig;
-import org.apache.maven.caching.xml.config.TagExclude;
-import org.apache.maven.caching.xml.config.TagScanConfig;
+import org.apache.maven.buildcache.xml.config.DirScanConfig;
+import org.apache.maven.buildcache.xml.config.TagExclude;
+import org.apache.maven.buildcache.xml.config.TagScanConfig;
/**
* PluginScanConfigImpl
diff --git a/src/main/java/org/apache/maven/caching/ProjectInputCalculator.java
b/src/main/java/org/apache/maven/buildcache/ProjectInputCalculator.java
similarity index 90%
rename from src/main/java/org/apache/maven/caching/ProjectInputCalculator.java
rename to src/main/java/org/apache/maven/buildcache/ProjectInputCalculator.java
index 85010d7..4552210 100644
--- a/src/main/java/org/apache/maven/caching/ProjectInputCalculator.java
+++ b/src/main/java/org/apache/maven/buildcache/ProjectInputCalculator.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
-import org.apache.maven.caching.xml.build.ProjectsInputInfo;
+import org.apache.maven.buildcache.xml.build.ProjectsInputInfo;
import org.apache.maven.project.MavenProject;
/**
diff --git a/src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepository.java
similarity index 91%
rename from src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
rename to src/main/java/org/apache/maven/buildcache/RemoteCacheRepository.java
index c1a8713..7e5768f 100644
--- a/src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
+++ b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepository.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Optional;
import javax.annotation.Nonnull;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.build.Artifact;
import org.apache.maven.project.MavenProject;
/**
diff --git
a/src/main/java/org/apache/maven/caching/RemoteCacheRepositoryProvider.java
b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryProvider.java
similarity index 95%
rename from
src/main/java/org/apache/maven/caching/RemoteCacheRepositoryProvider.java
rename to
src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryProvider.java
index dc94b53..7137d10 100644
--- a/src/main/java/org/apache/maven/caching/RemoteCacheRepositoryProvider.java
+++
b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryProvider.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
-import org.apache.maven.caching.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheConfig;
import org.codehaus.plexus.PlexusContainer;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
diff --git a/src/main/java/org/apache/maven/caching/RestoreStatus.java
b/src/main/java/org/apache/maven/buildcache/RestoreStatus.java
similarity index 96%
rename from src/main/java/org/apache/maven/caching/RestoreStatus.java
rename to src/main/java/org/apache/maven/buildcache/RestoreStatus.java
index db90507..50de5e7 100644
--- a/src/main/java/org/apache/maven/caching/RestoreStatus.java
+++ b/src/main/java/org/apache/maven/buildcache/RestoreStatus.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
/**
* RestoreStatus
diff --git
a/src/main/java/org/apache/maven/caching/RestoredArtifactHandler.java
b/src/main/java/org/apache/maven/buildcache/RestoredArtifactHandler.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/RestoredArtifactHandler.java
rename to src/main/java/org/apache/maven/buildcache/RestoredArtifactHandler.java
index b9ffd06..e22b63c 100644
--- a/src/main/java/org/apache/maven/caching/RestoredArtifactHandler.java
+++ b/src/main/java/org/apache/maven/buildcache/RestoredArtifactHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/src/main/java/org/apache/maven/caching/ScanConfigProperties.java
b/src/main/java/org/apache/maven/buildcache/ScanConfigProperties.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/ScanConfigProperties.java
rename to src/main/java/org/apache/maven/buildcache/ScanConfigProperties.java
index 4e10a88..67afb49 100644
--- a/src/main/java/org/apache/maven/caching/ScanConfigProperties.java
+++ b/src/main/java/org/apache/maven/buildcache/ScanConfigProperties.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
/**
* ScanConfigProperties
diff --git a/src/main/java/org/apache/maven/caching/WagonConfigurator.java
b/src/main/java/org/apache/maven/buildcache/WagonConfigurator.java
similarity index 99%
rename from src/main/java/org/apache/maven/caching/WagonConfigurator.java
rename to src/main/java/org/apache/maven/buildcache/WagonConfigurator.java
index 40ba0ff..a41c0cc 100644
--- a/src/main/java/org/apache/maven/caching/WagonConfigurator.java
+++ b/src/main/java/org/apache/maven/buildcache/WagonConfigurator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git a/src/main/java/org/apache/maven/caching/WagonProvider.java
b/src/main/java/org/apache/maven/buildcache/WagonProvider.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/WagonProvider.java
rename to src/main/java/org/apache/maven/buildcache/WagonProvider.java
index b323a74..f98c52a 100644
--- a/src/main/java/org/apache/maven/caching/WagonProvider.java
+++ b/src/main/java/org/apache/maven/buildcache/WagonProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import javax.inject.Inject;
import javax.inject.Singleton;
diff --git
a/src/main/java/org/apache/maven/caching/WagonRemoteCacheRepository.java
b/src/main/java/org/apache/maven/buildcache/WagonRemoteCacheRepository.java
similarity index 97%
rename from
src/main/java/org/apache/maven/caching/WagonRemoteCacheRepository.java
rename to
src/main/java/org/apache/maven/buildcache/WagonRemoteCacheRepository.java
index 0482ad1..b5ca255 100644
--- a/src/main/java/org/apache/maven/caching/WagonRemoteCacheRepository.java
+++ b/src/main/java/org/apache/maven/buildcache/WagonRemoteCacheRepository.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -40,14 +40,14 @@ import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.checksum.MavenProjectInput;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.CacheSource;
-import org.apache.maven.caching.xml.XmlService;
-import org.apache.maven.caching.xml.build.Artifact;
-import org.apache.maven.caching.xml.report.CacheReport;
-import org.apache.maven.caching.xml.report.ProjectReport;
+import org.apache.maven.buildcache.checksum.MavenProjectInput;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.CacheSource;
+import org.apache.maven.buildcache.xml.XmlService;
+import org.apache.maven.buildcache.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.report.CacheReport;
+import org.apache.maven.buildcache.xml.report.ProjectReport;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
diff --git a/src/main/java/org/apache/maven/caching/Xpp3DomUtils.java
b/src/main/java/org/apache/maven/buildcache/Xpp3DomUtils.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/Xpp3DomUtils.java
rename to src/main/java/org/apache/maven/buildcache/Xpp3DomUtils.java
index c5d77de..c4c389c 100644
--- a/src/main/java/org/apache/maven/caching/Xpp3DomUtils.java
+++ b/src/main/java/org/apache/maven/buildcache/Xpp3DomUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
/**
* This utility class is used to work around the classloading problem described
diff --git
a/src/main/java/org/apache/maven/caching/artifact/RestoredArtifact.java
b/src/main/java/org/apache/maven/buildcache/artifact/RestoredArtifact.java
similarity index 98%
rename from
src/main/java/org/apache/maven/caching/artifact/RestoredArtifact.java
rename to
src/main/java/org/apache/maven/buildcache/artifact/RestoredArtifact.java
index 3ac9d07..198ac2a 100644
--- a/src/main/java/org/apache/maven/caching/artifact/RestoredArtifact.java
+++ b/src/main/java/org/apache/maven/buildcache/artifact/RestoredArtifact.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.artifact;
+package org.apache.maven.buildcache.artifact;
import java.io.File;
import java.util.concurrent.CompletableFuture;
diff --git
a/src/main/java/org/apache/maven/caching/checksum/DependencyNotResolvedException.java
b/src/main/java/org/apache/maven/buildcache/checksum/DependencyNotResolvedException.java
similarity index 95%
rename from
src/main/java/org/apache/maven/caching/checksum/DependencyNotResolvedException.java
rename to
src/main/java/org/apache/maven/buildcache/checksum/DependencyNotResolvedException.java
index a276ca3..e3b00f2 100644
---
a/src/main/java/org/apache/maven/caching/checksum/DependencyNotResolvedException.java
+++
b/src/main/java/org/apache/maven/buildcache/checksum/DependencyNotResolvedException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.checksum;
+package org.apache.maven.buildcache.checksum;
/**
* DependencyNotResolvedException
diff --git a/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
b/src/main/java/org/apache/maven/buildcache/checksum/DigestUtils.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
rename to src/main/java/org/apache/maven/buildcache/checksum/DigestUtils.java
index a03e350..9f54259 100644
--- a/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
+++ b/src/main/java/org/apache/maven/buildcache/checksum/DigestUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.checksum;
+package org.apache.maven.buildcache.checksum;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -26,8 +26,8 @@ import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.hash.HashChecksum;
-import org.apache.maven.caching.xml.build.DigestItem;
+import org.apache.maven.buildcache.hash.HashChecksum;
+import org.apache.maven.buildcache.xml.build.DigestItem;
import org.mozilla.universalchardet.UniversalDetector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
b/src/main/java/org/apache/maven/buildcache/checksum/KeyUtils.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
rename to src/main/java/org/apache/maven/buildcache/checksum/KeyUtils.java
index 9e615e3..ce790d2 100644
--- a/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
+++ b/src/main/java/org/apache/maven/buildcache/checksum/KeyUtils.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.checksum;
+package org.apache.maven.buildcache.checksum;
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.build.Artifact;
import org.apache.maven.project.MavenProject;
/**
diff --git
a/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
b/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
similarity index 96%
rename from
src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
rename to
src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
index 487dd17..8799cd1 100644
--- a/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
+++ b/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.checksum;
+package org.apache.maven.buildcache.checksum;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -49,22 +49,22 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.caching.CacheUtils;
-import org.apache.maven.caching.MultiModuleSupport;
-import org.apache.maven.caching.NormalizedModelProvider;
-import org.apache.maven.caching.PluginScanConfig;
-import org.apache.maven.caching.ProjectInputCalculator;
-import org.apache.maven.caching.RemoteCacheRepository;
-import org.apache.maven.caching.ScanConfigProperties;
-import org.apache.maven.caching.Xpp3DomUtils;
-import org.apache.maven.caching.hash.HashAlgorithm;
-import org.apache.maven.caching.hash.HashChecksum;
-import org.apache.maven.caching.xml.CacheConfig;
-import org.apache.maven.caching.xml.DtoUtils;
-import org.apache.maven.caching.xml.build.DigestItem;
-import org.apache.maven.caching.xml.build.ProjectsInputInfo;
-import org.apache.maven.caching.xml.config.Exclude;
-import org.apache.maven.caching.xml.config.Include;
+import org.apache.maven.buildcache.CacheUtils;
+import org.apache.maven.buildcache.MultiModuleSupport;
+import org.apache.maven.buildcache.NormalizedModelProvider;
+import org.apache.maven.buildcache.PluginScanConfig;
+import org.apache.maven.buildcache.ProjectInputCalculator;
+import org.apache.maven.buildcache.RemoteCacheRepository;
+import org.apache.maven.buildcache.ScanConfigProperties;
+import org.apache.maven.buildcache.Xpp3DomUtils;
+import org.apache.maven.buildcache.hash.HashAlgorithm;
+import org.apache.maven.buildcache.hash.HashChecksum;
+import org.apache.maven.buildcache.xml.CacheConfig;
+import org.apache.maven.buildcache.xml.DtoUtils;
+import org.apache.maven.buildcache.xml.build.DigestItem;
+import org.apache.maven.buildcache.xml.build.ProjectsInputInfo;
+import org.apache.maven.buildcache.xml.config.Exclude;
+import org.apache.maven.buildcache.xml.config.Include;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
@@ -86,8 +86,8 @@ import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.replaceEachRepeatedly;
import static org.apache.commons.lang3.StringUtils.startsWithAny;
import static org.apache.commons.lang3.StringUtils.stripToEmpty;
-import static org.apache.maven.caching.CacheUtils.isPom;
-import static org.apache.maven.caching.CacheUtils.isSnapshot;
+import static org.apache.maven.buildcache.CacheUtils.isPom;
+import static org.apache.maven.buildcache.CacheUtils.isSnapshot;
/**
* MavenProjectInput
diff --git a/src/main/java/org/apache/maven/caching/checksum/WalkKey.java
b/src/main/java/org/apache/maven/buildcache/checksum/WalkKey.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/checksum/WalkKey.java
rename to src/main/java/org/apache/maven/buildcache/checksum/WalkKey.java
index 5b20c19..2d5803d 100644
--- a/src/main/java/org/apache/maven/caching/checksum/WalkKey.java
+++ b/src/main/java/org/apache/maven/buildcache/checksum/WalkKey.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.checksum;
+package org.apache.maven.buildcache.checksum;
import java.nio.file.Path;
diff --git a/src/main/java/org/apache/maven/caching/hash/CloseableBuffer.java
b/src/main/java/org/apache/maven/buildcache/hash/CloseableBuffer.java
similarity index 96%
rename from src/main/java/org/apache/maven/caching/hash/CloseableBuffer.java
rename to src/main/java/org/apache/maven/buildcache/hash/CloseableBuffer.java
index 99f53db..c884d1b 100644
--- a/src/main/java/org/apache/maven/caching/hash/CloseableBuffer.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/CloseableBuffer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.io.IOException;
import java.lang.reflect.Method;
@@ -26,8 +26,8 @@ import java.nio.channels.FileChannel.MapMode;
import java.security.PrivilegedAction;
import static java.security.AccessController.doPrivileged;
-import static org.apache.maven.caching.hash.ReflectionUtils.getField;
-import static org.apache.maven.caching.hash.ReflectionUtils.getMethod;
+import static org.apache.maven.buildcache.hash.ReflectionUtils.getField;
+import static org.apache.maven.buildcache.hash.ReflectionUtils.getMethod;
/**
* CloseableBuffer https://stackoverflow.com/a/54046774
diff --git a/src/main/java/org/apache/maven/caching/hash/Hash.java
b/src/main/java/org/apache/maven/buildcache/hash/Hash.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/hash/Hash.java
rename to src/main/java/org/apache/maven/buildcache/hash/Hash.java
index 1edc8a6..9228d37 100644
--- a/src/main/java/org/apache/maven/caching/hash/Hash.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/Hash.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/src/main/java/org/apache/maven/caching/hash/HashAlgorithm.java
b/src/main/java/org/apache/maven/buildcache/hash/HashAlgorithm.java
similarity index 96%
rename from src/main/java/org/apache/maven/caching/hash/HashAlgorithm.java
rename to src/main/java/org/apache/maven/buildcache/hash/HashAlgorithm.java
index 2fb69ce..d2d42fe 100644
--- a/src/main/java/org/apache/maven/caching/hash/HashAlgorithm.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/HashAlgorithm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/src/main/java/org/apache/maven/caching/hash/HashChecksum.java
b/src/main/java/org/apache/maven/buildcache/hash/HashChecksum.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/hash/HashChecksum.java
rename to src/main/java/org/apache/maven/buildcache/hash/HashChecksum.java
index 77a638b..e9099e9 100644
--- a/src/main/java/org/apache/maven/caching/hash/HashChecksum.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/HashChecksum.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/src/main/java/org/apache/maven/caching/hash/HashFactory.java
b/src/main/java/org/apache/maven/buildcache/hash/HashFactory.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/hash/HashFactory.java
rename to src/main/java/org/apache/maven/buildcache/hash/HashFactory.java
index adfac7f..30b3b1d 100644
--- a/src/main/java/org/apache/maven/caching/hash/HashFactory.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/HashFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
diff --git a/src/main/java/org/apache/maven/caching/hash/HexUtils.java
b/src/main/java/org/apache/maven/buildcache/hash/HexUtils.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/hash/HexUtils.java
rename to src/main/java/org/apache/maven/buildcache/hash/HexUtils.java
index ea53512..1b18a37 100644
--- a/src/main/java/org/apache/maven/caching/hash/HexUtils.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/HexUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/org/apache/maven/caching/hash/ReflectionUtils.java
b/src/main/java/org/apache/maven/buildcache/hash/ReflectionUtils.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/hash/ReflectionUtils.java
rename to src/main/java/org/apache/maven/buildcache/hash/ReflectionUtils.java
index 14f0ced..522557c 100644
--- a/src/main/java/org/apache/maven/caching/hash/ReflectionUtils.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/ReflectionUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/src/main/java/org/apache/maven/caching/hash/SHA.java
b/src/main/java/org/apache/maven/buildcache/hash/SHA.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/hash/SHA.java
rename to src/main/java/org/apache/maven/buildcache/hash/SHA.java
index 06e374f..0292e03 100644
--- a/src/main/java/org/apache/maven/caching/hash/SHA.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/SHA.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/src/main/java/org/apache/maven/caching/hash/ThreadLocalBuffer.java
b/src/main/java/org/apache/maven/buildcache/hash/ThreadLocalBuffer.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/hash/ThreadLocalBuffer.java
rename to src/main/java/org/apache/maven/buildcache/hash/ThreadLocalBuffer.java
index 8c9dc87..ef42774 100644
--- a/src/main/java/org/apache/maven/caching/hash/ThreadLocalBuffer.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/ThreadLocalBuffer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.nio.ByteBuffer;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/org/apache/maven/caching/hash/ThreadLocalDigest.java
b/src/main/java/org/apache/maven/buildcache/hash/ThreadLocalDigest.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/hash/ThreadLocalDigest.java
rename to src/main/java/org/apache/maven/buildcache/hash/ThreadLocalDigest.java
index 5abdd97..0e4c64a 100644
--- a/src/main/java/org/apache/maven/caching/hash/ThreadLocalDigest.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/ThreadLocalDigest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
diff --git a/src/main/java/org/apache/maven/caching/hash/XX.java
b/src/main/java/org/apache/maven/buildcache/hash/XX.java
similarity index 98%
rename from src/main/java/org/apache/maven/caching/hash/XX.java
rename to src/main/java/org/apache/maven/buildcache/hash/XX.java
index a9086b6..05e37b4 100644
--- a/src/main/java/org/apache/maven/caching/hash/XX.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/XX.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/src/main/java/org/apache/maven/caching/hash/XXMM.java
b/src/main/java/org/apache/maven/buildcache/hash/XXMM.java
similarity index 97%
rename from src/main/java/org/apache/maven/caching/hash/XXMM.java
rename to src/main/java/org/apache/maven/buildcache/hash/XXMM.java
index 95eb1ee..6d7682e 100644
--- a/src/main/java/org/apache/maven/caching/hash/XXMM.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/XXMM.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import java.io.IOException;
import java.nio.channels.FileChannel;
diff --git a/src/main/java/org/apache/maven/caching/xml/Build.java
b/src/main/java/org/apache/maven/buildcache/xml/Build.java
similarity index 88%
rename from src/main/java/org/apache/maven/caching/xml/Build.java
rename to src/main/java/org/apache/maven/buildcache/xml/Build.java
index b8d29a1..6ce7422 100644
--- a/src/main/java/org/apache/maven/caching/xml/Build.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/Build.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.xml;
+package org.apache.maven.buildcache.xml;
import java.io.IOException;
import java.net.InetAddress;
@@ -28,17 +28,17 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.apache.maven.caching.CacheUtils;
-import org.apache.maven.caching.checksum.MavenProjectInput;
-import org.apache.maven.caching.hash.HashAlgorithm;
-import org.apache.maven.caching.xml.build.Artifact;
-import org.apache.maven.caching.xml.build.CompletedExecution;
-import org.apache.maven.caching.xml.build.DigestItem;
-import org.apache.maven.caching.xml.build.ProjectsInputInfo;
+import org.apache.maven.buildcache.CacheUtils;
+import org.apache.maven.buildcache.checksum.MavenProjectInput;
+import org.apache.maven.buildcache.hash.HashAlgorithm;
+import org.apache.maven.buildcache.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.build.CompletedExecution;
+import org.apache.maven.buildcache.xml.build.DigestItem;
+import org.apache.maven.buildcache.xml.build.ProjectsInputInfo;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecution;
-import static org.apache.maven.caching.CacheUtils.mojoExecutionKey;
+import static org.apache.maven.buildcache.CacheUtils.mojoExecutionKey;
/**
* Build
@@ -46,7 +46,7 @@ import static
org.apache.maven.caching.CacheUtils.mojoExecutionKey;
public class Build
{
- final org.apache.maven.caching.xml.build.Build dto;
+ final org.apache.maven.buildcache.xml.build.Build dto;
CacheSource source;
volatile Map<String, CompletedExecution> execMap;
@@ -57,7 +57,7 @@ public class Build
List<CompletedExecution> completedExecutions,
String hashAlgorithm )
{
- this.dto = new org.apache.maven.caching.xml.build.Build();
+ this.dto = new org.apache.maven.buildcache.xml.build.Build();
this.dto.setCacheImplementationVersion(
MavenProjectInput.CACHE_IMPLEMENTATION_VERSION );
this.dto.setBuildTime( new Date() );
try
@@ -82,7 +82,7 @@ public class Build
return source;
}
- public Build( org.apache.maven.caching.xml.build.Build dto, CacheSource
source )
+ public Build( org.apache.maven.buildcache.xml.build.Build dto, CacheSource
source )
{
this.dto = dto;
this.source = source;
@@ -146,7 +146,7 @@ public class Build
return Collections.emptyList();
}
- public org.apache.maven.caching.xml.build.Build getDto()
+ public org.apache.maven.buildcache.xml.build.Build getDto()
{
return dto;
}
diff --git a/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
b/src/main/java/org/apache/maven/buildcache/xml/CacheConfig.java
similarity index 87%
rename from src/main/java/org/apache/maven/caching/xml/CacheConfig.java
rename to src/main/java/org/apache/maven/buildcache/xml/CacheConfig.java
index 99040e0..ab36f12 100644
--- a/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/CacheConfig.java
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.xml;
+package org.apache.maven.buildcache.xml;
import java.util.List;
import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.apache.maven.caching.PluginScanConfig;
-import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.xml.config.Exclude;
-import org.apache.maven.caching.xml.config.Include;
-import org.apache.maven.caching.xml.config.MultiModule;
-import org.apache.maven.caching.xml.config.PropertyName;
-import org.apache.maven.caching.xml.config.TrackedProperty;
+import org.apache.maven.buildcache.PluginScanConfig;
+import org.apache.maven.buildcache.hash.HashFactory;
+import org.apache.maven.buildcache.xml.config.Exclude;
+import org.apache.maven.buildcache.xml.config.Include;
+import org.apache.maven.buildcache.xml.config.MultiModule;
+import org.apache.maven.buildcache.xml.config.PropertyName;
+import org.apache.maven.buildcache.xml.config.TrackedProperty;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.plugin.MojoExecution;
diff --git a/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
b/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
similarity index 91%
rename from src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
rename to src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
index 7d30380..e303393 100644
--- a/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.xml;
+package org.apache.maven.buildcache.xml;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -32,32 +32,32 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.SessionScoped;
-import org.apache.maven.caching.DefaultPluginScanConfig;
-import org.apache.maven.caching.PluginScanConfig;
-import org.apache.maven.caching.PluginScanConfigImpl;
-import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.xml.config.AttachedOutputs;
-import org.apache.maven.caching.xml.config.CacheConfig;
-import org.apache.maven.caching.xml.config.Configuration;
-import org.apache.maven.caching.xml.config.CoordinatesBase;
-import org.apache.maven.caching.xml.config.Exclude;
-import org.apache.maven.caching.xml.config.Executables;
-import org.apache.maven.caching.xml.config.ExecutionConfigurationScan;
-import org.apache.maven.caching.xml.config.ExecutionControl;
-import org.apache.maven.caching.xml.config.ExecutionIdsList;
-import org.apache.maven.caching.xml.config.GoalReconciliation;
-import org.apache.maven.caching.xml.config.GoalsList;
-import org.apache.maven.caching.xml.config.Include;
-import org.apache.maven.caching.xml.config.Input;
-import org.apache.maven.caching.xml.config.Local;
-import org.apache.maven.caching.xml.config.MultiModule;
-import org.apache.maven.caching.xml.config.PathSet;
-import org.apache.maven.caching.xml.config.PluginConfigurationScan;
-import org.apache.maven.caching.xml.config.PluginSet;
-import org.apache.maven.caching.xml.config.ProjectVersioning;
-import org.apache.maven.caching.xml.config.PropertyName;
-import org.apache.maven.caching.xml.config.Remote;
-import org.apache.maven.caching.xml.config.TrackedProperty;
+import org.apache.maven.buildcache.DefaultPluginScanConfig;
+import org.apache.maven.buildcache.PluginScanConfig;
+import org.apache.maven.buildcache.PluginScanConfigImpl;
+import org.apache.maven.buildcache.hash.HashFactory;
+import org.apache.maven.buildcache.xml.config.AttachedOutputs;
+import org.apache.maven.buildcache.xml.config.CacheConfig;
+import org.apache.maven.buildcache.xml.config.Configuration;
+import org.apache.maven.buildcache.xml.config.CoordinatesBase;
+import org.apache.maven.buildcache.xml.config.Exclude;
+import org.apache.maven.buildcache.xml.config.Executables;
+import org.apache.maven.buildcache.xml.config.ExecutionConfigurationScan;
+import org.apache.maven.buildcache.xml.config.ExecutionControl;
+import org.apache.maven.buildcache.xml.config.ExecutionIdsList;
+import org.apache.maven.buildcache.xml.config.GoalReconciliation;
+import org.apache.maven.buildcache.xml.config.GoalsList;
+import org.apache.maven.buildcache.xml.config.Include;
+import org.apache.maven.buildcache.xml.config.Input;
+import org.apache.maven.buildcache.xml.config.Local;
+import org.apache.maven.buildcache.xml.config.MultiModule;
+import org.apache.maven.buildcache.xml.config.PathSet;
+import org.apache.maven.buildcache.xml.config.PluginConfigurationScan;
+import org.apache.maven.buildcache.xml.config.PluginSet;
+import org.apache.maven.buildcache.xml.config.ProjectVersioning;
+import org.apache.maven.buildcache.xml.config.PropertyName;
+import org.apache.maven.buildcache.xml.config.Remote;
+import org.apache.maven.buildcache.xml.config.TrackedProperty;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
@@ -66,7 +66,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.lang.Boolean.TRUE;
-import static org.apache.maven.caching.CacheUtils.getMultimoduleRoot;
+import static org.apache.maven.buildcache.CacheUtils.getMultimoduleRoot;
/**
* CacheConfigImpl
@@ -74,7 +74,7 @@ import static
org.apache.maven.caching.CacheUtils.getMultimoduleRoot;
@SessionScoped
@Named
@SuppressWarnings( "unused" )
-public class CacheConfigImpl implements
org.apache.maven.caching.xml.CacheConfig
+public class CacheConfigImpl implements
org.apache.maven.buildcache.xml.CacheConfig
{
public static final String CONFIG_PATH_PROPERTY_NAME =
"remote.cache.configPath";
diff --git a/src/main/java/org/apache/maven/caching/xml/CacheSource.java
b/src/main/java/org/apache/maven/buildcache/xml/CacheSource.java
similarity index 95%
rename from src/main/java/org/apache/maven/caching/xml/CacheSource.java
rename to src/main/java/org/apache/maven/buildcache/xml/CacheSource.java
index 5f8f242..e19ee0d 100644
--- a/src/main/java/org/apache/maven/caching/xml/CacheSource.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/CacheSource.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.xml;
+package org.apache.maven.buildcache.xml;
/**
* CacheSource
diff --git a/src/main/java/org/apache/maven/caching/xml/CacheState.java
b/src/main/java/org/apache/maven/buildcache/xml/CacheState.java
similarity index 95%
rename from src/main/java/org/apache/maven/caching/xml/CacheState.java
rename to src/main/java/org/apache/maven/buildcache/xml/CacheState.java
index b2f2a31..f9ad091 100644
--- a/src/main/java/org/apache/maven/caching/xml/CacheState.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/CacheState.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.xml;
+package org.apache.maven.buildcache.xml;
/**
* CacheState
diff --git a/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
b/src/main/java/org/apache/maven/buildcache/xml/DtoUtils.java
similarity index 92%
rename from src/main/java/org/apache/maven/caching/xml/DtoUtils.java
rename to src/main/java/org/apache/maven/buildcache/xml/DtoUtils.java
index c3d0f06..3726be5 100644
--- a/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/DtoUtils.java
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.xml;
+package org.apache.maven.buildcache.xml;
import java.util.List;
import javax.annotation.Nonnull;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.CacheUtils;
-import org.apache.maven.caching.xml.build.Artifact;
-import org.apache.maven.caching.xml.build.CompletedExecution;
-import org.apache.maven.caching.xml.build.DigestItem;
-import org.apache.maven.caching.xml.build.PropertyValue;
-import org.apache.maven.caching.xml.config.TrackedProperty;
+import org.apache.maven.buildcache.CacheUtils;
+import org.apache.maven.buildcache.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.build.CompletedExecution;
+import org.apache.maven.buildcache.xml.build.DigestItem;
+import org.apache.maven.buildcache.xml.build.PropertyValue;
+import org.apache.maven.buildcache.xml.config.TrackedProperty;
import org.apache.maven.model.Dependency;
-import static org.apache.maven.caching.checksum.KeyUtils.getArtifactKey;
+import static org.apache.maven.buildcache.checksum.KeyUtils.getArtifactKey;
/**
* DtoUtils
diff --git a/src/main/java/org/apache/maven/caching/xml/XmlService.java
b/src/main/java/org/apache/maven/buildcache/xml/XmlService.java
similarity index 74%
rename from src/main/java/org/apache/maven/caching/xml/XmlService.java
rename to src/main/java/org/apache/maven/buildcache/xml/XmlService.java
index 9a1baf3..9d6d237 100644
--- a/src/main/java/org/apache/maven/caching/xml/XmlService.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/XmlService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.xml;
+package org.apache.maven.buildcache.xml;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -26,18 +26,18 @@ import java.io.InputStream;
import java.nio.file.Files;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.apache.maven.caching.xml.build.Build;
-import org.apache.maven.caching.xml.build.io.xpp3.CacheBuildXpp3Reader;
-import org.apache.maven.caching.xml.build.io.xpp3.CacheBuildXpp3Writer;
-import org.apache.maven.caching.xml.config.CacheConfig;
-import org.apache.maven.caching.xml.config.io.xpp3.CacheConfigXpp3Reader;
-import org.apache.maven.caching.xml.config.io.xpp3.CacheConfigXpp3Writer;
-import org.apache.maven.caching.xml.diff.Diff;
-import org.apache.maven.caching.xml.diff.io.xpp3.CacheDiffXpp3Reader;
-import org.apache.maven.caching.xml.diff.io.xpp3.CacheDiffXpp3Writer;
-import org.apache.maven.caching.xml.report.CacheReport;
-import org.apache.maven.caching.xml.report.io.xpp3.CacheReportXpp3Reader;
-import org.apache.maven.caching.xml.report.io.xpp3.CacheReportXpp3Writer;
+import org.apache.maven.buildcache.xml.build.Build;
+import org.apache.maven.buildcache.xml.build.io.xpp3.BuildCacheBuildXpp3Reader;
+import org.apache.maven.buildcache.xml.build.io.xpp3.BuildCacheBuildXpp3Writer;
+import org.apache.maven.buildcache.xml.config.CacheConfig;
+import
org.apache.maven.buildcache.xml.config.io.xpp3.BuildCacheConfigXpp3Reader;
+import
org.apache.maven.buildcache.xml.config.io.xpp3.BuildCacheConfigXpp3Writer;
+import org.apache.maven.buildcache.xml.diff.Diff;
+import org.apache.maven.buildcache.xml.diff.io.xpp3.BuildCacheDiffXpp3Reader;
+import org.apache.maven.buildcache.xml.diff.io.xpp3.BuildCacheDiffXpp3Writer;
+import org.apache.maven.buildcache.xml.report.CacheReport;
+import
org.apache.maven.buildcache.xml.report.io.xpp3.BuildCacheReportXpp3Reader;
+import
org.apache.maven.buildcache.xml.report.io.xpp3.BuildCacheReportXpp3Writer;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
@@ -52,7 +52,7 @@ public class XmlService
{
try ( ByteArrayOutputStream baos = new ByteArrayOutputStream() )
{
- new CacheConfigXpp3Writer().write( baos, cache );
+ new BuildCacheConfigXpp3Writer().write( baos, cache );
return baos.toByteArray();
}
}
@@ -61,7 +61,7 @@ public class XmlService
{
try ( ByteArrayOutputStream baos = new ByteArrayOutputStream() )
{
- new CacheBuildXpp3Writer().write( baos, build );
+ new BuildCacheBuildXpp3Writer().write( baos, build );
return baos.toByteArray();
}
}
@@ -70,7 +70,7 @@ public class XmlService
{
try ( ByteArrayOutputStream baos = new ByteArrayOutputStream() )
{
- new CacheDiffXpp3Writer().write( baos, diff );
+ new BuildCacheDiffXpp3Writer().write( baos, diff );
return baos.toByteArray();
}
}
@@ -79,7 +79,7 @@ public class XmlService
{
try ( ByteArrayOutputStream baos = new ByteArrayOutputStream() )
{
- new CacheReportXpp3Writer().write( baos, cacheReportType );
+ new BuildCacheReportXpp3Writer().write( baos, cacheReportType );
return baos.toByteArray();
}
}
@@ -160,19 +160,19 @@ public class XmlService
{
if ( clazz == Build.class )
{
- return clazz.cast( new CacheBuildXpp3Reader().read(
inputStream ) );
+ return clazz.cast( new BuildCacheBuildXpp3Reader().read(
inputStream ) );
}
else if ( clazz == CacheConfig.class )
{
- return clazz.cast( new CacheConfigXpp3Reader().read(
inputStream ) );
+ return clazz.cast( new BuildCacheConfigXpp3Reader().read(
inputStream ) );
}
else if ( clazz == Diff.class )
{
- return clazz.cast( new CacheDiffXpp3Reader().read( inputStream
) );
+ return clazz.cast( new BuildCacheDiffXpp3Reader().read(
inputStream ) );
}
else if ( clazz == CacheReport.class )
{
- return clazz.cast( new CacheReportXpp3Reader().read(
inputStream ) );
+ return clazz.cast( new BuildCacheReportXpp3Reader().read(
inputStream ) );
}
else
{
diff --git a/src/main/mdo/cache-build.mdo b/src/main/mdo/build-cache-build.mdo
similarity index 97%
rename from src/main/mdo/cache-build.mdo
rename to src/main/mdo/build-cache-build.mdo
index 01c28a6..949bba4 100644
--- a/src/main/mdo/cache-build.mdo
+++ b/src/main/mdo/build-cache-build.mdo
@@ -19,16 +19,16 @@ under the License.
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0
http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd";
- xml.namespace="http://maven.apache.org/CACHE-BUILD/${version}";
- xml.schemaLocation="http://maven.apache.org/xsd/cache-build-${version}.xsd";>
- <id>cache-build</id>
- <name>CacheBuild</name>
+ xml.namespace="http://maven.apache.org/BUILD-CACHE-BUILD/${version}";
+
xml.schemaLocation="http://maven.apache.org/xsd/build-cache-build-${version}.xsd";>
+ <id>build-cache-build</id>
+ <name>BuildCacheBuild</name>
<description><![CDATA[Cache build info, stored in local
<code>lookupinfo.xml</code> or remote <code>buildinfo.xml</code>
]]></description>
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.xml.build</value>
+ <value>org.apache.maven.buildcache.xml.build</value>
</default>
</defaults>
<classes>
diff --git a/src/main/mdo/cache-config.mdo b/src/main/mdo/build-cache-config.mdo
similarity index 99%
rename from src/main/mdo/cache-config.mdo
rename to src/main/mdo/build-cache-config.mdo
index 9cb8e44..813a0c2 100644
--- a/src/main/mdo/cache-config.mdo
+++ b/src/main/mdo/build-cache-config.mdo
@@ -19,17 +19,17 @@ under the License.
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0
http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd";
- xml.namespace="http://maven.apache.org/CACHE-CONFIG/${version}";
-
xml.schemaLocation="http://maven.apache.org/xsd/cache-config-${version}.xsd";>
- <id>cache-config</id>
- <name>CacheConfig</name>
+ xml.namespace="http://maven.apache.org/BUILD-CACHE-CONFIG/${version}";
+
xml.schemaLocation="http://maven.apache.org/xsd/build-cache-config-${version}.xsd";>
+ <id>build-cache-config</id>
+ <name>BuildCacheConfig</name>
<description><![CDATA[Maven Incremental Build and Cache configuration,
stored in <code>.mvn/maven-build-cache-config.xml</code>
]]></description>
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.xml.config</value>
+ <value>org.apache.maven.buildcache.xml.config</value>
</default>
</defaults>
diff --git a/src/main/mdo/cache-diff.mdo b/src/main/mdo/build-cache-diff.mdo
similarity index 92%
rename from src/main/mdo/cache-diff.mdo
rename to src/main/mdo/build-cache-diff.mdo
index 9d83736..55e6ec6 100644
--- a/src/main/mdo/cache-diff.mdo
+++ b/src/main/mdo/build-cache-diff.mdo
@@ -19,16 +19,16 @@ under the License.
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0
http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd";
- xml.namespace="http://maven.apache.org/CACHE-DIFF/${version}";
- xml.schemaLocation="http://maven.apache.org/xsd/cache-diff-${version}.xsd";>
- <id>cache-diff</id>
- <name>CacheDiff</name>
+ xml.namespace="http://maven.apache.org/BUILD-CACHE-DIFF/${version}";
+
xml.schemaLocation="http://maven.apache.org/xsd/build-cache-diff-${version}.xsd";>
+ <id>build-cache-diff</id>
+ <name>BuildCacheDiff</name>
<description><![CDATA[Cache Builds Diff, stored in
<code>diff-${checksum}.xml</code>
]]></description>
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.xml.diff</value>
+ <value>org.apache.maven.buildcache.xml.diff</value>
</default>
</defaults>
<classes>
diff --git a/src/main/mdo/cache-report.mdo b/src/main/mdo/build-cache-report.mdo
similarity index 90%
rename from src/main/mdo/cache-report.mdo
rename to src/main/mdo/build-cache-report.mdo
index d77ba56..7c15313 100644
--- a/src/main/mdo/cache-report.mdo
+++ b/src/main/mdo/build-cache-report.mdo
@@ -19,16 +19,16 @@ under the License.
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0
http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd";
- xml.namespace="http://maven.apache.org/CACHE-REPORT/${version}";
- xml.schemaLocation="http://maven.apache.org/xsd/cache-report-${version}.xsd";>
- <id>cache-report</id>
- <name>CacheReport</name>
- <description><![CDATA[Cache report, stored in <code>cache-report.xml</code>
+ xml.namespace="http://maven.apache.org/BUILD-CACHE-REPORT/${version}";
+
xml.schemaLocation="http://maven.apache.org/xsd/build-cache-report-${version}.xsd";>
+ <id>cbuild-ache-report</id>
+ <name>BuildCacheReport</name>
+ <description><![CDATA[BuildCache report, stored in
<code>build-cache-report.xml</code>
]]></description>
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.xml.report</value>
+ <value>org.apache.maven.buildcache.xml.report</value>
</default>
</defaults>
<classes>
diff --git a/src/site/markdown/remote-cache.md
b/src/site/markdown/remote-cache.md
index 39bf151..c7fa16d 100644
--- a/src/site/markdown/remote-cache.md
+++ b/src/site/markdown/remote-cache.md
@@ -100,18 +100,18 @@ iteratively achieve working configuration.
* Enable fail fast mode to fail build on the first discrepancy between
* Provide reference to the CI build as a baseline for comparison between your
local and remote builds. Go to the
- reference CI build log and one of the final lines of the build should be a
line about saving `cache-report.xml`
+ reference CI build log and one of the final lines of the build should be a
line about saving `build-cache-report.xml`
```
-[INFO] [CACHE] Saved to remote cache
https://your-cache-url/<...>/915296a3-4596-4eb5-bf37-f6e13ebe087e/cache-report.xml
+[INFO] [CACHE] Saved to remote cache
https://your-cache-url/<...>/915296a3-4596-4eb5-bf37-f6e13ebe087e/build-cache-report.xml
```
-Copy the link to a `cache-report.xml` and provide it to your local build as a
baseline for comparison.
+Copy the link to a `cbuild-ache-report.xml` and provide it to your local build
as a baseline for comparison.
* Run local build. Command line should look similar to this:
```bash
-mvn verify -Dremote.cache.failFast=true
-Dremote.cache.baselineUrl=https://your-cache-url/<...>/915296a3-4596-4eb5-bf37-f6e13ebe087e/cache-report.xml
+mvn verify -Dremote.cache.failFast=true
-Dremote.cache.baselineUrl=https://your-cache-url/<...>/915296a3-4596-4eb5-bf37-f6e13ebe087e/build-cache-report.xml
```
Once discrepancy between remote and local builds detected cache will fail with
diagnostic info in
diff --git a/src/test/java/org/apache/maven/caching/BuildInfoTest.java
b/src/test/java/org/apache/maven/buildcache/BuildInfoTest.java
similarity index 84%
rename from src/test/java/org/apache/maven/caching/BuildInfoTest.java
rename to src/test/java/org/apache/maven/buildcache/BuildInfoTest.java
index d50687f..a392ee7 100644
--- a/src/test/java/org/apache/maven/caching/BuildInfoTest.java
+++ b/src/test/java/org/apache/maven/buildcache/BuildInfoTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
import java.io.File;
import java.nio.charset.StandardCharsets;
@@ -30,14 +30,14 @@ import java.util.Date;
import java.util.List;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.xml.Build;
-import org.apache.maven.caching.xml.XmlService;
-import org.apache.maven.caching.xml.build.Artifact;
-import org.apache.maven.caching.xml.build.CompletedExecution;
-import org.apache.maven.caching.xml.build.DigestItem;
-import org.apache.maven.caching.xml.build.ProjectsInputInfo;
-import org.apache.maven.caching.xml.build.PropertyValue;
+import org.apache.maven.buildcache.hash.HashFactory;
+import org.apache.maven.buildcache.xml.Build;
+import org.apache.maven.buildcache.xml.XmlService;
+import org.apache.maven.buildcache.xml.build.Artifact;
+import org.apache.maven.buildcache.xml.build.CompletedExecution;
+import org.apache.maven.buildcache.xml.build.DigestItem;
+import org.apache.maven.buildcache.xml.build.ProjectsInputInfo;
+import org.apache.maven.buildcache.xml.build.PropertyValue;
import org.junit.jupiter.api.Test;
public class BuildInfoTest
@@ -64,7 +64,7 @@ public class BuildInfoTest
artifact.setFileSize( 123456 );
artifact.setFileHash( "456L" );
- org.apache.maven.caching.xml.build.Build buildInfo = new
org.apache.maven.caching.xml.build.Build();
+ org.apache.maven.buildcache.xml.build.Build buildInfo = new
org.apache.maven.buildcache.xml.build.Build();
buildInfo.setCacheImplementationVersion( "cacheImplementationVersion"
);
buildInfo.setBuildServer( "server" );
buildInfo.setBuildTime( new Date() );
@@ -86,7 +86,7 @@ public class BuildInfoTest
file.deleteOnExit();
Files.write( tempFilePath, bytes );
- org.apache.maven.caching.xml.build.Build buildInfo1 =
xmlService.loadBuild( file );
+ org.apache.maven.buildcache.xml.build.Build buildInfo1 =
xmlService.loadBuild( file );
System.out.println( buildInfo1 );
}
diff --git
a/src/test/java/org/apache/maven/caching/checksum/MavenProjectInputTest.java
b/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java
similarity index 98%
rename from
src/test/java/org/apache/maven/caching/checksum/MavenProjectInputTest.java
rename to
src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java
index ffc125a..79c2a58 100644
--- a/src/test/java/org/apache/maven/caching/checksum/MavenProjectInputTest.java
+++
b/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.caching.checksum;
+package org.apache.maven.buildcache.checksum;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/caching/checksum/SHAHashTest.java
b/src/test/java/org/apache/maven/buildcache/checksum/SHAHashTest.java
similarity index 93%
rename from src/test/java/org/apache/maven/caching/checksum/SHAHashTest.java
rename to src/test/java/org/apache/maven/buildcache/checksum/SHAHashTest.java
index 2b428e7..aeb45e9 100644
--- a/src/test/java/org/apache/maven/caching/checksum/SHAHashTest.java
+++ b/src/test/java/org/apache/maven/buildcache/checksum/SHAHashTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.caching.checksum;
+package org.apache.maven.buildcache.checksum;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,11 @@ package org.apache.maven.caching.checksum;
* under the License.
*/
import java.nio.charset.StandardCharsets;
-import org.apache.maven.caching.hash.HashAlgorithm;
-import org.apache.maven.caching.hash.HashChecksum;
+import org.apache.maven.buildcache.hash.HashAlgorithm;
+import org.apache.maven.buildcache.hash.HashChecksum;
import org.junit.jupiter.api.Test;
-import static org.apache.maven.caching.hash.HashFactory.SHA256;
+import static org.apache.maven.buildcache.hash.HashFactory.SHA256;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class SHAHashTest
diff --git a/src/test/java/org/apache/maven/caching/checksum/XXHashTest.java
b/src/test/java/org/apache/maven/buildcache/checksum/XXHashTest.java
similarity index 94%
rename from src/test/java/org/apache/maven/caching/checksum/XXHashTest.java
rename to src/test/java/org/apache/maven/buildcache/checksum/XXHashTest.java
index b9b2f6b..2c895bf 100644
--- a/src/test/java/org/apache/maven/caching/checksum/XXHashTest.java
+++ b/src/test/java/org/apache/maven/buildcache/checksum/XXHashTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.caching.checksum;
+package org.apache.maven.buildcache.checksum;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,12 +20,12 @@ package org.apache.maven.caching.checksum;
*/
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import org.apache.maven.caching.hash.HashAlgorithm;
-import org.apache.maven.caching.hash.HashChecksum;
+import org.apache.maven.buildcache.hash.HashAlgorithm;
+import org.apache.maven.buildcache.hash.HashChecksum;
import org.junit.jupiter.api.Test;
-import static org.apache.maven.caching.hash.HashFactory.XX;
-import static org.apache.maven.caching.hash.HashFactory.XXMM;
+import static org.apache.maven.buildcache.hash.HashFactory.XX;
+import static org.apache.maven.buildcache.hash.HashFactory.XXMM;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class XXHashTest
diff --git a/src/test/java/org/apache/maven/caching/hash/HexUtilsTest.java
b/src/test/java/org/apache/maven/buildcache/hash/HexUtilsTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/caching/hash/HexUtilsTest.java
rename to src/test/java/org/apache/maven/buildcache/hash/HexUtilsTest.java
index aaddb0a..ac2234e 100644
--- a/src/test/java/org/apache/maven/caching/hash/HexUtilsTest.java
+++ b/src/test/java/org/apache/maven/buildcache/hash/HexUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.hash;
+package org.apache.maven.buildcache.hash;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
b/src/test/java/org/apache/maven/buildcache/its/BuildExtensionTest.java
similarity index 90%
rename from src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
rename to src/test/java/org/apache/maven/buildcache/its/BuildExtensionTest.java
index e3b7231..c7d5cf0 100644
--- a/src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
+++ b/src/test/java/org/apache/maven/buildcache/its/BuildExtensionTest.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.its;
+package org.apache.maven.buildcache.its;
-import org.apache.maven.caching.its.junit.IntegrationTest;
-import org.apache.maven.caching.its.junit.Test;
+import org.apache.maven.buildcache.its.junit.IntegrationTest;
+import org.apache.maven.buildcache.its.junit.Test;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
diff --git a/src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
b/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java
similarity index 90%
rename from src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
rename to src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java
index afe8a0c..b2ac1e2 100644
--- a/src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
+++ b/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.its;
+package org.apache.maven.buildcache.its;
-import org.apache.maven.caching.its.junit.IntegrationTest;
-import org.apache.maven.caching.its.junit.Test;
+import org.apache.maven.buildcache.its.junit.IntegrationTest;
+import org.apache.maven.buildcache.its.junit.Test;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
diff --git
a/src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
b/src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTest.java
similarity index 96%
rename from
src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
rename to
src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTest.java
index cfb6574..b1c5a68 100644
--- a/src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
+++ b/src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.its.junit;
+package org.apache.maven.buildcache.its.junit;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git
a/src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
b/src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTestExtension.java
similarity index 99%
rename from
src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
rename to
src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTestExtension.java
index bfae558..dc9fcdc 100644
---
a/src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
+++
b/src/test/java/org/apache/maven/buildcache/its/junit/IntegrationTestExtension.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.its.junit;
+package org.apache.maven.buildcache.its.junit;
import java.io.IOException;
import java.lang.reflect.Method;
@@ -28,7 +28,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;
-import org.apache.maven.caching.CacheUtils;
+import org.apache.maven.buildcache.CacheUtils;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.junit.jupiter.api.extension.BeforeAllCallback;
diff --git a/src/test/java/org/apache/maven/caching/its/junit/Test.java
b/src/test/java/org/apache/maven/buildcache/its/junit/Test.java
similarity index 96%
rename from src/test/java/org/apache/maven/caching/its/junit/Test.java
rename to src/test/java/org/apache/maven/buildcache/its/junit/Test.java
index 4423545..6f301bd 100644
--- a/src/test/java/org/apache/maven/caching/its/junit/Test.java
+++ b/src/test/java/org/apache/maven/buildcache/its/junit/Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.its.junit;
+package org.apache.maven.buildcache.its.junit;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/src/test/java/org/apache/maven/caching/xml/XmlServiceTest.java
b/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java
similarity index 73%
rename from src/test/java/org/apache/maven/caching/xml/XmlServiceTest.java
rename to src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java
index e6b4f72..277c821 100644
--- a/src/test/java/org/apache/maven/caching/xml/XmlServiceTest.java
+++ b/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching.xml;
+package org.apache.maven.buildcache.xml;
import java.io.InputStream;
import javax.xml.XMLConstants;
@@ -24,10 +24,10 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import org.apache.maven.caching.xml.build.Build;
-import org.apache.maven.caching.xml.config.CacheConfig;
-import org.apache.maven.caching.xml.diff.Diff;
-import org.apache.maven.caching.xml.report.CacheReport;
+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;
@@ -40,14 +40,14 @@ public class XmlServiceTest
public void testConfig() throws Exception
{
SchemaFactory sf = SchemaFactory.newInstance(
XMLConstants.W3C_XML_SCHEMA_NS_URI );
- Schema schema = sf.newSchema( getClass().getResource(
"/cache-config-1.0.0.xsd" ) );
+ Schema schema = sf.newSchema( getClass().getResource(
"/build-cache-config-1.0.0.xsd" ) );
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware( true );
dbf.setSchema( schema );
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse( getClass().getResource(
"cache-config-instance.xml" ).toString() );
+ Document doc = db.parse( getClass().getResource(
"build-cache-config-instance.xml" ).toString() );
- InputStream is = getClass().getResourceAsStream(
"cache-config-instance.xml" );
+ InputStream is = getClass().getResourceAsStream(
"build-cache-config-instance.xml" );
final CacheConfig cache = new XmlService().loadCacheConfig( is );
}
@@ -56,14 +56,14 @@ public class XmlServiceTest
public void testReport() throws Exception
{
SchemaFactory sf = SchemaFactory.newInstance(
XMLConstants.W3C_XML_SCHEMA_NS_URI );
- Schema schema = sf.newSchema( getClass().getResource(
"/cache-report-1.0.0.xsd" ) );
+ Schema schema = sf.newSchema( getClass().getResource(
"/build-cache-report-1.0.0.xsd" ) );
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware( true );
dbf.setSchema( schema );
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse( getClass().getResource(
"cache-report-instance.xml" ).toString() );
+ Document doc = db.parse( getClass().getResource(
"build-cache-report-instance.xml" ).toString() );
- InputStream is = getClass().getResourceAsStream(
"cache-report-instance.xml" );
+ InputStream is = getClass().getResourceAsStream(
"build-cache-report-instance.xml" );
final CacheReport cacheReport = new XmlService().loadCacheReport( is );
}
@@ -72,14 +72,14 @@ public class XmlServiceTest
public void testBuild() throws Exception
{
SchemaFactory sf = SchemaFactory.newInstance(
XMLConstants.W3C_XML_SCHEMA_NS_URI );
- Schema schema = sf.newSchema( getClass().getResource(
"/cache-build-1.0.0.xsd" ) );
+ Schema schema = sf.newSchema( getClass().getResource(
"/build-cache-build-1.0.0.xsd" ) );
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware( true );
dbf.setSchema( schema );
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse( getClass().getResource(
"cache-build-instance.xml" ).toString() );
+ Document doc = db.parse( getClass().getResource(
"build-cache-build-instance.xml" ).toString() );
- InputStream is = getClass().getResourceAsStream(
"cache-build-instance.xml" );
+ InputStream is = getClass().getResourceAsStream(
"build-cache-build-instance.xml" );
final Build build = new XmlService().loadBuild( is );
}
@@ -88,14 +88,14 @@ public class XmlServiceTest
public void testDiff() throws Exception
{
SchemaFactory sf = SchemaFactory.newInstance(
XMLConstants.W3C_XML_SCHEMA_NS_URI );
- Schema schema = sf.newSchema( getClass().getResource(
"/cache-diff-1.0.0.xsd" ) );
+ Schema schema = sf.newSchema( getClass().getResource(
"/build-cache-diff-1.0.0.xsd" ) );
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware( true );
dbf.setSchema( schema );
DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse( getClass().getResource(
"cache-diff-instance.xml" ).toString() );
+ Document doc = db.parse( getClass().getResource(
"build-cache-diff-instance.xml" ).toString() );
- InputStream is = getClass().getResourceAsStream(
"cache-diff-instance.xml" );
+ InputStream is = getClass().getResourceAsStream(
"build-cache-diff-instance.xml" );
final Diff buildDiff = new XmlService().loadDiff( is );
}
}
diff --git
a/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
b/src/test/projects/build-extension/src/main/java/org/apache/maven/buildcache/Test.java
similarity index 95%
rename from
src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
rename to
src/test/projects/build-extension/src/main/java/org/apache/maven/buildcache/Test.java
index 3aaecc7..03f66a8 100644
---
a/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
+++
b/src/test/projects/build-extension/src/main/java/org/apache/maven/buildcache/Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
class Test
{
diff --git
a/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
b/src/test/projects/core-extension/src/main/java/org/apache/maven/buildcache/Test.java
similarity index 95%
rename from
src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
rename to
src/test/projects/core-extension/src/main/java/org/apache/maven/buildcache/Test.java
index 3aaecc7..03f66a8 100644
---
a/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
+++
b/src/test/projects/core-extension/src/main/java/org/apache/maven/buildcache/Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.caching;
+package org.apache.maven.buildcache;
class Test
{
diff --git
a/src/test/resources/org/apache/maven/caching/xml/cache-build-instance.xml
b/src/test/resources/org/apache/maven/buildcache/xml/build-cache-build-instance.xml
similarity index 91%
rename from
src/test/resources/org/apache/maven/caching/xml/cache-build-instance.xml
rename to
src/test/resources/org/apache/maven/buildcache/xml/build-cache-build-instance.xml
index c80e922..69ebb4a 100644
--- a/src/test/resources/org/apache/maven/caching/xml/cache-build-instance.xml
+++
b/src/test/resources/org/apache/maven/buildcache/xml/build-cache-build-instance.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<build xmlns="http://maven.apache.org/CACHE-BUILD/1.0.0";
+<build xmlns="http://maven.apache.org/BUILD-CACHE-BUILD/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/CACHE-BUILD/1.0.0
../../../../../../../../target/generated-sources/modello/cache-build-1.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-BUILD/1.0.0
../../../../../../../../target/generated-sources/modello/cache-build-1.0.0.xsd">
<cacheImplementationVersion>v3</cacheImplementationVersion>
<buildTime>1980-03-23T10:20:15.000</buildTime>
<buildServer>my-server.com</buildServer>
diff --git
a/src/test/resources/org/apache/maven/caching/xml/cache-config-instance.xml
b/src/test/resources/org/apache/maven/buildcache/xml/build-cache-config-instance.xml
similarity index 96%
rename from
src/test/resources/org/apache/maven/caching/xml/cache-config-instance.xml
rename to
src/test/resources/org/apache/maven/buildcache/xml/build-cache-config-instance.xml
index 8451304..d2d0d82 100644
--- a/src/test/resources/org/apache/maven/caching/xml/cache-config-instance.xml
+++
b/src/test/resources/org/apache/maven/buildcache/xml/build-cache-config-instance.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<cache xmlns="http://maven.apache.org/CACHE-CONFIG/1.0.0";
+<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/CACHE-CONFIG/1.0.0
../../../../../../../../target/generated-sources/modello/cache-config-1.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0
../../../../../../../../target/generated-sources/modello/cache-config-1.0.0.xsd">
<configuration>
<enabled>true</enabled>
diff --git
a/src/test/resources/org/apache/maven/caching/xml/cache-diff-instance.xml
b/src/test/resources/org/apache/maven/buildcache/xml/build-cache-diff-instance.xml
similarity index 81%
rename from
src/test/resources/org/apache/maven/caching/xml/cache-diff-instance.xml
rename to
src/test/resources/org/apache/maven/buildcache/xml/build-cache-diff-instance.xml
index e549ef9..18ac7ed 100644
--- a/src/test/resources/org/apache/maven/caching/xml/cache-diff-instance.xml
+++
b/src/test/resources/org/apache/maven/buildcache/xml/build-cache-diff-instance.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<diff xmlns="http://maven.apache.org/CACHE-DIFF/1.0.0";
+<diff xmlns="http://maven.apache.org/BUILD-CACHE-DIFF/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/CACHE-DIFF/1.0.0
../../../../../../../../target/generated-sources/modello/cache-diff-1.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-DIFF/1.0.0
../../../../../../../../target/generated-sources/modello/cache-diff-1.0.0.xsd">
<mismatches>
<mismatch item="" />
diff --git
a/src/test/resources/org/apache/maven/caching/xml/cache-report-instance.xml
b/src/test/resources/org/apache/maven/buildcache/xml/build-cache-report-instance.xml
similarity index 81%
rename from
src/test/resources/org/apache/maven/caching/xml/cache-report-instance.xml
rename to
src/test/resources/org/apache/maven/buildcache/xml/build-cache-report-instance.xml
index af1f64d..87257ec 100644
--- a/src/test/resources/org/apache/maven/caching/xml/cache-report-instance.xml
+++
b/src/test/resources/org/apache/maven/buildcache/xml/build-cache-report-instance.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<cacheReport xmlns="http://maven.apache.org/CACHE-REPORT/1.0.0";
+<cacheReport xmlns="http://maven.apache.org/BUILD-CACHE-REPORT/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/CACHE-REPORT/1.0.0
../../../../../../../../target/generated-sources/modello/cache-report-1.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-REPORT/1.0.0
../../../../../../../../target/generated-sources/modello/cache-report-1.0.0.xsd">
<projects>
<project>
