Repository: wicket Updated Branches: refs/heads/wicket-7.x 928a15a59 -> 86f7cb040
Use Maven resources filtering to set the Wicket version in the quickstart archetype's pom.xml Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/86f7cb04 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/86f7cb04 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/86f7cb04 Branch: refs/heads/wicket-7.x Commit: 86f7cb04020c5298e3408aea56c94e744afed155 Parents: 928a15a Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jan 31 21:27:13 2017 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jan 31 21:28:44 2017 +0100 ---------------------------------------------------------------------- archetypes/quickstart/pom.xml | 14 ++++++++++++-- .../src/main/resources/archetype-resources/pom.xml | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/86f7cb04/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 8900381..3ce6804 100644 --- a/archetypes/quickstart/pom.xml +++ b/archetypes/quickstart/pom.xml @@ -29,8 +29,8 @@ <build> <resources> <resource> - <filtering>false</filtering> - <directory>${basedir}/src/main/resources</directory> + <filtering>true</filtering> + <directory>${project.basedir}/src/main/resources</directory> <includes> <include>**/*</include> </includes> @@ -48,6 +48,16 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-archetype-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <useDefaultDelimiters>false</useDefaultDelimiters> + <delimiters> + <delimiter>@</delimiter> + </delimiters> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/86f7cb04/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml index 05745f2..1f846e0 100644 --- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -42,7 +42,7 @@ </license> </licenses> <properties> - <wicket.version>7.7.0-SNAPSHOT</wicket.version> + <wicket.version>@project.version@</wicket.version> <jetty9.version>9.2.19.v20160908</jetty9.version> <log4j.version>2.6.2</log4j.version> <junit.version>4.12</junit.version>
