Skip to content

Commit 8435e72

Browse files
chipchilderschipchilders
committed
Corrected RAT mvn plugin to appropriate exclude things at the top level, and to also include subprojects.
1 parent 719ccab commit 8435e72

2 files changed

Lines changed: 30 additions & 40 deletions

File tree

‎patches/pom.xml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -87,45 +87,6 @@
8787
</execution>
8888
</executions>
8989
</plugin>
90-
<plugin>
91-
<groupId>org.apache.rat</groupId>
92-
<artifactId>apache-rat-plugin</artifactId>
93-
<version>0.8</version>
94-
<configuration>
95-
<numUnapprovedLicenses>0</numUnapprovedLicenses>
96-
<excludeSubProjects>true</excludeSubProjects>
97-
<excludes>
98-
<exclude>systemvm/debian/systemvm.vmx</exclude>
99-
<exclude>systemvm/debian/config/root/.ssh/authorized_keys</exclude>
100-
<exclude>systemvm/debian/config/etc/apache2/httpd.conf</exclude>
101-
<exclude>systemvm/debian/config/etc/apache2/ports.conf</exclude>
102-
<exclude>systemvm/debian/config/etc/apache2/sites-available/default</exclude>
103-
<exclude>systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude>
104-
<exclude>systemvm/debian/config/etc/apache2/vhostexample.conf</exclude>
105-
<exclude>systemvm/debian/config/etc/dnsmasq.conf</exclude>
106-
<exclude>systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
107-
<exclude>systemvm/debian/config/etc/ssh/sshd_config</exclude> <!-- Pending resolution of CLOUDSTACK-145 -->
108-
<exclude>systemvm/debian/config/etc/rsyslog.conf</exclude> <!-- Pending resolution of CLOUDSTACK-147 -->
109-
<exclude>systemvm/debian/config/etc/logrotate.conf</exclude>
110-
<exclude>systemvm/debian/config/etc/logrotate.d/*</exclude>
111-
<exclude>systemvm/debian/config/etc/sysctl.conf</exclude>
112-
<exclude>systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
113-
<exclude>systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
114-
<exclude>systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude> <!-- Pending resolution of CLOUDSTACK-166 -->
115-
<exclude>systemvm/debian/vpn/etc/ipsec.conf</exclude>
116-
<exclude>systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude>
117-
<exclude>systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
118-
<exclude>systemvm/debian/vpn/etc/ipsec.secrets</exclude>
119-
<exclude>systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude>
120-
<exclude>systemvm/debian/config/etc/cloud-nic.rules</exclude>
121-
<exclude>systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude>
122-
<exclude>systemvm/debian/config/etc/rc.local</exclude>
123-
<exclude>systemvm/debian/config/var/www/html/userdata/.htaccess</exclude>
124-
<exclude>systemvm/debian/config/var/www/html/latest/.htaccess</exclude>
125-
<exclude>systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
126-
</excludes>
127-
</configuration>
128-
</plugin>
12990
</plugins>
13091
</build>
13192
</project>

‎pom.xml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<version>0.8</version>
185185
<configuration>
186186
<numUnapprovedLicenses>0</numUnapprovedLicenses>
187-
<excludeSubProjects>true</excludeSubProjects>
187+
<excludeSubProjects>false</excludeSubProjects>
188188
<excludes>
189189
<exclude>.git/**</exclude>
190190
<exclude>.gitignore</exclude>
@@ -235,6 +235,35 @@
235235
<exclude>ui/lib/qunit/qunit.js</exclude>
236236
<exclude>ui/lib/reset.css</exclude>
237237
<exclude>waf</exclude>
238+
<exclude>patches/systemvm/debian/systemvm.vmx</exclude>
239+
<exclude>patches/systemvm/debian/config/root/.ssh/authorized_keys</exclude>
240+
<exclude>patches/systemvm/debian/config/etc/apache2/httpd.conf</exclude>
241+
<exclude>patches/systemvm/debian/config/etc/apache2/ports.conf</exclude>
242+
<exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default</exclude>
243+
<exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude>
244+
<exclude>patches/systemvm/debian/config/etc/apache2/vhostexample.conf</exclude>
245+
<exclude>patches/systemvm/debian/config/etc/dnsmasq.conf</exclude>
246+
<exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
247+
<exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude> <!-- Pending resolution of CLOUDSTACK-145 -->
248+
<exclude>patches/systemvm/debian/config/etc/rsyslog.conf</exclude> <!-- Pending resolution of CLOUDSTACK-147 -->
249+
<exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude>
250+
<exclude>patches/systemvm/debian/config/etc/logrotate.d/*</exclude>
251+
<exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude>
252+
<exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
253+
<exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
254+
<exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude> <!-- Pending resolution of CLOUDSTACK-166 -->
255+
<exclude>patches/systemvm/debian/vpn/etc/ipsec.conf</exclude>
256+
<exclude>patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude>
257+
<exclude>patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
258+
<exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude>
259+
<exclude>patches/systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude>
260+
<exclude>patches/systemvm/debian/config/etc/cloud-nic.rules</exclude>
261+
<exclude>patches/systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude>
262+
<exclude>patches/systemvm/debian/config/etc/rc.local</exclude>
263+
<exclude>patches/systemvm/debian/config/var/www/html/userdata/.htaccess</exclude>
264+
<exclude>patches/systemvm/debian/config/var/www/html/latest/.htaccess</exclude>
265+
<exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
266+
238267
</excludes>
239268
</configuration>
240269
</plugin>

0 commit comments

Comments
 (0)