You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/10/26 18:59:24 UTC
[maven] 02/03: improve documentation, make tags name similar
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d3cfafd5e91e68a000292cdca08b32b020a9a7b9
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Oct 24 14:33:56 2020 +0200
improve documentation, make tags name similar
---
.../org/apache/maven/model/building/DefaultModelBuilder.java | 5 +++--
.../java/org/apache/maven/model/building/ModelCacheTag.java | 10 +++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 6d4708f..6ee7f40 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -693,7 +693,7 @@ public class DefaultModelBuilder
throw problems.newModelBuildingException();
}
- intoCache( request.getModelCache(), modelSource, ModelCacheTag.FILEMODEL, model );
+ intoCache( request.getModelCache(), modelSource, ModelCacheTag.FILE, model );
if ( modelSource instanceof FileModelSource )
{
intoCache( request.getModelCache(), getGroupId( model ), model.getArtifactId(), modelSource );
@@ -788,7 +788,7 @@ public class DefaultModelBuilder
}
else
{
- model = fromCache( cache, modelSource, ModelCacheTag.FILEMODEL );
+ model = fromCache( cache, modelSource, ModelCacheTag.FILE );
}
return model;
}
@@ -1893,6 +1893,7 @@ public class DefaultModelBuilder
};
}
+ @Override
public TransformerContext build()
{
return context;
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
index f38bb62..cf9b412 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
@@ -65,7 +65,7 @@ interface ModelCacheTag<T>
T fromCache( T data );
/**
- * The tag used to denote raw model data.
+ * The tag used for the raw model with profile activation
*/
ModelCacheTag<ModelData> RAW = new ModelCacheTag<ModelData>()
{
@@ -129,12 +129,16 @@ interface ModelCacheTag<T>
};
- ModelCacheTag<Model> FILEMODEL = new ModelCacheTag<Model>()
+ /**
+ * The tag used for the file model with profile activation
+ * @since 3.7.0
+ */
+ ModelCacheTag<Model> FILE = new ModelCacheTag<Model>()
{
@Override
public String getName()
{
- return "file-model";
+ return "file";
}
@Override