You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/11/08 22:12:58 UTC
[maven] branch MNG-7129_Modello updated (07141cc -> 6047eda)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-7129_Modello
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 07141cc [MNG-7324] split domain, diff and report to separate xml.* packages
discard d539242 [MNG-7324] extract config classes to separate package from domain
new 6047eda [MNG-7324] split config/domain/diff/report to separate xml.* packages
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (07141cc)
\
N -- N -- N refs/heads/MNG-7129_Modello (6047eda)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/maven/caching/CacheControllerImpl.java | 4 +--
.../maven/caching/DefaultPluginScanConfig.java | 2 +-
.../apache/maven/caching/MojoExecutionManager.java | 2 +-
.../org/apache/maven/caching/PluginScanConfig.java | 2 +-
.../apache/maven/caching/PluginScanConfigImpl.java | 6 ++--
.../maven/caching/checksum/MavenProjectInput.java | 4 +--
.../org/apache/maven/caching/xml/CacheConfig.java | 8 ++---
.../apache/maven/caching/xml/CacheConfigImpl.java | 38 +++++++++++-----------
.../org/apache/maven/caching/xml/DtoUtils.java | 2 +-
.../org/apache/maven/caching/xml/XmlService.java | 6 ++--
maven-core/src/main/mdo/cache-config.mdo | 2 +-
.../apache/maven/caching/xml/CacheConfigTest.java | 2 +-
12 files changed, 39 insertions(+), 39 deletions(-)
[maven] 01/01: [MNG-7324] split config/domain/diff/report to
separate xml.* packages
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7129_Modello
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6047eda970c72b752c183d9dc6f303d0975fac8d
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon Nov 8 22:02:06 2021 +0100
[MNG-7324] split config/domain/diff/report to separate xml.* packages
---
maven-core/pom.xml | 3 ++
.../apache/maven/caching/ArtifactsRepository.java | 2 +-
.../org/apache/maven/caching/CacheContext.java | 2 +-
.../apache/maven/caching/CacheControllerImpl.java | 20 ++++++------
.../java/org/apache/maven/caching/CacheDiff.java | 14 ++++----
.../maven/caching/DefaultPluginScanConfig.java | 2 +-
.../apache/maven/caching/HttpRepositoryImpl.java | 8 ++---
.../maven/caching/LocalArtifactsRepository.java | 2 +-
.../apache/maven/caching/LocalRepositoryImpl.java | 8 ++---
.../apache/maven/caching/MojoExecutionManager.java | 4 +--
.../org/apache/maven/caching/PluginScanConfig.java | 2 +-
.../apache/maven/caching/PluginScanConfigImpl.java | 6 ++--
.../org/apache/maven/caching/ProjectUtils.java | 2 +-
.../maven/caching/RemoteArtifactsRepository.java | 2 +-
.../apache/maven/caching/checksum/DigestUtils.java | 2 +-
.../apache/maven/caching/checksum/KeyUtils.java | 2 +-
.../maven/caching/checksum/MavenProjectInput.java | 11 +++----
.../org/apache/maven/caching/xml/BuildInfo.java | 10 +++---
.../org/apache/maven/caching/xml/CacheConfig.java | 8 ++---
.../apache/maven/caching/xml/CacheConfigImpl.java | 38 +++++++++++-----------
.../org/apache/maven/caching/xml/DtoUtils.java | 10 +++---
.../org/apache/maven/caching/xml/XmlService.java | 24 +++++++-------
maven-core/src/main/mdo/cache-config.mdo | 4 +--
maven-core/src/main/mdo/cache-diff.mdo | 2 +-
maven-core/src/main/mdo/cache-domain.mdo | 2 +-
maven-core/src/main/mdo/cache-report.mdo | 2 +-
.../org/apache/maven/caching/BuildInfoTest.java | 13 ++++----
.../apache/maven/caching/xml/CacheConfigTest.java | 4 +--
28 files changed, 104 insertions(+), 105 deletions(-)
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index c3c3c7c..b82ef03 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -215,7 +215,10 @@ under the License.
<configuration>
<version>1.0.0</version>
<models>
+ <model>src/main/mdo/cache-config.mdo</model>
<model>src/main/mdo/cache-domain.mdo</model>
+ <model>src/main/mdo/cache-diff.mdo</model>
+ <model>src/main/mdo/cache-report.mdo</model>
</models>
</configuration>
</execution>
diff --git a/maven-core/src/main/java/org/apache/maven/caching/ArtifactsRepository.java b/maven-core/src/main/java/org/apache/maven/caching/ArtifactsRepository.java
index 968bae2..c72781d 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/ArtifactsRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/ArtifactsRepository.java
@@ -20,7 +20,7 @@ package org.apache.maven.caching;
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.caching.domain.CacheReportType;
+import org.apache.maven.caching.xml.report.CacheReportType;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.execution.MavenSession;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/CacheContext.java b/maven-core/src/main/java/org/apache/maven/caching/CacheContext.java
index 49b552e..39ed14c 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/CacheContext.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/CacheContext.java
@@ -19,7 +19,7 @@ package org.apache.maven.caching;
* under the License.
*/
-import org.apache.maven.caching.domain.ProjectsInputInfoType;
+import org.apache.maven.caching.xml.domain.ProjectsInputInfoType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/CacheControllerImpl.java b/maven-core/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
index 05e56a5..7d21372 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
@@ -31,18 +31,18 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.caching.checksum.KeyUtils;
import org.apache.maven.caching.checksum.MavenProjectInput;
-import org.apache.maven.caching.domain.Scm;
+import org.apache.maven.caching.xml.config.PropertyNameType;
+import org.apache.maven.caching.xml.config.TrackedPropertyType;
+import org.apache.maven.caching.xml.diff.BuildDiffType;
+import org.apache.maven.caching.xml.domain.ArtifactType;
+import org.apache.maven.caching.xml.domain.CompletedExecutionType;
+import org.apache.maven.caching.xml.domain.DigestItemType;
+import org.apache.maven.caching.xml.domain.ProjectsInputInfoType;
+import org.apache.maven.caching.xml.domain.Scm;
+import org.apache.maven.caching.xml.report.CacheReportType;
+import org.apache.maven.caching.xml.report.ProjectReportType;
import org.apache.maven.caching.hash.HashAlgorithm;
import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.domain.ArtifactType;
-import org.apache.maven.caching.domain.BuildDiffType;
-import org.apache.maven.caching.domain.CacheReportType;
-import org.apache.maven.caching.domain.CompletedExecutionType;
-import org.apache.maven.caching.domain.DigestItemType;
-import org.apache.maven.caching.domain.ProjectReportType;
-import org.apache.maven.caching.domain.ProjectsInputInfoType;
-import org.apache.maven.caching.domain.PropertyNameType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.CacheConfig;
import org.apache.maven.caching.xml.CacheSource;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/CacheDiff.java b/maven-core/src/main/java/org/apache/maven/caching/CacheDiff.java
index 5808e18..a37872b 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/CacheDiff.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/CacheDiff.java
@@ -22,13 +22,13 @@ package org.apache.maven.caching;
import com.google.common.base.Optional;
import com.google.common.collect.Sets;
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.domain.BuildDiffType;
-import org.apache.maven.caching.domain.BuildInfoType;
-import org.apache.maven.caching.domain.CompletedExecutionType;
-import org.apache.maven.caching.domain.DigestItemType;
-import org.apache.maven.caching.domain.MismatchType;
-import org.apache.maven.caching.domain.ProjectsInputInfoType;
-import org.apache.maven.caching.domain.PropertyValueType;
+import org.apache.maven.caching.xml.diff.BuildDiffType;
+import org.apache.maven.caching.xml.diff.MismatchType;
+import org.apache.maven.caching.xml.domain.BuildInfoType;
+import org.apache.maven.caching.xml.domain.CompletedExecutionType;
+import org.apache.maven.caching.xml.domain.DigestItemType;
+import org.apache.maven.caching.xml.domain.ProjectsInputInfoType;
+import org.apache.maven.caching.xml.domain.PropertyValueType;
import org.apache.maven.caching.xml.CacheConfig;
import java.util.ArrayList;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java b/maven-core/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
index 8229435..cff0375 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
@@ -19,7 +19,7 @@ package org.apache.maven.caching;
* under the License.
*/
-import org.apache.maven.caching.domain.DirScanConfigType;
+import org.apache.maven.caching.xml.config.DirScanConfigType;
import javax.annotation.Nonnull;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java b/maven-core/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java
index 6747532..09b5187 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java
@@ -33,10 +33,10 @@ import org.apache.http.entity.InputStreamEntity;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.caching.checksum.MavenProjectInput;
-import org.apache.maven.caching.domain.ArtifactType;
-import org.apache.maven.caching.domain.BuildInfoType;
-import org.apache.maven.caching.domain.CacheReportType;
-import org.apache.maven.caching.domain.ProjectReportType;
+import org.apache.maven.caching.xml.domain.ArtifactType;
+import org.apache.maven.caching.xml.domain.BuildInfoType;
+import org.apache.maven.caching.xml.report.CacheReportType;
+import org.apache.maven.caching.xml.report.ProjectReportType;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.CacheConfig;
import org.apache.maven.caching.xml.CacheSource;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/LocalArtifactsRepository.java b/maven-core/src/main/java/org/apache/maven/caching/LocalArtifactsRepository.java
index 280c2be..8e9cb93 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/LocalArtifactsRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/LocalArtifactsRepository.java
@@ -20,9 +20,9 @@ package org.apache.maven.caching;
*/
import com.google.common.base.Optional;
-import org.apache.maven.caching.domain.ArtifactType;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.CacheSource;
+import org.apache.maven.caching.xml.domain.ArtifactType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java b/maven-core/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java
index 78d1d1a..df7385f 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java
@@ -31,14 +31,14 @@ import com.google.common.collect.Ordering;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.caching.domain.ArtifactType;
-import org.apache.maven.caching.domain.BuildInfoType;
-import org.apache.maven.caching.domain.CacheReportType;
-import org.apache.maven.caching.domain.Scm;
import org.apache.maven.caching.xml.BuildInfo;
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.domain.ArtifactType;
+import org.apache.maven.caching.xml.domain.BuildInfoType;
+import org.apache.maven.caching.xml.domain.Scm;
+import org.apache.maven.caching.xml.report.CacheReportType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.LegacySupport;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/MojoExecutionManager.java b/maven-core/src/main/java/org/apache/maven/caching/MojoExecutionManager.java
index a6e1936..8d0daa8 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/MojoExecutionManager.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/MojoExecutionManager.java
@@ -20,11 +20,11 @@ package org.apache.maven.caching;
*/
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.domain.CompletedExecutionType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.CacheConfig;
import org.apache.maven.caching.xml.DtoUtils;
+import org.apache.maven.caching.xml.config.TrackedPropertyType;
+import org.apache.maven.caching.xml.domain.CompletedExecutionType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.MojoCheker;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfig.java b/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfig.java
index a3af7b6..08ea117 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfig.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfig.java
@@ -19,7 +19,7 @@ package org.apache.maven.caching;
* under the License.
*/
-import org.apache.maven.caching.domain.DirScanConfigType;
+import org.apache.maven.caching.xml.config.DirScanConfigType;
import javax.annotation.Nonnull;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java b/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
index 1c5ea65..c7031fa 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
@@ -20,9 +20,9 @@ package org.apache.maven.caching;
*/
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.caching.domain.DirScanConfigType;
-import org.apache.maven.caching.domain.TagNameType;
-import org.apache.maven.caching.domain.TagScanConfigType;
+import org.apache.maven.caching.xml.config.DirScanConfigType;
+import org.apache.maven.caching.xml.config.TagNameType;
+import org.apache.maven.caching.xml.config.TagScanConfigType;
import javax.annotation.Nonnull;
import java.util.List;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/ProjectUtils.java b/maven-core/src/main/java/org/apache/maven/caching/ProjectUtils.java
index dbf9251..c3ea864 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/ProjectUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/ProjectUtils.java
@@ -25,7 +25,7 @@ import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.caching.domain.Scm;
+import org.apache.maven.caching.xml.domain.Scm;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.ProjectIndex;
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/RemoteArtifactsRepository.java b/maven-core/src/main/java/org/apache/maven/caching/RemoteArtifactsRepository.java
index 826faf3..0112f79 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/RemoteArtifactsRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/RemoteArtifactsRepository.java
@@ -20,8 +20,8 @@ package org.apache.maven.caching;
*/
import com.google.common.base.Optional;
-import org.apache.maven.caching.domain.ArtifactType;
import org.apache.maven.caching.xml.BuildInfo;
+import org.apache.maven.caching.xml.domain.ArtifactType;
import org.apache.maven.project.MavenProject;
import java.io.IOException;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java b/maven-core/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
index 0a156e2..94fad20 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
@@ -22,7 +22,7 @@ package org.apache.maven.caching.checksum;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.caching.hash.HashChecksum;
-import org.apache.maven.caching.domain.DigestItemType;
+import org.apache.maven.caching.xml.domain.DigestItemType;
import org.mozilla.universalchardet.UniversalDetector;
import java.io.IOException;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java b/maven-core/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
index 90da23e..355670c 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
@@ -21,7 +21,7 @@ package org.apache.maven.caching.checksum;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.caching.domain.ArtifactType;
+import org.apache.maven.caching.xml.domain.ArtifactType;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java b/maven-core/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
index 56fbaed..1e5b56a 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
@@ -19,7 +19,6 @@ package org.apache.maven.caching.checksum;
* under the License.
*/
-
import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
import org.apache.commons.lang3.StringUtils;
@@ -33,16 +32,16 @@ import org.apache.maven.caching.PluginScanConfig;
import org.apache.maven.caching.ProjectUtils;
import org.apache.maven.caching.RemoteArtifactsRepository;
import org.apache.maven.caching.ScanConfigProperties;
-import org.apache.maven.caching.domain.Exclude;
+import org.apache.maven.caching.hash.HashFactory;
import org.apache.maven.caching.hash.HashAlgorithm;
import org.apache.maven.caching.hash.HashChecksum;
-import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.domain.DigestItemType;
-import org.apache.maven.caching.domain.Include;
-import org.apache.maven.caching.domain.ProjectsInputInfoType;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.CacheConfig;
import org.apache.maven.caching.xml.DtoUtils;
+import org.apache.maven.caching.xml.config.Exclude;
+import org.apache.maven.caching.xml.config.Include;
+import org.apache.maven.caching.xml.domain.DigestItemType;
+import org.apache.maven.caching.xml.domain.ProjectsInputInfoType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.ProjectIndex;
import org.apache.maven.model.Build;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/BuildInfo.java b/maven-core/src/main/java/org/apache/maven/caching/xml/BuildInfo.java
index 452811e..45cd1a7 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/BuildInfo.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/BuildInfo.java
@@ -24,11 +24,11 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.caching.ProjectUtils;
import org.apache.maven.caching.checksum.MavenProjectInput;
import org.apache.maven.caching.hash.HashAlgorithm;
-import org.apache.maven.caching.domain.ArtifactType;
-import org.apache.maven.caching.domain.BuildInfoType;
-import org.apache.maven.caching.domain.CompletedExecutionType;
-import org.apache.maven.caching.domain.DigestItemType;
-import org.apache.maven.caching.domain.ProjectsInputInfoType;
+import org.apache.maven.caching.xml.domain.ArtifactType;
+import org.apache.maven.caching.xml.domain.BuildInfoType;
+import org.apache.maven.caching.xml.domain.CompletedExecutionType;
+import org.apache.maven.caching.xml.domain.DigestItemType;
+import org.apache.maven.caching.xml.domain.ProjectsInputInfoType;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecution;
import org.codehaus.plexus.logging.Logger;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfig.java b/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
index a9dd950..7d90cc1 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
@@ -21,11 +21,11 @@ package org.apache.maven.caching.xml;
import org.apache.maven.caching.PluginScanConfig;
import org.apache.maven.caching.checksum.MultimoduleDiscoveryStrategy;
-import org.apache.maven.caching.domain.Exclude;
import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.domain.Include;
-import org.apache.maven.caching.domain.PropertyNameType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
+import org.apache.maven.caching.xml.config.Exclude;
+import org.apache.maven.caching.xml.config.Include;
+import org.apache.maven.caching.xml.config.PropertyNameType;
+import org.apache.maven.caching.xml.config.TrackedPropertyType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java b/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
index df8eb26..398ef51 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
@@ -26,26 +26,26 @@ import org.apache.maven.caching.DefaultPluginScanConfig;
import org.apache.maven.caching.PluginScanConfig;
import org.apache.maven.caching.PluginScanConfigImpl;
import org.apache.maven.caching.checksum.MultimoduleDiscoveryStrategy;
-import org.apache.maven.caching.domain.AttachedOutputs;
-import org.apache.maven.caching.domain.Exclude;
-import org.apache.maven.caching.domain.Include;
-import org.apache.maven.caching.domain.Local;
-import org.apache.maven.caching.domain.ProjectDiscoveryStrategy;
-import org.apache.maven.caching.domain.Remote;
import org.apache.maven.caching.hash.HashFactory;
-import org.apache.maven.caching.domain.CacheType;
-import org.apache.maven.caching.domain.ConfigurationType;
-import org.apache.maven.caching.domain.CoordinatesBaseType;
-import org.apache.maven.caching.domain.ExecutablesType;
-import org.apache.maven.caching.domain.ExecutionConfigurationScanType;
-import org.apache.maven.caching.domain.ExecutionControlType;
-import org.apache.maven.caching.domain.ExecutionIdsListType;
-import org.apache.maven.caching.domain.GoalReconciliationType;
-import org.apache.maven.caching.domain.GoalsListType;
-import org.apache.maven.caching.domain.PluginConfigurationScanType;
-import org.apache.maven.caching.domain.PluginSetType;
-import org.apache.maven.caching.domain.PropertyNameType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
+import org.apache.maven.caching.xml.config.AttachedOutputs;
+import org.apache.maven.caching.xml.config.Exclude;
+import org.apache.maven.caching.xml.config.Include;
+import org.apache.maven.caching.xml.config.Local;
+import org.apache.maven.caching.xml.config.ProjectDiscoveryStrategy;
+import org.apache.maven.caching.xml.config.Remote;
+import org.apache.maven.caching.xml.config.CacheType;
+import org.apache.maven.caching.xml.config.ConfigurationType;
+import org.apache.maven.caching.xml.config.CoordinatesBaseType;
+import org.apache.maven.caching.xml.config.ExecutablesType;
+import org.apache.maven.caching.xml.config.ExecutionConfigurationScanType;
+import org.apache.maven.caching.xml.config.ExecutionControlType;
+import org.apache.maven.caching.xml.config.ExecutionIdsListType;
+import org.apache.maven.caching.xml.config.GoalReconciliationType;
+import org.apache.maven.caching.xml.config.GoalsListType;
+import org.apache.maven.caching.xml.config.PluginConfigurationScanType;
+import org.apache.maven.caching.xml.config.PluginSetType;
+import org.apache.maven.caching.xml.config.PropertyNameType;
+import org.apache.maven.caching.xml.config.TrackedPropertyType;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/DtoUtils.java b/maven-core/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
index 7bd2d2b..7938d9b 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
@@ -23,11 +23,11 @@ import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.caching.ProjectUtils;
-import org.apache.maven.caching.domain.ArtifactType;
-import org.apache.maven.caching.domain.CompletedExecutionType;
-import org.apache.maven.caching.domain.DigestItemType;
-import org.apache.maven.caching.domain.PropertyValueType;
-import org.apache.maven.caching.domain.TrackedPropertyType;
+import org.apache.maven.caching.xml.config.TrackedPropertyType;
+import org.apache.maven.caching.xml.domain.ArtifactType;
+import org.apache.maven.caching.xml.domain.CompletedExecutionType;
+import org.apache.maven.caching.xml.domain.DigestItemType;
+import org.apache.maven.caching.xml.domain.PropertyValueType;
import org.apache.maven.model.Dependency;
import javax.annotation.Nonnull;
diff --git a/maven-core/src/main/java/org/apache/maven/caching/xml/XmlService.java b/maven-core/src/main/java/org/apache/maven/caching/xml/XmlService.java
index 6419c8f..5d62ecb 100644
--- a/maven-core/src/main/java/org/apache/maven/caching/xml/XmlService.java
+++ b/maven-core/src/main/java/org/apache/maven/caching/xml/XmlService.java
@@ -19,18 +19,18 @@ package org.apache.maven.caching.xml;
* under the License.
*/
-import org.apache.maven.caching.domain.CacheType;
-import org.apache.maven.caching.domain.io.xpp3.CacheConfigXpp3Reader;
-import org.apache.maven.caching.domain.io.xpp3.CacheConfigXpp3Writer;
-import org.apache.maven.caching.domain.io.xpp3.CacheDiffXpp3Reader;
-import org.apache.maven.caching.domain.io.xpp3.CacheDiffXpp3Writer;
-import org.apache.maven.caching.domain.io.xpp3.CacheDomainXpp3Reader;
-import org.apache.maven.caching.domain.BuildDiffType;
-import org.apache.maven.caching.domain.BuildInfoType;
-import org.apache.maven.caching.domain.CacheReportType;
-import org.apache.maven.caching.domain.io.xpp3.CacheDomainXpp3Writer;
-import org.apache.maven.caching.domain.io.xpp3.CacheReportXpp3Reader;
-import org.apache.maven.caching.domain.io.xpp3.CacheReportXpp3Writer;
+import org.apache.maven.caching.xml.config.CacheType;
+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.BuildDiffType;
+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.domain.BuildInfoType;
+import org.apache.maven.caching.xml.domain.io.xpp3.CacheDomainXpp3Reader;
+import org.apache.maven.caching.xml.domain.io.xpp3.CacheDomainXpp3Writer;
+import org.apache.maven.caching.xml.report.CacheReportType;
+import org.apache.maven.caching.xml.report.io.xpp3.CacheReportXpp3Reader;
+import org.apache.maven.caching.xml.report.io.xpp3.CacheReportXpp3Writer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
diff --git a/maven-core/src/main/mdo/cache-config.mdo b/maven-core/src/main/mdo/cache-config.mdo
index 99cbec0..a9e9f92 100644
--- a/maven-core/src/main/mdo/cache-config.mdo
+++ b/maven-core/src/main/mdo/cache-config.mdo
@@ -24,13 +24,13 @@ under the License.
xsd.namespace="org:apache:maven:cache:config">
<id>cache-config</id>
<name>CacheConfig</name>
- <description><![CDATA[
+ <description><![CDATA[Maven Incremental Build and Cache configuration, stored in <code>.mvn/maven-cache-config.xml</code>
]]></description>
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.domain</value>
+ <value>org.apache.maven.caching.xml.config</value>
</default>
</defaults>
diff --git a/maven-core/src/main/mdo/cache-diff.mdo b/maven-core/src/main/mdo/cache-diff.mdo
index d9c3d18..5265c54 100644
--- a/maven-core/src/main/mdo/cache-diff.mdo
+++ b/maven-core/src/main/mdo/cache-diff.mdo
@@ -27,7 +27,7 @@ under the License.
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.domain</value>
+ <value>org.apache.maven.caching.xml.diff</value>
</default>
</defaults>
<classes>
diff --git a/maven-core/src/main/mdo/cache-domain.mdo b/maven-core/src/main/mdo/cache-domain.mdo
index 44ccdd6..428f528 100644
--- a/maven-core/src/main/mdo/cache-domain.mdo
+++ b/maven-core/src/main/mdo/cache-domain.mdo
@@ -29,7 +29,7 @@ under the License.
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.domain</value>
+ <value>org.apache.maven.caching.xml.domain</value>
</default>
</defaults>
<classes>
diff --git a/maven-core/src/main/mdo/cache-report.mdo b/maven-core/src/main/mdo/cache-report.mdo
index 3e7b8f3..474683d 100644
--- a/maven-core/src/main/mdo/cache-report.mdo
+++ b/maven-core/src/main/mdo/cache-report.mdo
@@ -27,7 +27,7 @@ under the License.
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.caching.domain</value>
+ <value>org.apache.maven.caching.xml.report</value>
</default>
</defaults>
<classes>
diff --git a/maven-core/src/test/java/org/apache/maven/caching/BuildInfoTest.java b/maven-core/src/test/java/org/apache/maven/caching/BuildInfoTest.java
index 19c1de4..aa6708b 100644
--- a/maven-core/src/test/java/org/apache/maven/caching/BuildInfoTest.java
+++ b/maven-core/src/test/java/org/apache/maven/caching/BuildInfoTest.java
@@ -19,18 +19,17 @@ package org.apache.maven.caching;
* under the License.
*/
-
import com.google.common.collect.Lists;
import org.apache.maven.artifact.Artifact;
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.domain.ArtifactType;
-import org.apache.maven.caching.domain.BuildInfoType;
-import org.apache.maven.caching.domain.CompletedExecutionType;
-import org.apache.maven.caching.domain.DigestItemType;
-import org.apache.maven.caching.domain.ProjectsInputInfoType;
-import org.apache.maven.caching.domain.PropertyValueType;
+import org.apache.maven.caching.xml.domain.ArtifactType;
+import org.apache.maven.caching.xml.domain.BuildInfoType;
+import org.apache.maven.caching.xml.domain.CompletedExecutionType;
+import org.apache.maven.caching.xml.domain.DigestItemType;
+import org.apache.maven.caching.xml.domain.ProjectsInputInfoType;
+import org.apache.maven.caching.xml.domain.PropertyValueType;
import org.apache.maven.caching.xml.BuildInfo;
import org.apache.maven.caching.xml.XmlService;
import org.junit.Test;
diff --git a/maven-core/src/test/java/org/apache/maven/caching/xml/CacheConfigTest.java b/maven-core/src/test/java/org/apache/maven/caching/xml/CacheConfigTest.java
index c589181..8b81a78 100644
--- a/maven-core/src/test/java/org/apache/maven/caching/xml/CacheConfigTest.java
+++ b/maven-core/src/test/java/org/apache/maven/caching/xml/CacheConfigTest.java
@@ -19,12 +19,10 @@ package org.apache.maven.caching.xml;
* under the License.
*/
-import org.apache.maven.caching.domain.CacheType;
+import org.apache.maven.caching.xml.config.CacheType;
import org.junit.Test;
import java.io.InputStream;
-import java.nio.file.Path;
-import java.nio.file.Paths;
public class CacheConfigTest {