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
The following commit(s) were added to refs/heads/MNG-7664 by this push:
new e11977499 use velocityBasedir
e11977499 is described below
commit e11977499251f44859b9402c18167ce6fb2d0a7d
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Wed Jan 18 08:19:56 2023 +0100
use velocityBasedir
---
api/maven-api-model/pom.xml | 5 ++---
{src => api/maven-api-model/src}/main/mdo/maven.mdo | 0
api/maven-api-settings/pom.xml | 5 ++---
.../maven-api-settings/src}/main/mdo/settings.mdo | 0
api/maven-api-toolchain/pom.xml | 5 ++---
.../maven-api-toolchain/src}/main/mdo/toolchains.mdo | 0
maven-model/pom.xml | 18 +++++++++---------
maven-plugin-api/pom.xml | 10 ++++------
{src => maven-plugin-api/src}/main/mdo/lifecycle.mdo | 0
maven-settings/pom.xml | 12 ++++++------
maven-toolchain-model/pom.xml | 12 ++++++------
src/{main/mdo/generators => mdo}/common.vm | 0
src/{main/mdo/generators => mdo}/merger.vm | 2 +-
src/{main/mdo/generators => mdo}/model-v3-modified.vm | 2 +-
src/{main/mdo/generators => mdo}/model-v3.vm | 2 +-
src/{main/mdo/generators => mdo}/model.vm | 2 +-
src/{main/mdo/generators => mdo}/reader-ex.vm | 2 +-
src/{main/mdo/generators => mdo}/reader-modified.vm | 2 +-
src/{main/mdo/generators => mdo}/reader.vm | 2 +-
src/{main/mdo/generators => mdo}/transformer.vm | 2 +-
src/{main/mdo/generators => mdo}/writer-ex.vm | 2 +-
src/{main/mdo/generators => mdo}/writer.vm | 2 +-
22 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml
index b8ed19d38..042569852 100644
--- a/api/maven-api-model/pom.xml
+++ b/api/maven-api-model/pom.xml
@@ -52,13 +52,12 @@ under the License.
</goals>
<configuration>
<version>4.2.0</version>
- <!-- use shared root containing models and Velocity templates -->
- <basedir>${basedir}/../..</basedir>
+
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
<models>
<model>src/main/mdo/maven.mdo</model>
</models>
<templates>
- <template>src/main/mdo/generators/model.vm</template>
+ <template>model.vm</template>
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.model</param>
diff --git a/src/main/mdo/maven.mdo b/api/maven-api-model/src/main/mdo/maven.mdo
similarity index 100%
rename from src/main/mdo/maven.mdo
rename to api/maven-api-model/src/main/mdo/maven.mdo
diff --git a/api/maven-api-settings/pom.xml b/api/maven-api-settings/pom.xml
index ad492d3ed..279225a47 100644
--- a/api/maven-api-settings/pom.xml
+++ b/api/maven-api-settings/pom.xml
@@ -52,13 +52,12 @@ under the License.
</goals>
<configuration>
<version>2.0.0</version>
- <!-- use shared root containing models and Velocity templates -->
- <basedir>${basedir}/../..</basedir>
+
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
<models>
<model>src/main/mdo/settings.mdo</model>
</models>
<templates>
- <template>src/main/mdo/generators/model.vm</template>
+ <template>model.vm</template>
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.settings</param>
diff --git a/src/main/mdo/settings.mdo
b/api/maven-api-settings/src/main/mdo/settings.mdo
similarity index 100%
rename from src/main/mdo/settings.mdo
rename to api/maven-api-settings/src/main/mdo/settings.mdo
diff --git a/api/maven-api-toolchain/pom.xml b/api/maven-api-toolchain/pom.xml
index e37c664f8..f3e74c32e 100644
--- a/api/maven-api-toolchain/pom.xml
+++ b/api/maven-api-toolchain/pom.xml
@@ -51,13 +51,12 @@ under the License.
</goals>
<configuration>
<version>1.1.0</version>
- <!-- use shared root containing models and Velocity templates -->
- <basedir>${basedir}/../..</basedir>
+
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
<models>
<model>src/main/mdo/toolchains.mdo</model>
</models>
<templates>
- <template>src/main/mdo/generators/model.vm</template>
+ <template>model.vm</template>
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.toolchain</param>
diff --git a/src/main/mdo/toolchains.mdo
b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo
similarity index 100%
rename from src/main/mdo/toolchains.mdo
rename to api/maven-api-toolchain/src/main/mdo/toolchains.mdo
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 213c66002..56f03db5f 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -50,8 +50,8 @@ under the License.
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <!-- use shared root containing models and Velocity templates -->
- <basedir>${basedir}/..</basedir>
+ <basedir>${project.basedir}/../api/maven-api-model</basedir>
+ <velocityBasedir>${project.basedir}/../src/mdo</velocityBasedir>
<version>4.0.0</version>
<models>
<model>src/main/mdo/maven.mdo</model>
@@ -81,7 +81,7 @@ under the License.
<configuration>
<version>4.1.0</version>
<templates>
-
<template>src/main/mdo/generators/model-v3-modified.vm</template>
+ <template>model-v3-modified.vm</template>
</templates>
</configuration>
</execution>
@@ -94,12 +94,12 @@ under the License.
<configuration>
<version>4.2.0</version>
<templates>
- <template>src/main/mdo/generators/merger.vm</template>
- <template>src/main/mdo/generators/transformer.vm</template>
- <template>src/main/mdo/generators/reader-modified.vm</template>
- <template>src/main/mdo/generators/reader-ex.vm</template>
- <template>src/main/mdo/generators/writer.vm</template>
- <template>src/main/mdo/generators/writer-ex.vm</template>
+ <template>merger.vm</template>
+ <template>transformer.vm</template>
+ <template>reader-modified.vm</template>
+ <template>reader-ex.vm</template>
+ <template>writer.vm</template>
+ <template>writer-ex.vm</template>
</templates>
</configuration>
</execution>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index f5f52f3a0..420df66d1 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -60,8 +60,7 @@ under the License.
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <!-- use shared root containing models and Velocity templates -->
- <basedir>${basedir}/..</basedir>
+ <velocityBasedir>${project.basedir}/../src/mdo</velocityBasedir>
<models>
<model>src/main/mdo/lifecycle.mdo</model>
</models>
@@ -76,9 +75,9 @@ under the License.
<phase>generate-sources</phase>
<configuration>
<templates>
- <template>src/main/mdo/generators/model.vm</template>
- <template>src/main/mdo/generators/reader.vm</template>
- <template>src/main/mdo/generators/writer.vm</template>
+ <template>model.vm</template>
+ <template>reader.vm</template>
+ <template>writer.vm</template>
</templates>
<params>
<param>packageModelV3=org.apache.maven.plugin.lifecycle</param>
@@ -94,7 +93,6 @@ under the License.
</goals>
<phase>pre-site</phase>
<configuration>
- <basedir>${basedir}</basedir>
<models>
<model>src/main/mdo/plugin.mdo</model>
</models>
diff --git a/src/main/mdo/lifecycle.mdo
b/maven-plugin-api/src/main/mdo/lifecycle.mdo
similarity index 100%
rename from src/main/mdo/lifecycle.mdo
rename to maven-plugin-api/src/main/mdo/lifecycle.mdo
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 523528a9d..be088709b 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -55,8 +55,8 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>2.0.0</version>
- <!-- use shared root containing models and Velocity templates -->
- <basedir>${basedir}/..</basedir>
+ <basedir>${project.basedir}/../api/maven-api-settings</basedir>
+ <velocityBasedir>${project.basedir}/../src/mdo</velocityBasedir>
<models>
<model>src/main/mdo/settings.mdo</model>
</models>
@@ -70,10 +70,10 @@ under the License.
<phase>generate-sources</phase>
<configuration>
<templates>
- <template>src/main/mdo/generators/model-v3.vm</template>
- <template>src/main/mdo/generators/merger.vm</template>
- <template>src/main/mdo/generators/reader.vm</template>
- <template>src/main/mdo/generators/writer.vm</template>
+ <template>model-v3.vm</template>
+ <template>merger.vm</template>
+ <template>reader.vm</template>
+ <template>writer.vm</template>
</templates>
<params>
<param>packageModelV3=org.apache.maven.settings</param>
diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml
index 81ba51e4f..ce241dbac 100644
--- a/maven-toolchain-model/pom.xml
+++ b/maven-toolchain-model/pom.xml
@@ -54,8 +54,8 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>1.1.0</version>
- <!-- use shared root containing models and Velocity templates -->
- <basedir>${basedir}/..</basedir>
+ <basedir>${project.basedir}/../api/maven-api-toolchain</basedir>
+ <velocityBasedir>${project.basedir}/../src/mdo</velocityBasedir>
<models>
<model>src/main/mdo/toolchains.mdo</model>
</models>
@@ -69,10 +69,10 @@ under the License.
<phase>generate-sources</phase>
<configuration>
<templates>
- <template>src/main/mdo/generators/model-v3.vm</template>
- <template>src/main/mdo/generators/merger.vm</template>
- <template>src/main/mdo/generators/reader.vm</template>
- <template>src/main/mdo/generators/writer.vm</template>
+ <template>model-v3.vm</template>
+ <template>merger.vm</template>
+ <template>reader.vm</template>
+ <template>writer.vm</template>
</templates>
<params>
<param>packageModelV3=org.apache.maven.toolchain.model</param>
diff --git a/src/main/mdo/generators/common.vm b/src/mdo/common.vm
similarity index 100%
rename from src/main/mdo/generators/common.vm
rename to src/mdo/common.vm
diff --git a/src/main/mdo/generators/merger.vm b/src/mdo/merger.vm
similarity index 99%
rename from src/main/mdo/generators/merger.vm
rename to src/mdo/merger.vm
index 6e8189905..f055657e2 100644
--- a/src/main/mdo/generators/merger.vm
+++ b/src/mdo/merger.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageToolV4}" )
#set ( $className = "${model.name}Merger" )
diff --git a/src/main/mdo/generators/model-v3-modified.vm
b/src/mdo/model-v3-modified.vm
similarity index 99%
rename from src/main/mdo/generators/model-v3-modified.vm
rename to src/mdo/model-v3-modified.vm
index 98aa69716..ac24c0e8d 100644
--- a/src/main/mdo/generators/model-v3-modified.vm
+++ b/src/mdo/model-v3-modified.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageModelV3}" )
#
diff --git a/src/main/mdo/generators/model-v3.vm b/src/mdo/model-v3.vm
similarity index 99%
rename from src/main/mdo/generators/model-v3.vm
rename to src/mdo/model-v3.vm
index 8a640df7d..0c68c97c1 100644
--- a/src/main/mdo/generators/model-v3.vm
+++ b/src/mdo/model-v3.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageModelV3}" )
#
diff --git a/src/main/mdo/generators/model.vm b/src/mdo/model.vm
similarity index 99%
rename from src/main/mdo/generators/model.vm
rename to src/mdo/model.vm
index 56405279c..af818ccd7 100644
--- a/src/main/mdo/generators/model.vm
+++ b/src/mdo/model.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageModelV4}" )
#set ( $root = $model.getClass( $model.getRoot($version), $version ) )
diff --git a/src/main/mdo/generators/reader-ex.vm b/src/mdo/reader-ex.vm
similarity index 99%
rename from src/main/mdo/generators/reader-ex.vm
rename to src/mdo/reader-ex.vm
index ba5bfac13..0ea2809ee 100644
--- a/src/main/mdo/generators/reader-ex.vm
+++ b/src/mdo/reader-ex.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageToolV4}" )
#set ( $className = "${model.name}Xpp3ReaderEx" )
diff --git a/src/main/mdo/generators/reader-modified.vm
b/src/mdo/reader-modified.vm
similarity index 99%
rename from src/main/mdo/generators/reader-modified.vm
rename to src/mdo/reader-modified.vm
index 230100b63..852af6726 100644
--- a/src/main/mdo/generators/reader-modified.vm
+++ b/src/mdo/reader-modified.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageToolV4}" )
#set ( $className = "${model.name}Xpp3Reader" )
diff --git a/src/main/mdo/generators/reader.vm b/src/mdo/reader.vm
similarity index 99%
rename from src/main/mdo/generators/reader.vm
rename to src/mdo/reader.vm
index 191395499..bfff0ac4e 100644
--- a/src/main/mdo/generators/reader.vm
+++ b/src/mdo/reader.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageToolV4}" )
#set ( $className = "${model.name}Xpp3Reader" )
diff --git a/src/main/mdo/generators/transformer.vm b/src/mdo/transformer.vm
similarity index 99%
rename from src/main/mdo/generators/transformer.vm
rename to src/mdo/transformer.vm
index caaffe046..f7fb15d2f 100644
--- a/src/main/mdo/generators/transformer.vm
+++ b/src/mdo/transformer.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageToolV4}" )
#set ( $className = "${model.name}Transformer" )
diff --git a/src/main/mdo/generators/writer-ex.vm b/src/mdo/writer-ex.vm
similarity index 99%
rename from src/main/mdo/generators/writer-ex.vm
rename to src/mdo/writer-ex.vm
index 8aa49dac3..5796bffc7 100644
--- a/src/main/mdo/generators/writer-ex.vm
+++ b/src/mdo/writer-ex.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageToolV4}" )
#set ( $className = "${model.name}Xpp3WriterEx" )
diff --git a/src/main/mdo/generators/writer.vm b/src/mdo/writer.vm
similarity index 99%
rename from src/main/mdo/generators/writer.vm
rename to src/mdo/writer.vm
index fba01479f..538d3f5bd 100644
--- a/src/main/mdo/generators/writer.vm
+++ b/src/mdo/writer.vm
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*#
-#parse ( "src/main/mdo/generators/common.vm" )
+#parse ( "common.vm" )
#
#set ( $package = "${packageToolV4}" )
#set ( $className = "${model.name}Xpp3Writer" )
