Repository: wicket Updated Branches: refs/heads/wicket-6.x 1af52ea92 -> 258f93d59
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/258f93d5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/258f93d5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/258f93d5 Branch: refs/heads/wicket-6.x Commit: 258f93d593acf9fa53c0ed6fbaf3b24b81971528 Parents: 1af52ea 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:30:15 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/258f93d5/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 2d81466..e306c17 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> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/wicket/blob/258f93d5/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 3fdb281..73f4bce 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>6.22.0-SNAPSHOT</wicket.version> + <wicket.version>@project.version@</wicket.version> <jetty.version>7.6.16.v20140903</jetty.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
