Skip to content

Commit b17000c

Browse files
authored
Fix fluido skin plugin version inheritance from pom to src/site/site.xml (#771)
* Fix fluido skin version inheritence from pom to src/site/site.xml file. Upgrade a number of plugins and maybe one library. Fix some used undeclared and unused declared imports. * Restore two dependency changes I made per feedback from kwwall and upgrade a few more dependencies/plugins that have new versions since last commit. --------- Co-authored-by: Dave Wichers <[email protected]>
1 parent 3298247 commit b17000c

File tree

3 files changed

+26
-22
lines changed

3 files changed

+26
-22
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/target
33
/.settings/**
44
.classpath
5+
.java-version
56
.project
67
*.swp
78
*~

pom.xml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,16 @@
137137
<properties>
138138
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
139139
<version.jmh>1.36</version.jmh>
140+
<version.findsecbugs>1.12.0</version.findsecbugs>
141+
<version.fluido>1.11.1</version.fluido>
140142
<version.powermock>2.0.9</version.powermock>
141143
<version.spotbugs>4.7.3</version.spotbugs>
142-
<version.findsecbugs>1.12.0</version.findsecbugs>
143144
<version.spotbugs.maven>4.7.3.0</version.spotbugs.maven>
144-
<version.surefire>3.0.0-M7</version.surefire>
145+
<version.surefire>3.0.0-M9</version.surefire>
145146
<project.java.target>1.8</project.java.target>
146147
<!-- TODO: Be sure to update. Should be date of previous official release -->
147148
<!-- Exact date in the form 'yyyy-dd-yy 00:00:00' should be used. You can find the previous release date -->
148-
<!-- n the previous release notes file under the 'documentation/' directory. -->
149+
<!-- in the previous release notes file under the 'documentation/' directory. -->
149150
<date.prev_release>2022-07-20 00:00:00</date.prev_release>
150151
</properties>
151152

@@ -226,7 +227,7 @@
226227
<dependency>
227228
<groupId>commons-fileupload</groupId>
228229
<artifactId>commons-fileupload</artifactId>
229-
<version>1.4</version>
230+
<version>1.5</version>
230231
<exclusions>
231232
<!-- excluded because we directly import newer version. -->
232233
<exclusion>
@@ -406,12 +407,12 @@
406407
<plugin>
407408
<groupId>org.apache.maven.plugins</groupId>
408409
<artifactId>maven-assembly-plugin</artifactId>
409-
<version>3.4.2</version>
410+
<version>3.5.0</version>
410411
</plugin>
411412
<plugin>
412413
<groupId>org.apache.maven.plugins</groupId>
413414
<artifactId>maven-dependency-plugin</artifactId>
414-
<version>3.3.0</version>
415+
<version>3.5.0</version>
415416
</plugin>
416417
<plugin>
417418
<groupId>org.apache.maven.plugins</groupId>
@@ -421,7 +422,7 @@
421422
<plugin>
422423
<groupId>org.codehaus.mojo</groupId>
423424
<artifactId>versions-maven-plugin</artifactId>
424-
<version>2.13.0</version>
425+
<version>2.15.0</version>
425426
<configuration>
426427
<rulesUri>file:${project.basedir}/versionRuleset.xml</rulesUri>
427428
</configuration>
@@ -434,7 +435,7 @@
434435
<plugin>
435436
<groupId>org.cyclonedx</groupId>
436437
<artifactId>cyclonedx-maven-plugin</artifactId>
437-
<version>2.7.3</version>
438+
<version>2.7.5</version>
438439
<executions>
439440
<execution>
440441
<phase>package</phase>
@@ -516,7 +517,7 @@
516517
<plugin>
517518
<groupId>org.apache.maven.plugins</groupId>
518519
<artifactId>maven-deploy-plugin</artifactId>
519-
<version>3.0.0</version>
520+
<version>3.1.0</version>
520521
</plugin>
521522

522523
<plugin>
@@ -531,17 +532,17 @@
531532
<plugin>
532533
<groupId>org.apache.maven.plugins</groupId>
533534
<artifactId>maven-enforcer-plugin</artifactId>
534-
<version>3.1.0</version>
535+
<version>3.2.1</version>
535536
<dependencies>
536537
<dependency>
537538
<groupId>org.codehaus.mojo</groupId>
538539
<artifactId>extra-enforcer-rules</artifactId>
539-
<version>1.6.0</version>
540+
<version>1.6.1</version>
540541
</dependency>
541542
<dependency>
542543
<groupId>org.codehaus.mojo</groupId>
543544
<artifactId>animal-sniffer-enforcer-rule</artifactId>
544-
<version>1.21</version>
545+
<version>1.22</version>
545546
</dependency>
546547

547548
</dependencies>
@@ -640,7 +641,7 @@
640641
<plugin>
641642
<groupId>org.apache.maven.plugins</groupId>
642643
<artifactId>maven-javadoc-plugin</artifactId>
643-
<version>3.4.1</version>
644+
<version>3.5.0</version>
644645
<configuration>
645646
<source>8</source>
646647
<doclint>none</doclint>
@@ -664,13 +665,13 @@
664665
<plugin>
665666
<groupId>org.apache.maven.plugins</groupId>
666667
<artifactId>maven-pmd-plugin</artifactId>
667-
<version>3.19.0</version>
668+
<version>3.20.0</version>
668669
</plugin>
669670

670671
<plugin>
671672
<groupId>org.apache.maven.plugins</groupId>
672673
<artifactId>maven-project-info-reports-plugin</artifactId>
673-
<version>3.4.1</version>
674+
<version>3.4.2</version>
674675
</plugin>
675676

676677
<plugin>
@@ -684,12 +685,13 @@
684685
<groupId>org.apache.maven.plugins</groupId>
685686
<artifactId>maven-site-plugin</artifactId>
686687
<version>4.0.0-M3</version>
687-
</plugin>
688-
689-
<plugin>
690-
<groupId>org.apache.maven.skins</groupId>
691-
<artifactId>maven-fluid-skin</artifactId>
692-
<version>1.11.1</version>
688+
<dependencies>
689+
<dependency>
690+
<groupId>org.apache.maven.skins</groupId>
691+
<artifactId>maven-fluido-skin</artifactId>
692+
<version>${version.fluido}</version>
693+
</dependency>
694+
</dependencies>
693695
</plugin>
694696

695697
<plugin>
@@ -743,7 +745,7 @@
743745
<plugin>
744746
<groupId>org.owasp</groupId>
745747
<artifactId>dependency-check-maven</artifactId>
746-
<version>7.3.2</version>
748+
<version>8.1.0</version>
747749
<configuration>
748750
<failBuildOnCVSS>1.0</failBuildOnCVSS>
749751
<suppressionFiles>./suppressions.xml</suppressionFiles>

src/site/site.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<skin>
1010
<groupId>org.apache.maven.skins</groupId>
1111
<artifactId>maven-fluido-skin</artifactId>
12+
<version>${version.fluido}</version>
1213
</skin>
1314
<custom>
1415
<fluidoSkin>

0 commit comments

Comments
 (0)