Corrected RAT mvn plugin to appropriate exclude things at the top level, and to also include subprojects.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8435e722 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8435e722 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8435e722 Branch: refs/heads/junit-tests Commit: 8435e722955b7ca1901f4e23636e7da7bc59ef3c Parents: 719ccab Author: Chip Childers <[email protected]> Authored: Tue Sep 25 15:01:08 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Tue Sep 25 15:01:08 2012 -0400 ---------------------------------------------------------------------- patches/pom.xml | 39 --------------------------------------- pom.xml | 31 ++++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8435e722/patches/pom.xml ---------------------------------------------------------------------- diff --git a/patches/pom.xml b/patches/pom.xml index db24f87..d62fc86 100644 --- a/patches/pom.xml +++ b/patches/pom.xml @@ -87,45 +87,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>0.8</version> - <configuration> - <numUnapprovedLicenses>0</numUnapprovedLicenses> - <excludeSubProjects>true</excludeSubProjects> - <excludes> - <exclude>systemvm/debian/systemvm.vmx</exclude> - <exclude>systemvm/debian/config/root/.ssh/authorized_keys</exclude> - <exclude>systemvm/debian/config/etc/apache2/httpd.conf</exclude> - <exclude>systemvm/debian/config/etc/apache2/ports.conf</exclude> - <exclude>systemvm/debian/config/etc/apache2/sites-available/default</exclude> - <exclude>systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude> - <exclude>systemvm/debian/config/etc/apache2/vhostexample.conf</exclude> - <exclude>systemvm/debian/config/etc/dnsmasq.conf</exclude> - <exclude>systemvm/debian/config/etc/vpcdnsmasq.conf</exclude> - <exclude>systemvm/debian/config/etc/ssh/sshd_config</exclude> <!-- Pending resolution of CLOUDSTACK-145 --> - <exclude>systemvm/debian/config/etc/rsyslog.conf</exclude> <!-- Pending resolution of CLOUDSTACK-147 --> - <exclude>systemvm/debian/config/etc/logrotate.conf</exclude> - <exclude>systemvm/debian/config/etc/logrotate.d/*</exclude> - <exclude>systemvm/debian/config/etc/sysctl.conf</exclude> - <exclude>systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude> - <exclude>systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude> - <exclude>systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude> <!-- Pending resolution of CLOUDSTACK-166 --> - <exclude>systemvm/debian/vpn/etc/ipsec.conf</exclude> - <exclude>systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude> - <exclude>systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude> - <exclude>systemvm/debian/vpn/etc/ipsec.secrets</exclude> - <exclude>systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude> - <exclude>systemvm/debian/config/etc/cloud-nic.rules</exclude> - <exclude>systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude> - <exclude>systemvm/debian/config/etc/rc.local</exclude> - <exclude>systemvm/debian/config/var/www/html/userdata/.htaccess</exclude> - <exclude>systemvm/debian/config/var/www/html/latest/.htaccess</exclude> - <exclude>systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8435e722/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 607a461..93621dd 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ <version>0.8</version> <configuration> <numUnapprovedLicenses>0</numUnapprovedLicenses> - <excludeSubProjects>true</excludeSubProjects> + <excludeSubProjects>false</excludeSubProjects> <excludes> <exclude>.git/**</exclude> <exclude>.gitignore</exclude> @@ -235,6 +235,35 @@ <exclude>ui/lib/qunit/qunit.js</exclude> <exclude>ui/lib/reset.css</exclude> <exclude>waf</exclude> + <exclude>patches/systemvm/debian/systemvm.vmx</exclude> + <exclude>patches/systemvm/debian/config/root/.ssh/authorized_keys</exclude> + <exclude>patches/systemvm/debian/config/etc/apache2/httpd.conf</exclude> + <exclude>patches/systemvm/debian/config/etc/apache2/ports.conf</exclude> + <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default</exclude> + <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude> + <exclude>patches/systemvm/debian/config/etc/apache2/vhostexample.conf</exclude> + <exclude>patches/systemvm/debian/config/etc/dnsmasq.conf</exclude> + <exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude> + <exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude> <!-- Pending resolution of CLOUDSTACK-145 --> + <exclude>patches/systemvm/debian/config/etc/rsyslog.conf</exclude> <!-- Pending resolution of CLOUDSTACK-147 --> + <exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude> + <exclude>patches/systemvm/debian/config/etc/logrotate.d/*</exclude> + <exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude> + <exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude> + <exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude> + <exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude> <!-- Pending resolution of CLOUDSTACK-166 --> + <exclude>patches/systemvm/debian/vpn/etc/ipsec.conf</exclude> + <exclude>patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude> + <exclude>patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude> + <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude> + <exclude>patches/systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude> + <exclude>patches/systemvm/debian/config/etc/cloud-nic.rules</exclude> + <exclude>patches/systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude> + <exclude>patches/systemvm/debian/config/etc/rc.local</exclude> + <exclude>patches/systemvm/debian/config/var/www/html/userdata/.htaccess</exclude> + <exclude>patches/systemvm/debian/config/var/www/html/latest/.htaccess</exclude> + <exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude> + </excludes> </configuration> </plugin>
