diff options
| author | Claude Brisson <cbrisson@apache.org> | 2019-11-02 22:04:06 +0000 |
|---|---|---|
| committer | Claude Brisson <cbrisson@apache.org> | 2019-11-02 22:04:06 +0000 |
| commit | be3465c9d382be4e61acaacea47e210b676b1ec0 (patch) | |
| tree | 7c5aeb4ff58d687401d145a01c1d7c3ad17f17b7 | |
| parent | 8ae9495f039b9141da01330d0c38fec054da07d1 (diff) | |
| download | apache-velocity-engine-be3465c9d382be4e61acaacea47e210b676b1ec0.tar.gz | |
[core] Easier maven solution for VelocityEngineVersion source file templating
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1869304 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | velocity-engine-core/pom.xml | 49 | ||||
| -rw-r--r-- | velocity-engine-core/src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java (renamed from velocity-engine-core/src/main/resources/org/apache/velocity/runtime/VelocityEngineVersion.java) | 0 |
2 files changed, 7 insertions, 42 deletions
diff --git a/velocity-engine-core/pom.xml b/velocity-engine-core/pom.xml index 592d1a4b..4c634816 100644 --- a/velocity-engine-core/pom.xml +++ b/velocity-engine-core/pom.xml @@ -66,26 +66,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <executions> - <!-- put engine version in class org.apache.velocity.runtime.VelocityEngineVersion --> - <execution> - <id>filter-engine-version</id> - <phase>process-sources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.java</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - <outputDirectory>${project.build.directory}/generated-sources/version</outputDirectory> - </configuration> - </execution> <!-- prepare parser grammar file --> <execution> <id>generate-parser-grammar</id> @@ -219,26 +199,20 @@ </executions> </plugin> - <!-- add VelocityEngineVersion source root --> + <!-- handle VelocityEngineVersion file --> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.0.0</version> + <artifactId>templating-maven-plugin</artifactId> + <version>1.0.0</version> <executions> <execution> - <id>add-source</id> - <phase>generate-sources</phase> + <id>filter-src</id> <goals> - <goal>add-source</goal> + <goal>filter-sources</goal> </goals> - <configuration> - <sources> - <source>${project.build.directory}/generated-sources/version</source> - </sources> - </configuration> </execution> </executions> - </plugin> + </plugin> <!-- handle OSGi information --> <plugin> @@ -316,17 +290,8 @@ </execution> </executions> </plugin> - </plugins> - - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - </resources> + </plugins> </build> <dependencies> diff --git a/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/VelocityEngineVersion.java b/velocity-engine-core/src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java index e3a2dc8d..e3a2dc8d 100644 --- a/velocity-engine-core/src/main/resources/org/apache/velocity/runtime/VelocityEngineVersion.java +++ b/velocity-engine-core/src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java |