Repository: wicket Updated Branches: refs/heads/wicket-6.x 27c3808d4 -> 1af52ea92
Update maven-resources-plugin and archetype-packaging extension Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1af52ea9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1af52ea9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1af52ea9 Branch: refs/heads/wicket-6.x Commit: 1af52ea929cbbc6f70c61fc672fa45e3816e9a63 Parents: 27c3808 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jan 31 20:34:26 2017 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jan 31 21:18:53 2017 +0100 ---------------------------------------------------------------------- archetypes/quickstart/pom.xml | 2 +- pom.xml | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1af52ea9/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 7fb9df0..2d81466 100644 --- a/archetypes/quickstart/pom.xml +++ b/archetypes/quickstart/pom.xml @@ -40,7 +40,7 @@ <extension> <groupId>org.apache.maven.archetype</groupId> <artifactId>archetype-packaging</artifactId> - <version>2.2</version> + <version>2.4</version> </extension> </extensions> <plugins> http://git-wip-us.apache.org/repos/asf/wicket/blob/1af52ea9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b5bbbad..11ef4af 100644 --- a/pom.xml +++ b/pom.xml @@ -691,17 +691,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> + <version>3.0.2</version> <configuration> <encoding>${project.build.sourceEncoding}</encoding> </configuration> - <dependencies> - <dependency> <!-- remove me when maven-resources-plugin upgrades to plexus-utils:3.0.7 --> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.0.22</version> - </dependency> - </dependencies> </plugin> <plugin> <inherited>true</inherited> @@ -813,6 +806,7 @@ </goals> </execution> </executions> + <inherited>true</inherited> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
