Skip to content

Commit 072051b

Browse files
marksreevesmarksreeves
authored
Merge pull request #22 from marksreeves/remove-reports
remove site generation part of #11, remove unnecessary properties res…
2 parents d93882e + a680505 commit 072051b

File tree

2 files changed

+8
-274
lines changed

2 files changed

+8
-274
lines changed

‎pom.xml‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,6 @@
9292
<id>${stagingId}</id>
9393
<url>${stagingUrl}</url>
9494
</repository>
95-
<!--
96-
<site>
97-
<id>sites</id>
98-
<name>sites</name>
99-
<url>${sitesUrl}</url>
100-
</site>
101-
-->
10295
</distributionManagement>
10396

10497
<dependencyManagement>
@@ -151,28 +144,6 @@
151144
</configuration>
152145
</plugin>
153146

154-
<!-- Generate the site. -->
155-
<plugin>
156-
<groupId>org.apache.maven.plugins</groupId>
157-
<artifactId>maven-site-plugin</artifactId>
158-
<version>3.7.1</version>
159-
<dependencies>
160-
<dependency>
161-
<groupId>org.apache.maven.doxia</groupId>
162-
<artifactId>doxia-module-markdown</artifactId>
163-
<version>1.8</version>
164-
</dependency>
165-
</dependencies>
166-
<executions>
167-
<execution>
168-
<id>attach-descriptor</id>
169-
<goals>
170-
<goal>attach-descriptor</goal>
171-
</goals>
172-
</execution>
173-
</executions>
174-
</plugin>
175-
176147
<!-- Handle release. -->
177148
<plugin>
178149
<groupId>org.apache.maven.plugins</groupId>
@@ -226,28 +197,6 @@
226197
</executions>
227198
</plugin>
228199

229-
<!-- Generate the site. -->
230-
<plugin>
231-
<groupId>org.apache.maven.plugins</groupId>
232-
<artifactId>maven-site-plugin</artifactId>
233-
<version>3.7.1</version>
234-
<dependencies>
235-
<dependency>
236-
<groupId>org.apache.maven.doxia</groupId>
237-
<artifactId>doxia-module-markdown</artifactId>
238-
<version>1.8</version>
239-
</dependency>
240-
</dependencies>
241-
<executions>
242-
<execution>
243-
<id>attach-descriptor</id>
244-
<goals>
245-
<goal>attach-descriptor</goal>
246-
</goals>
247-
</execution>
248-
</executions>
249-
</plugin>
250-
251200
<plugin>
252201
<groupId>org.apache.maven.plugins</groupId>
253202
<artifactId>maven-enforcer-plugin</artifactId>

‎qa-parent/pom.xml‎

Lines changed: 8 additions & 223 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,15 @@
1818
<checkstyle.skip>${wc.qa.skip}</checkstyle.skip>
1919
<findbugs.skip>${wc.qa.skip}</findbugs.skip>
2020
<pmd.skip>${wc.qa.skip}</pmd.skip>
21-
<badges.skip>${wc.qa.skip}</badges.skip>
2221

2322
<javadoc.excluded.packages />
2423
<checkstyle.excludes />
2524

2625
<!--
2726
OWASP dependency vulnerability scanner.
2827
-->
29-
<bt.owasp.dependency-check.version>4.0.1</bt.owasp.dependency-check.version>
30-
<bt.owasp.dependency-check.skip>false</bt.owasp.dependency-check.skip>
3128
<!-- allow for proxy settings -->
32-
<bt.owasp.dependency-check.proxy></bt.owasp.dependency-check.proxy>
33-
<!-- Non java analysers are off by default because, well this is a Maven builder! -->
34-
<!-- nodejs nsp requires nsp on the path at scan time -->
35-
<bt.owasp.dependency-check.enableNsp>false</bt.owasp.dependency-check.enableNsp>
36-
<!-- RetireJs analyser has a known bug https://github.com/jeremylong/DependencyCheck/issues/1467 -->
37-
<bt.owasp.dependency-check.enableRetireJs>false</bt.owasp.dependency-check.enableRetireJs>
38-
<!-- nuspec analyser -->
39-
<bt.owasp.dependency-check.enableNuspec>false</bt.owasp.dependency-check.enableNuspec>
40-
<!-- swift analyser -->
41-
<bt.owasp.dependency-check.enableSwift>false</bt.owasp.dependency-check.enableSwift>
42-
<!-- assembly .net analyser -->
43-
<bt.owasp.dependency-check.enableAssembly.Net>false</bt.owasp.dependency-check.enableAssembly.Net>
29+
<bt.owasp.dependency-check.proxy />
4430
</properties>
4531

4632
<description>
@@ -56,15 +42,15 @@
5642
<plugin>
5743
<groupId>org.owasp</groupId>
5844
<artifactId>dependency-check-maven</artifactId>
59-
<version>${bt.owasp.dependency-check.version}</version>
45+
<version>4.0.1</version>
6046
<configuration>
6147
<failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
6248
<mavenSettingsProxyId>${bt.owasp.dependency-check.proxy}</mavenSettingsProxyId>
63-
<retireJsAnalyzerEnabled>${bt.owasp.dependency-check.enableRetireJs}</retireJsAnalyzerEnabled><!-- see https://github.com/jeremylong/DependencyCheck/issues/1467 before turning this on -->
64-
<nspAnalyzerEnabled>${bt.owasp.dependency-check.enableNsp}</nspAnalyzerEnabled>
65-
<nuspecAnalyzerEnabled>${bt.owasp.dependency-check.enableNuspec}</nuspecAnalyzerEnabled>
66-
<swiftPackageManagerAnalyzerEnabled>${bt.owasp.dependency-check.enableSwift}</swiftPackageManagerAnalyzerEnabled>
67-
<assemblyAnalyzerEnabled>${bt.owasp.dependency-check.enableAssembly.Net}</assemblyAnalyzerEnabled>
49+
<retireJsAnalyzerEnabled>false</retireJsAnalyzerEnabled><!-- see https://github.com/jeremylong/DependencyCheck/issues/1467 before turning this on -->
50+
<nspAnalyzerEnabled>false</nspAnalyzerEnabled>
51+
<nuspecAnalyzerEnabled>false</nuspecAnalyzerEnabled>
52+
<swiftPackageManagerAnalyzerEnabled>false</swiftPackageManagerAnalyzerEnabled>
53+
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
6854
</configuration>
6955
</plugin>
7056
</plugins>
@@ -127,7 +113,7 @@
127113
<plugin>
128114
<groupId>org.codehaus.mojo</groupId>
129115
<artifactId>findbugs-maven-plugin</artifactId>
130-
<version>3.0.3</version>
116+
<version>3.0.5</version>
131117
<configuration>
132118
<failOnError>true</failOnError>
133119
<effort>Max</effort>
@@ -173,38 +159,9 @@
173159
</executions>
174160
</plugin>
175161

176-
<!-- Generate badges. -->
177-
<plugin>
178-
<groupId>com.github.bordertech.buildtools</groupId>
179-
<artifactId>badger</artifactId>
180-
<version>1.0.0</version>
181-
<executions>
182-
<execution>
183-
<phase>post-site</phase>
184-
<goals>
185-
<goal>badges</goal>
186-
</goals>
187-
<configuration>
188-
<skip>${badges.skip}</skip>
189-
<outputDir>target/site/badges</outputDir>
190-
<inputFiles>
191-
<inputFile>target/pmd.xml</inputFile>
192-
<inputFile>target/findbugs-report.xml</inputFile>
193-
<inputFile>target/findbugsXml.xml</inputFile>
194-
<inputFile>target/checkstyle-result.xml</inputFile>
195-
<inputFile>target/coverage-report.xml</inputFile>
196-
</inputFiles>
197-
</configuration>
198-
</execution>
199-
</executions>
200-
</plugin>
201-
202162
<plugin>
203163
<groupId>org.owasp</groupId>
204164
<artifactId>dependency-check-maven</artifactId>
205-
<configuration>
206-
<skip>${bt.owasp.dependency-check.skip}</skip>
207-
</configuration>
208165
<executions>
209166
<execution>
210167
<id>checkDependencies</id>
@@ -219,176 +176,4 @@
219176
</plugins>
220177
</build>
221178

222-
<reporting>
223-
<plugins>
224-
225-
<!-- Generate Reports Information about the project. -->
226-
<plugin>
227-
<groupId>org.apache.maven.plugins</groupId>
228-
<artifactId>maven-project-info-reports-plugin</artifactId>
229-
<version>3.0.0</version>
230-
<reportSets>
231-
<reportSet>
232-
<reports>
233-
<report>index</report>
234-
<report>license</report>
235-
<report>mailing-list</report>
236-
<report>summary</report>
237-
</reports>
238-
</reportSet>
239-
</reportSets>
240-
</plugin>
241-
242-
<!-- Self Aggregating. Plugin automatically aggregates sub modules. -->
243-
<!-- Produce a cross-reference of the project's source. (Self Aggregating). -->
244-
<plugin>
245-
<groupId>org.apache.maven.plugins</groupId>
246-
<artifactId>maven-jxr-plugin</artifactId>
247-
<version>2.5</version>
248-
<reportSets>
249-
<reportSet>
250-
<inherited>false</inherited>
251-
<reports>
252-
<report>aggregate</report>
253-
<!--
254-
<report>test-aggregate</report>
255-
-->
256-
</reports>
257-
</reportSet>
258-
</reportSets>
259-
</plugin>
260-
261-
<!-- Generate Javadoc. (Self Aggregating)-->
262-
<plugin>
263-
<groupId>org.apache.maven.plugins</groupId>
264-
<artifactId>maven-javadoc-plugin</artifactId>
265-
<version>3.0.1</version>
266-
<configuration>
267-
<charset>UTF-8</charset>
268-
<encoding>UTF-8</encoding>
269-
<docencoding>UTF-8</docencoding>
270-
<breakiterator>true</breakiterator>
271-
<version>true</version>
272-
<keywords>true</keywords>
273-
<excludePackageNames>${javadoc.excluded.packages}</excludePackageNames>
274-
</configuration>
275-
<reportSets>
276-
<reportSet>
277-
<inherited>false</inherited>
278-
<reports>
279-
<report>aggregate</report>
280-
<!--
281-
<report>test-aggregate</report>
282-
-->
283-
</reports>
284-
</reportSet>
285-
</reportSets>
286-
</plugin>
287-
288-
<!-- Generate the web interface version of the test results (Aggregate Parameter). -->
289-
<!-- Run site twice to get correct results. -->
290-
<plugin>
291-
<groupId>org.apache.maven.plugins</groupId>
292-
<artifactId>maven-surefire-report-plugin</artifactId>
293-
<version>${surefire.version}</version>
294-
<configuration>
295-
<aggregate>true</aggregate>
296-
</configuration>
297-
<reportSets>
298-
<reportSet>
299-
<inherited>false</inherited>
300-
<reports>
301-
<report>report</report>
302-
</reports>
303-
</reportSet>
304-
</reportSets>
305-
</plugin>
306-
307-
<!-- QA Reports. -->
308-
<!-- Generate the Checkstyle report. (Self Aggregating) -->
309-
<plugin>
310-
<groupId>org.apache.maven.plugins</groupId>
311-
<artifactId>maven-checkstyle-plugin</artifactId>
312-
<version>3.0.0</version>
313-
<configuration>
314-
<skip>false</skip>
315-
<configLocation>bordertech/checkstyle.xml</configLocation>
316-
<consoleOutput>true</consoleOutput>
317-
<excludes>${checkstyle.excludes}</excludes>
318-
<headerFile />
319-
</configuration>
320-
<reportSets>
321-
<reportSet>
322-
<inherited>false</inherited>
323-
<reports>
324-
<report>checkstyle-aggregate</report>
325-
</reports>
326-
</reportSet>
327-
</reportSets>
328-
</plugin>
329-
330-
<!-- PMD and CPD Reports (Aggregate Parameter). -->
331-
<plugin>
332-
<groupId>org.apache.maven.plugins</groupId>
333-
<artifactId>maven-pmd-plugin</artifactId>
334-
<version>3.10.0</version>
335-
<configuration>
336-
<skip>false</skip>
337-
<aggregate>true</aggregate>
338-
<failurePriority>5</failurePriority>
339-
</configuration>
340-
<reportSets>
341-
<reportSet>
342-
<inherited>false</inherited>
343-
<reports>
344-
<report>pmd</report>
345-
<report>cpd</report>
346-
</reports>
347-
</reportSet>
348-
</reportSets>
349-
</plugin>
350-
351-
<!-- Generate Findbugs reports. (Does not support aggregate.) -->
352-
<!-- Run site twice to get Findbugs report.-->
353-
<plugin>
354-
<groupId>org.codehaus.mojo</groupId>
355-
<artifactId>findbugs-maven-plugin</artifactId>
356-
<version>3.0.5</version>
357-
<configuration>
358-
<skip>false</skip>
359-
<effort>Max</effort>
360-
<includeTests>false</includeTests>
361-
<excludeFilterFile>bordertech/findbugs-exclude-filter.xml</excludeFilterFile>
362-
<threshold>Low</threshold>
363-
<failOnError>false</failOnError>
364-
<findbugsXmlOutputDirectory>${project.build.directory}/findbugs-rep</findbugsXmlOutputDirectory>
365-
</configuration>
366-
</plugin>
367-
368-
<!-- Generate the dependency vulnerability check report -->
369-
<plugin>
370-
<groupId>org.owasp</groupId>
371-
<artifactId>dependency-check-maven</artifactId>
372-
<version>${bt.owasp.dependency-check.version}</version>
373-
<reportSets>
374-
<reportSet>
375-
<reports>
376-
<report>aggregate</report>
377-
</reports>
378-
<configuration>
379-
<skip>false</skip>
380-
<failOnError>false</failOnError>
381-
<retireJsAnalyzerEnabled>${bt.owasp.dependency-check.enableRetireJs}</retireJsAnalyzerEnabled><!-- see https://github.com/jeremylong/DependencyCheck/issues/1467 before turning this on -->
382-
<nspAnalyzerEnabled>${bt.owasp.dependency-check.enableNsp}</nspAnalyzerEnabled>
383-
<nuspecAnalyzerEnabled>${bt.owasp.dependency-check.enableNuspec}</nuspecAnalyzerEnabled>
384-
<swiftPackageManagerAnalyzerEnabled>${bt.owasp.dependency-check.enableSwift}</swiftPackageManagerAnalyzerEnabled>
385-
<assemblyAnalyzerEnabled>${bt.owasp.dependency-check.enableAssembly.Net}</assemblyAnalyzerEnabled>
386-
</configuration>
387-
</reportSet>
388-
</reportSets>
389-
</plugin>
390-
391-
</plugins>
392-
</reporting>
393-
394179
</project>

0 commit comments

Comments
 (0)