Updated Branches: refs/heads/master 0d8efbd97 -> 981db3465
JCLOUDS-386: Removing the remote-resources plugin We only use the shared resources for the Checkstyle config now, and that doesn't need to be "mixed in" to the project output directory Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/981db346 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/981db346 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/981db346 Branch: refs/heads/master Commit: 981db34655034bd1d2760c2a5f3f9d1d1467e6f9 Parents: 0d8efbd Author: Andrew Phillips <[email protected]> Authored: Thu Nov 21 12:52:20 2013 -0500 Committer: Andrew Phillips <[email protected]> Committed: Fri Nov 22 18:57:44 2013 -0500 ---------------------------------------------------------------------- project/pom.xml | 17 ----------------- resources/pom.xml | 38 -------------------------------------- 2 files changed, 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/981db346/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 3ed0d07..fd3468e 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -703,10 +703,6 @@ <version>2.3</version> </plugin> <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.4</version> - </plugin> - <plugin> <artifactId>maven-pmd-plugin</artifactId> <version>2.7.1</version> </plugin> @@ -997,19 +993,6 @@ </distributionManagement> <build> <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> <plugin> <!-- When building jclouds-project, override the config to use the local file --> <artifactId>maven-checkstyle-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/jclouds/blob/981db346/resources/pom.xml ---------------------------------------------------------------------- diff --git a/resources/pom.xml b/resources/pom.xml index b6092b2..cb0efe2 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -33,14 +33,6 @@ <build> <resources> <resource> - <targetPath>META-INF</targetPath> - <directory>${project.basedir}</directory> - <includes> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - </includes> - </resource> - <resource> <targetPath>resources</targetPath> <directory>${project.basedir}</directory> <includes> @@ -48,35 +40,5 @@ </includes> </resource> </resources> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <id>bundle-remote-resources</id> - <goals> - <goal>bundle</goal> - </goals> - <!-- run *after* copying resources to the output directory --> - <phase>process-resources</phase> - <configuration> - <resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory> - <includes> - <include>META-INF/LICENSE.txt</include> - <include>META-INF/NOTICE.txt</include> - </includes> - </configuration> - </execution> - <execution> - <goals> - <goal>process</goal> - </goals> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> </project>
