Repository: cayenne Updated Branches: refs/heads/master 0b8ec63aa -> 0933c1944
enable license/notice resource plugin at the top level * remove duplication in sub-poms Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0933c194 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0933c194 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0933c194 Branch: refs/heads/master Commit: 0933c1944e26d5aef9520895d19a707cd02b6801 Parents: 0b8ec63 Author: Andrus Adamchik <[email protected]> Authored: Wed Aug 17 18:28:26 2016 +0300 Committer: Andrus Adamchik <[email protected]> Committed: Wed Aug 17 18:28:26 2016 +0300 ---------------------------------------------------------------------- cayenne-client-jetty/pom.xml | 10 ---------- cayenne-client/pom.xml | 14 -------------- cayenne-crypto/pom.xml | 10 ---------- cayenne-dbcp2/pom.xml | 10 ---------- cayenne-di/pom.xml | 10 ---------- cayenne-java8/pom.xml | 10 ---------- cayenne-joda/pom.xml | 10 ---------- cayenne-lifecycle/pom.xml | 14 -------------- cayenne-project/pom.xml | 15 --------------- cayenne-protostuff/pom.xml | 10 ---------- cayenne-server/pom.xml | 10 ---------- cayenne-tools/pom.xml | 10 ---------- modeler/pom.xml | 15 --------------- plugins/pom.xml | 10 ---------- pom.xml | 11 +++++++++++ 15 files changed, 11 insertions(+), 158 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-client-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-client-jetty/pom.xml b/cayenne-client-jetty/pom.xml index 574d4b3..37120f6 100644 --- a/cayenne-client-jetty/pom.xml +++ b/cayenne-client-jetty/pom.xml @@ -121,16 +121,6 @@ <target>1.8</target> </configuration> </plugin> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-client/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml index 187c260..d7e0a31 100644 --- a/cayenne-client/pom.xml +++ b/cayenne-client/pom.xml @@ -90,20 +90,6 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> <profiles> <profile> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-crypto/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml index e4730b1..a47376b 100644 --- a/cayenne-crypto/pom.xml +++ b/cayenne-crypto/pom.xml @@ -69,16 +69,6 @@ <build> <plugins> <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.cayenne.plugins</groupId> <artifactId>maven-cayenne-plugin</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-dbcp2/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-dbcp2/pom.xml b/cayenne-dbcp2/pom.xml index dc1b1fd..3854866 100644 --- a/cayenne-dbcp2/pom.xml +++ b/cayenne-dbcp2/pom.xml @@ -50,16 +50,6 @@ <build> <plugins> <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-checkstyle-plugin</artifactId> <!--<configuration> <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> </configuration> --> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-di/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-di/pom.xml b/cayenne-di/pom.xml index d8fd6dc..0fe0c2a 100644 --- a/cayenne-di/pom.xml +++ b/cayenne-di/pom.xml @@ -30,16 +30,6 @@ <build> <plugins> <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-java8/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-java8/pom.xml b/cayenne-java8/pom.xml index 615e178..938a982 100644 --- a/cayenne-java8/pom.xml +++ b/cayenne-java8/pom.xml @@ -57,16 +57,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.cayenne.plugins</groupId> <artifactId>maven-cayenne-plugin</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-joda/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-joda/pom.xml b/cayenne-joda/pom.xml index 7d796e3..2022bf8 100644 --- a/cayenne-joda/pom.xml +++ b/cayenne-joda/pom.xml @@ -78,16 +78,6 @@ <build> <plugins> <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.cayenne.plugins</groupId> <artifactId>maven-cayenne-plugin</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-lifecycle/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml index 84e8e13..904c7f8 100644 --- a/cayenne-lifecycle/pom.xml +++ b/cayenne-lifecycle/pom.xml @@ -66,20 +66,6 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> <profiles> <profile> <id>code-quality</id> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-project/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-project/pom.xml b/cayenne-project/pom.xml index da24a7b..5cb3f09 100644 --- a/cayenne-project/pom.xml +++ b/cayenne-project/pom.xml @@ -53,21 +53,6 @@ <version>${project.version}</version> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> <profiles> <profile> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-protostuff/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-protostuff/pom.xml b/cayenne-protostuff/pom.xml index 3de655d..10655be 100644 --- a/cayenne-protostuff/pom.xml +++ b/cayenne-protostuff/pom.xml @@ -115,16 +115,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-server/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml index 6f46df7..9a400e4 100644 --- a/cayenne-server/pom.xml +++ b/cayenne-server/pom.xml @@ -167,16 +167,6 @@ </resources> <plugins> <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> <version>2.6</version> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/cayenne-tools/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-tools/pom.xml b/cayenne-tools/pom.xml index bd6d469..0a26cb8 100644 --- a/cayenne-tools/pom.xml +++ b/cayenne-tools/pom.xml @@ -118,16 +118,6 @@ <build> <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> <executions> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/modeler/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/pom.xml b/modeler/pom.xml index 89a3cef..218c4fe 100644 --- a/modeler/pom.xml +++ b/modeler/pom.xml @@ -41,19 +41,4 @@ <module>cayenne-modeler-mac</module> <module>cayenne-modeler-win</module> </modules> - - <build> - <plugins> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index 2836a26..4068ec9 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -79,16 +79,6 @@ <build> <plugins> <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/cayenne/blob/0933c194/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b38d9e2..93c6d66 100644 --- a/pom.xml +++ b/pom.xml @@ -891,6 +891,17 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> </plugin> + <!-- This ensures LICESNE and NOTICE inclusion in all jars --> + <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> <configuration>
