Skip to content

[MNG-7652] switch to Modello Velocity #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hboutemy merged 2 commits into from
Jan 3, 2023
Merged

[MNG-7652] switch to Modello Velocity #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04571c6
[MNG-7652] swtich to Modello Velocity
hboutemy Dec 31, 2022
971c0b7
fix little inconsistencies
hboutemy Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions api/maven-api-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,26 @@ under the License.
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven</groupId>
<artifactId>modello-plugin-velocity</artifactId>
<configuration>
<version>4.2.0</version>
<models>
<model>src/main/mdo/maven.mdo</model>
</models>
<templates>
<template>src/main/mdo/model.vm</template>
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.model</param>
</params>
</configuration>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<executions>
<execution>
<id>modello</id>
<id>velocity</id>
<goals>
<goal>velocity</goal>
</goals>
<configuration>
<version>4.2.0</version>
<models>
<model>src/main/mdo/maven.mdo</model>
</models>
<templates>
<template>src/main/mdo/model.vm</template>
</templates>
Comment thread
michael-o marked this conversation as resolved.
<params>
<param>packageModelV4=org.apache.maven.api.model</param>
</params>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions api/maven-api-model/src/main/mdo/model.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#set ( $dummy = $allFields.addAll( $cl.getFields($version) ) )
#end
#set ( $className = "${class.name}" )
#MODELLO-VELOCITY#REDIRECT ${package.replace('.','/')}/${className}.java
#MODELLO-VELOCITY#SAVE-OUTPUT-TO ${package.replace('.','/')}/${className}.java
#if ( $class.name != "InputLocation" && $class.name != "InputSource" )
#set ( $types = { } )
#set ( $imports = $class.getClass().forName("java.util.TreeSet").newInstance() )
Expand Down Expand Up @@ -85,7 +85,7 @@
#end
#end
// =================== DO NOT EDIT THIS FILE ====================
// Generated by Maven, any modifications will be overwritten.
// ${generatedBy}
Comment thread
gnodet marked this conversation as resolved.
// ==============================================================
package ${package};

Expand Down
30 changes: 15 additions & 15 deletions api/maven-api-settings/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,26 @@ under the License.
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven</groupId>
<artifactId>modello-plugin-velocity</artifactId>
<configuration>
<version>2.0.0</version>
<models>
<model>src/main/mdo/settings.mdo</model>
</models>
<templates>
<template>src/main/mdo/model.vm</template>
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.settings</param>
</params>
</configuration>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<executions>
<execution>
<id>modello</id>
<id>velocity</id>
<goals>
<goal>velocity</goal>
</goals>
<configuration>
<version>2.0.0</version>
<models>
<model>src/main/mdo/settings.mdo</model>
</models>
<templates>
<template>src/main/mdo/model.vm</template>
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.settings</param>
</params>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions api/maven-api-settings/src/main/mdo/model.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#set ( $dummy = $allFields.addAll( $cl.getFields($version) ) )
#end
#set ( $className = "${class.name}" )
#MODELLO-VELOCITY#REDIRECT ${package.replace('.','/')}/${className}.java
#MODELLO-VELOCITY#SAVE-OUTPUT-TO ${package.replace('.','/')}/${className}.java
#if ( $class.name != "InputLocation" && $class.name != "InputSource" )
#set ( $types = { } )
#set ( $imports = $class.getClass().forName("java.util.TreeSet").newInstance() )
Expand Down Expand Up @@ -85,7 +85,7 @@
#end
#end
// =================== DO NOT EDIT THIS FILE ====================
// Generated by Maven, any modifications will be overwritten.
// ${generatedBy}
// ==============================================================
package ${package};

Expand Down
30 changes: 15 additions & 15 deletions api/maven-api-toolchain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,26 +62,26 @@ under the License.
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven</groupId>
<artifactId>modello-plugin-velocity</artifactId>
<configuration>
<version>1.1.0</version>
<models>
<model>src/main/mdo/toolchains.mdo</model>
</models>
<templates>
<template>src/main/mdo/model.vm</template>
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.toolchain</param>
</params>
</configuration>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<executions>
<execution>
<id>modello</id>
<id>velocity</id>
<goals>
<goal>velocity</goal>
</goals>
<configuration>
<version>1.1.0</version>
<models>
<model>src/main/mdo/toolchains.mdo</model>
</models>
<templates>
<template>src/main/mdo/model.vm</template>
</templates>
<params>
<param>packageModelV4=org.apache.maven.api.toolchain</param>
</params>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions api/maven-api-toolchain/src/main/mdo/model.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#set ( $dummy = $allFields.addAll( $cl.getFields($version) ) )
#end
#set ( $className = "${class.name}" )
#MODELLO-VELOCITY#REDIRECT ${package.replace('.','/')}/${className}.java
#MODELLO-VELOCITY#SAVE-OUTPUT-TO ${package.replace('.','/')}/${className}.java
#if ( $class.name != "InputLocation" && $class.name != "InputSource" )
#set ( $types = { } )
#set ( $imports = $class.getClass().forName("java.util.TreeSet").newInstance() )
Expand Down Expand Up @@ -85,7 +85,7 @@
#end
#end
// =================== DO NOT EDIT THIS FILE ====================
// Generated by Maven, any modifications will be overwritten.
// ${generatedBy}
// ==============================================================
package ${package};

Expand Down
92 changes: 0 additions & 92 deletions api/modello-plugin-velocity/pom.xml
View file
Open in desktop

This file was deleted.

Loading