Skip to content

Commit e6c96c2

Browse files
hazendazhazendaz
committed
[site] Move project onto site 4
1 parent 03f7aaa commit e6c96c2

File tree

6 files changed

+8
-73
lines changed

6 files changed

+8
-73
lines changed

‎pom.xml

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@
180180
<groovyVersion>4.0.26</groovyVersion>
181181
<javaparserVersion>3.26.3</javaparserVersion>
182182

183-
<doxiaVersion>1.12.0</doxiaVersion>
184-
<doxiaSiteToolsVersion>1.11.1</doxiaSiteToolsVersion>
183+
<doxiaVersion>2.0.0</doxiaVersion>
184+
<doxiaSiteToolsVersion>2.0.0</doxiaSiteToolsVersion>
185185

186186
<mavenSharedUtilsVersion>3.4.2</mavenSharedUtilsVersion>
187-
<mavenReportingApiVersion>3.1.1</mavenReportingApiVersion>
188-
<mavenReportingVersion>3.2.0</mavenReportingVersion>
187+
<mavenReportingApiVersion>4.0.0</mavenReportingApiVersion>
188+
<mavenReportingVersion>4.0.0</mavenReportingVersion>
189189
<mavenVersion>3.9.9</mavenVersion>
190190

191191
<resolver.version>1.9.22</resolver.version>
@@ -199,11 +199,7 @@
199199
<!-- TODO: Run latest dependency check as prior is throwing errors. Remove after next parent update. -->
200200
<dependency-check.plugin>12.1.0</dependency-check.plugin>
201201

202-
<!-- TODO: For running plugin, continue to use site plugin 3.12.1 -->
203-
<site.doxia1.plugin note="3.21.0+ requires doxia 2">3.12.1</site.doxia1.plugin>
204-
205202
<pluginPluginVersion>3.15.1</pluginPluginVersion>
206-
207203
<l10nPluginVersion>1.1.0</l10nPluginVersion>
208204
<codenarcPluginVersion>0.22-1</codenarcPluginVersion>
209205
<gmavenPluginVersion>4.1.1</gmavenPluginVersion>
@@ -233,16 +229,13 @@
233229
<asm.version>9.7.1</asm.version>
234230
<bcel.version>6.10.0</bcel.version>
235231
<beanutils.version>1.10.1</beanutils.version>
236-
<chain.version>1.2</chain.version>
237232
<codec.version>1.18.0</codec.version>
238233
<codenarc.version>3.6.0-groovy-4.0</codenarc.version>
239234
<collections.version>3.2.2</collections.version>
240-
<digester.version>2.1</digester.version>
241235
<gson.version>2.12.1</gson.version>
242236
<inject.version>1</inject.version>
243237
<io.version>2.18.0</io.version>
244238
<jaxen.version>2.0.0</jaxen.version>
245-
<lang2.version>2.6</lang2.version>
246239
<lang3.version>3.17.0</lang3.version>
247240
<logging.version>1.3.5</logging.version>
248241
<saxon.he.version>12.5</saxon.he.version>
@@ -321,11 +314,6 @@
321314
<artifactId>commons-beanutils</artifactId>
322315
<version>${beanutils.version}</version>
323316
</dependency>
324-
<dependency>
325-
<groupId>commons-chain</groupId>
326-
<artifactId>commons-chain</artifactId>
327-
<version>${chain.version}</version>
328-
</dependency>
329317
<dependency>
330318
<groupId>commons-codec</groupId>
331319
<artifactId>commons-codec</artifactId>
@@ -336,16 +324,6 @@
336324
<artifactId>commons-collections</artifactId>
337325
<version>${collections.version}</version>
338326
</dependency>
339-
<dependency>
340-
<groupId>commons-digester</groupId>
341-
<artifactId>commons-digester</artifactId>
342-
<version>${digester.version}</version>
343-
</dependency>
344-
<dependency>
345-
<groupId>commons-lang</groupId>
346-
<artifactId>commons-lang</artifactId>
347-
<version>${lang2.version}</version>
348-
</dependency>
349327
<dependency>
350328
<groupId>org.apache.commons</groupId>
351329
<artifactId>commons-lang3</artifactId>
@@ -488,12 +466,6 @@
488466
<groupId>org.apache.maven.reporting</groupId>
489467
<artifactId>maven-reporting-impl</artifactId>
490468
<version>${mavenReportingVersion}</version>
491-
<exclusions>
492-
<exclusion>
493-
<groupId>org.codehaus.plexus</groupId>
494-
<artifactId>plexus-container-default</artifactId>
495-
</exclusion>
496-
</exclusions>
497469
</dependency>
498470

499471
<dependency>
@@ -549,13 +521,6 @@
549521
<groupId>org.apache.maven.doxia</groupId>
550522
<artifactId>doxia-core</artifactId>
551523
<version>${doxiaVersion}</version>
552-
<exclusions>
553-
<!-- We don't need the plexus container default -->
554-
<exclusion>
555-
<groupId>org.codehaus.plexus</groupId>
556-
<artifactId>plexus-container-default</artifactId>
557-
</exclusion>
558-
</exclusions>
559524
</dependency>
560525
<dependency>
561526
<groupId>org.apache.maven.doxia</groupId>
@@ -567,16 +532,6 @@
567532
<artifactId>doxia-site-renderer</artifactId>
568533
<version>${doxiaSiteToolsVersion}</version>
569534
<exclusions>
570-
<!-- Using org.dom4j instead -->
571-
<exclusion>
572-
<groupId>dom4j</groupId>
573-
<artifactId>dom4j</artifactId>
574-
</exclusion>
575-
<!-- We don't need the plexus container default -->
576-
<exclusion>
577-
<groupId>org.codehaus.plexus</groupId>
578-
<artifactId>plexus-container-default</artifactId>
579-
</exclusion>
580535
<!-- We don't need doxia html (using html5) -->
581536
<exclusion>
582537
<groupId>org.apache.maven.doxia</groupId>
@@ -588,13 +543,6 @@
588543
<groupId>org.apache.maven.doxia</groupId>
589544
<artifactId>doxia-integration-tools</artifactId>
590545
<version>${doxiaSiteToolsVersion}</version>
591-
<exclusions>
592-
<!-- We don't need the plexus container default -->
593-
<exclusion>
594-
<groupId>org.codehaus.plexus</groupId>
595-
<artifactId>plexus-container-default</artifactId>
596-
</exclusion>
597-
</exclusions>
598546
</dependency>
599547

600548
<!-- plexus -->

‎src/it/common.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<plugin>
126126
<groupId>org.apache.maven.plugins</groupId>
127127
<artifactId>maven-site-plugin</artifactId>
128-
<version>@site.doxia1.plugin@</version>
128+
<version>@site.plugin@</version>
129129
</plugin>
130130
<plugin>
131131
<groupId>org.apache.maven.plugins</groupId>

‎src/it/empty/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<plugin>
4141
<groupId>org.apache.maven.plugins</groupId>
4242
<artifactId>maven-site-plugin</artifactId>
43-
<version>@site.doxia1.plugin@</version>
43+
<version>@site.plugin@</version>
4444
</plugin>
4545
<plugin>
4646
<groupId>org.apache.maven.plugins</groupId>

‎src/it/multi-build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-site-plugin</artifactId>
45-
<version>@site.doxia1.plugin@</version>
45+
<version>@site.plugin@</version>
4646
</plugin>
4747
</plugins>
4848
</build>

‎src/it/skipEmpty/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<plugin>
5757
<groupId>org.apache.maven.plugins</groupId>
5858
<artifactId>maven-site-plugin</artifactId>
59-
<version>@site.doxia1.plugin@</version>
59+
<version>@site.plugin@</version>
6060
</plugin>
6161
<plugin>
6262
<groupId>org.apache.maven.plugins</groupId>

‎src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -660,19 +660,6 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
660660
}
661661
}
662662

663-
@Override
664-
public void execute() {
665-
log.debug('****** SpotBugsMojo execute *******')
666-
667-
if (!skip) {
668-
executeCheck()
669-
if (canGenerateReport()) {
670-
Locale locale = Locale.getDefault()
671-
generateXDoc(locale)
672-
}
673-
}
674-
}
675-
676663
private void executeCheck() {
677664
log.debug('****** SpotBugsMojo executeCheck *******')
678665

0 commit comments

Comments
 (0)