Really great! I like those changes! :-) kind regards
Tobias > Am 31.01.2017 um 21:24 schrieb Martin Grigorov <[email protected]>: > > OK. I'll make the changes in the poms > > Martin Grigorov > Wicket Training and Consulting > https://twitter.com/mtgrigorov > > On Tue, Jan 31, 2017 at 9:13 PM, Andrea Del Bene <[email protected]> > wrote: > >> The more we move to maven, the happier I am :). I will remove from the >> release script the code that generates the archetype pom. >> >> >> >>> On 31/01/2017 20:37, Martin Grigorov wrote: >>> >>> What about using plain Maven means: >>> >>> diff --git i/archetypes/quickstart/pom.xml w/archetypes/quickstart/pom.xm >>> l >>> index 88d858f..831aff5 100644 >>> --- i/archetypes/quickstart/pom.xml >>> +++ w/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.plu >>> gins</groupId> >>> >>> <artifactId>maven-archetype-plugin</artifactId> >>> </plugin> >>> + <plugin> >>> + <groupId>org.apache.maven.plu >>> gins</groupId> >>> + >>> <artifactId>maven-resources-plugin</artifactId> >>> + <configuration> >>> + >>> <useDefaultDelimiters>false</useDefaultDelimiters> >>> + <delimiters> >>> + <delimiter>@</delimiter> >>> + </delimiters> >>> + </configuration> >>> + </plugin> >>> </plugins> >>> </build> >>> </project> >>> diff --git >>> i/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml >>> w/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml >>> index cfb582e..d72a73b 100644 >>> --- i/archetypes/quickstart/src/main/resources/archetype-resourc >>> es/pom.xml >>> +++ w/archetypes/quickstart/src/main/resources/archetype-resourc >>> es/pom.xml >>> @@ -42,7 +42,7 @@ >>> </license> >>> </licenses> >>> <properties> >>> - <wicket.version>8.0.0-SNAPSHOT</wicket.version> >>> + <wicket.version>@project.version@</wicket.version> >>> <jetty9.version>9.4.0.v20161208</jetty9.version> >>> >>> >>> This way the Maven build will replace @project.version@ with the current >>> version of the parent pom. >>> >>> I've just pushed an update of the versions of maven-resources-plugin and >>> archetype-packaging extension. Without the update of the first the change >>> above won't work! >>> >>> Martin Grigorov >>> Wicket Training and Consulting >>> https://twitter.com/mtgrigorov >>> >>> On Tue, Jan 31, 2017 at 4:30 PM, Andrea Del Bene <[email protected]> >>> wrote: >>> >>> Hi >>>> >>>> The script release.sh it's already meant to do so, but apparently we have >>>> a problem with sed command at line 474. This doesn't work, at least under >>>> linux: >>>> >>>> sed -e "s/\<wicket\.version\>.*\<\/wicket\.version\>/\<wicket.versi >>>> on\>$version\<\/wicket.version\>/g" -i "" archetypes/quickstart/src/main >>>> /resources/archetype-resources/pom.xml >>>> >>>> >>>> In order to make it work characters like dot or '<' shouldn't not be >>>> escaped. Es: >>>> >>>> sed "s/<wicket.version>.*<\/wicket.version>/<wicket.version>$ >>>> version<\/wicket.version>/g" >>>> >>>> >>>> >>>> >>>> On 31/01/2017 14:50, Martin Grigorov wrote: >>>> >>>> Hi Andrea, >>>>> >>>>> I think the release script that you have used should be improved to do >>>>> this >>>>> automatically. >>>>> >>>>> Martin Grigorov >>>>> Wicket Training and Consulting >>>>> https://twitter.com/mtgrigorov >>>>> >>>>> On Tue, Jan 31, 2017 at 2:48 PM, <[email protected]> wrote: >>>>> >>>>> Repository: wicket >>>>> >>>>>> Updated Branches: >>>>>> refs/heads/wicket-7.x 5a2ce7b69 -> 0918ec027 >>>>>> >>>>>> >>>>>> Archetype version updated to 7.7.0-SNAPSHOT >>>>>> >>>>>> >>>>>> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo >>>>>> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0918ec02 >>>>>> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0918ec02 >>>>>> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0918ec02 >>>>>> >>>>>> Branch: refs/heads/wicket-7.x >>>>>> Commit: 0918ec0274c3f03125175bd515f7245e6f6d660c >>>>>> Parents: 5a2ce7b >>>>>> Author: Andrea Del Bene <[email protected]> >>>>>> Authored: Tue Jan 31 14:46:55 2017 +0100 >>>>>> Committer: Andrea Del Bene <[email protected]> >>>>>> Committed: Tue Jan 31 14:47:53 2017 +0100 >>>>>> >>>>>> ---------------------------------------------------------------------- >>>>>> .../quickstart/src/main/resources/archetype-resources/pom.xml >>>>>> | >>>>>> 2 +- >>>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>>> ---------------------------------------------------------------------- >>>>>> >>>>>> >>>>>> http://git-wip-us.apache.org/repos/asf/wicket/blob/0918ec02/ >>>>>> archetypes/ >>>>>> quickstart/src/main/resources/archetype-resources/pom.xml >>>>>> ---------------------------------------------------------------------- >>>>>> diff --git a/archetypes/quickstart/src/ma >>>>>> in/resources/archetype-resourc >>>>>> es/pom.xml >>>>>> b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml >>>>>> index bed8cd2..05745f2 100644 >>>>>> --- a/archetypes/quickstart/src/main/resources/archetype-resourc >>>>>> es/pom.xml >>>>>> +++ b/archetypes/quickstart/src/main/resources/archetype-resourc >>>>>> es/pom.xml >>>>>> @@ -42,7 +42,7 @@ >>>>>> </license> >>>>>> </licenses> >>>>>> <properties> >>>>>> - <wicket.version>7.5.0-SNAPSHOT</wicket.version> >>>>>> + <wicket.version>7.7.0-SNAPSHOT</wicket.version> >>>>>> <jetty9.version>9.2.19.v20160908</jetty9.version> >>>>>> <log4j.version>2.6.2</log4j.version> >>>>>> <junit.version>4.12</junit.version> >>>>>> >>>>>> >>>>>> >>>>>> >>
