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 2023/01/15 10:22:27 UTC
[maven] branch MNG-7664 updated (ed6910004 -> e7c3b358e)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-7664
in repository https://gitbox.apache.org/repos/asf/maven.git
omit ed6910004 [MNG-7664] add parameter for unique common.vm
omit 38fc24b79 [MNG-7664] remove unintended differences
add c0d942b56 Jenkinsfile: pickup results from ITs and Maven 3.8.x for build (#953)
new c4da100aa [MNG-7664] remove unintended differences
new e7c3b358e [MNG-7664] add parameter for unique common.vm
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 (ed6910004)
\
N -- N -- N refs/heads/MNG-7664 (e7c3b358e)
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 2 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:
Jenkinsfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
[maven] 02/02: [MNG-7664] add parameter for unique common.vm
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7664
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e7c3b358ed0922e8b52ed6524bd4cd1892630171
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Wed Jan 11 00:57:15 2023 +0100
[MNG-7664] add parameter for unique common.vm
---
api/maven-api-model/pom.xml | 1 +
api/maven-api-model/src/main/mdo/common.vm | 2 ++
api/maven-api-settings/src/main/mdo/common.vm | 16 ++++++++++++++--
api/maven-api-toolchain/src/main/mdo/common.vm | 16 ++++++++++++++--
maven-model/pom.xml | 1 +
maven-model/src/main/mdo/common.vm | 2 ++
maven-plugin-api/src/main/mdo/common.vm | 16 ++++++++++++++--
maven-settings/src/main/mdo/common.vm | 16 ++++++++++++++--
maven-toolchain-model/src/main/mdo/common.vm | 16 ++++++++++++++--
9 files changed, 76 insertions(+), 10 deletions(-)
diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml
index 87d80b4cb..1c896a208 100644
--- a/api/maven-api-model/pom.xml
+++ b/api/maven-api-model/pom.xml
@@ -81,6 +81,7 @@ under the License.
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.model</param>
+ <param>isMavenModel=true</param>
</params>
</configuration>
</execution>
diff --git a/api/maven-api-model/src/main/mdo/common.vm b/api/maven-api-model/src/main/mdo/common.vm
index e300b2289..b8ae20968 100644
--- a/api/maven-api-model/src/main/mdo/common.vm
+++ b/api/maven-api-model/src/main/mdo/common.vm
@@ -17,6 +17,7 @@
under the License.
*#
#
+#if ( "${isMavenModel}" == "true" )
##
## The following loop code is required in order to change the type of the
## pomFile attribute to a java.nio.file.Path. Modello does not support this
@@ -28,4 +29,5 @@
#end
#end
#set ( $locationTracking = true )
+#end
#
\ No newline at end of file
diff --git a/api/maven-api-settings/src/main/mdo/common.vm b/api/maven-api-settings/src/main/mdo/common.vm
index aa3d17a03..b8ae20968 100644
--- a/api/maven-api-settings/src/main/mdo/common.vm
+++ b/api/maven-api-settings/src/main/mdo/common.vm
@@ -16,6 +16,18 @@
specific language governing permissions and limitations
under the License.
*#
+#
+#if ( "${isMavenModel}" == "true" )
##
-## Nothing special to do here
-##
\ No newline at end of file
+## The following loop code is required in order to change the type of the
+## pomFile attribute to a java.nio.file.Path. Modello does not support this
+## type and loading a model with such a type would fail the Modello validation.
+##
+#foreach ( $field in $model.getClass("Model", $version).allFields )
+ #if ( $field.name == "pomFile" )
+ #set ( $dummy = $field.setType("java.nio.file.Path") )
+ #end
+#end
+#set ( $locationTracking = true )
+#end
+#
\ No newline at end of file
diff --git a/api/maven-api-toolchain/src/main/mdo/common.vm b/api/maven-api-toolchain/src/main/mdo/common.vm
index aa3d17a03..b8ae20968 100644
--- a/api/maven-api-toolchain/src/main/mdo/common.vm
+++ b/api/maven-api-toolchain/src/main/mdo/common.vm
@@ -16,6 +16,18 @@
specific language governing permissions and limitations
under the License.
*#
+#
+#if ( "${isMavenModel}" == "true" )
##
-## Nothing special to do here
-##
\ No newline at end of file
+## The following loop code is required in order to change the type of the
+## pomFile attribute to a java.nio.file.Path. Modello does not support this
+## type and loading a model with such a type would fail the Modello validation.
+##
+#foreach ( $field in $model.getClass("Model", $version).allFields )
+ #if ( $field.name == "pomFile" )
+ #set ( $dummy = $field.setType("java.nio.file.Path") )
+ #end
+#end
+#set ( $locationTracking = true )
+#end
+#
\ No newline at end of file
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 8fbd8317b..a566f2133 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -83,6 +83,7 @@ under the License.
<param>packageModelV3=org.apache.maven.model</param>
<param>packageModelV4=org.apache.maven.api.model</param>
<param>packageToolV4=org.apache.maven.model.v4</param>
+ <param>isMavenModel=true</param>
</params>
</configuration>
<executions>
diff --git a/maven-model/src/main/mdo/common.vm b/maven-model/src/main/mdo/common.vm
index e300b2289..b8ae20968 100644
--- a/maven-model/src/main/mdo/common.vm
+++ b/maven-model/src/main/mdo/common.vm
@@ -17,6 +17,7 @@
under the License.
*#
#
+#if ( "${isMavenModel}" == "true" )
##
## The following loop code is required in order to change the type of the
## pomFile attribute to a java.nio.file.Path. Modello does not support this
@@ -28,4 +29,5 @@
#end
#end
#set ( $locationTracking = true )
+#end
#
\ No newline at end of file
diff --git a/maven-plugin-api/src/main/mdo/common.vm b/maven-plugin-api/src/main/mdo/common.vm
index aa3d17a03..b8ae20968 100644
--- a/maven-plugin-api/src/main/mdo/common.vm
+++ b/maven-plugin-api/src/main/mdo/common.vm
@@ -16,6 +16,18 @@
specific language governing permissions and limitations
under the License.
*#
+#
+#if ( "${isMavenModel}" == "true" )
##
-## Nothing special to do here
-##
\ No newline at end of file
+## The following loop code is required in order to change the type of the
+## pomFile attribute to a java.nio.file.Path. Modello does not support this
+## type and loading a model with such a type would fail the Modello validation.
+##
+#foreach ( $field in $model.getClass("Model", $version).allFields )
+ #if ( $field.name == "pomFile" )
+ #set ( $dummy = $field.setType("java.nio.file.Path") )
+ #end
+#end
+#set ( $locationTracking = true )
+#end
+#
\ No newline at end of file
diff --git a/maven-settings/src/main/mdo/common.vm b/maven-settings/src/main/mdo/common.vm
index aa3d17a03..b8ae20968 100644
--- a/maven-settings/src/main/mdo/common.vm
+++ b/maven-settings/src/main/mdo/common.vm
@@ -16,6 +16,18 @@
specific language governing permissions and limitations
under the License.
*#
+#
+#if ( "${isMavenModel}" == "true" )
##
-## Nothing special to do here
-##
\ No newline at end of file
+## The following loop code is required in order to change the type of the
+## pomFile attribute to a java.nio.file.Path. Modello does not support this
+## type and loading a model with such a type would fail the Modello validation.
+##
+#foreach ( $field in $model.getClass("Model", $version).allFields )
+ #if ( $field.name == "pomFile" )
+ #set ( $dummy = $field.setType("java.nio.file.Path") )
+ #end
+#end
+#set ( $locationTracking = true )
+#end
+#
\ No newline at end of file
diff --git a/maven-toolchain-model/src/main/mdo/common.vm b/maven-toolchain-model/src/main/mdo/common.vm
index aa3d17a03..b8ae20968 100644
--- a/maven-toolchain-model/src/main/mdo/common.vm
+++ b/maven-toolchain-model/src/main/mdo/common.vm
@@ -16,6 +16,18 @@
specific language governing permissions and limitations
under the License.
*#
+#
+#if ( "${isMavenModel}" == "true" )
##
-## Nothing special to do here
-##
\ No newline at end of file
+## The following loop code is required in order to change the type of the
+## pomFile attribute to a java.nio.file.Path. Modello does not support this
+## type and loading a model with such a type would fail the Modello validation.
+##
+#foreach ( $field in $model.getClass("Model", $version).allFields )
+ #if ( $field.name == "pomFile" )
+ #set ( $dummy = $field.setType("java.nio.file.Path") )
+ #end
+#end
+#set ( $locationTracking = true )
+#end
+#
\ No newline at end of file
[maven] 01/02: [MNG-7664] remove unintended differences
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7664
in repository https://gitbox.apache.org/repos/asf/maven.git
commit c4da100aae7be375e28e0463e62121146b5c4b68
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon Jan 9 23:35:37 2023 +0100
[MNG-7664] remove unintended differences
---
maven-model/src/main/mdo/common.vm | 2 +-
maven-model/src/main/mdo/merger.vm | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/maven-model/src/main/mdo/common.vm b/maven-model/src/main/mdo/common.vm
index 3c3f29cf7..e300b2289 100644
--- a/maven-model/src/main/mdo/common.vm
+++ b/maven-model/src/main/mdo/common.vm
@@ -20,7 +20,7 @@
##
## The following loop code is required in order to change the type of the
## pomFile attribute to a java.nio.file.Path. Modello does not support this
-## type and loading a model with such a type would fail the modello validation.
+## type and loading a model with such a type would fail the Modello validation.
##
#foreach ( $field in $model.getClass("Model", $version).allFields )
#if ( $field.name == "pomFile" )
diff --git a/maven-model/src/main/mdo/merger.vm b/maven-model/src/main/mdo/merger.vm
index 2cf9da482..57d4fab0c 100644
--- a/maven-model/src/main/mdo/merger.vm
+++ b/maven-model/src/main/mdo/merger.vm
@@ -38,7 +38,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Objects;
import java.util.function.BinaryOperator;
import java.util.function.Function;