Skip to content

Commit 27b86e0

Browse files
Java8 - clean up pom.xml
- Removing comments listing java 8 restrictions - Removing Java8 specific profile, and toggles based on that profile criteria. - De-duplicating declarations of maven-versions-plugin between plugins and pluginManagement
1 parent 6526668 commit 27b86e0

File tree

1 file changed

+1
-49
lines changed

1 file changed

+1
-49
lines changed

pom.xml

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@
217217
<dependency>
218218
<groupId>commons-fileupload</groupId>
219219
<artifactId>commons-fileupload</artifactId>
220-
<!-- Upgrading to 1.4 causes this test case failure: [ERROR] HTTPUtilitiesTest.testGetFileUploads:259. TODO: Figure out why, and fix. -->
221220
<version>1.4</version>
222221
<exclusions>
223222
<!-- excluded because we directly import newer version. -->
@@ -235,7 +234,6 @@
235234
<dependency>
236235
<groupId>org.apache.commons</groupId>
237236
<artifactId>commons-collections4</artifactId>
238-
<!-- Using 4.2 because 4.3 requires Java 8. Trying to make sure ESAPI supports Java 7+ -->
239237
<version>4.4</version>
240238
</dependency>
241239
<dependency>
@@ -287,8 +285,6 @@
287285
<dependency>
288286
<groupId>commons-io</groupId>
289287
<artifactId>commons-io</artifactId>
290-
<!-- Note: commons-io:2.7 and later require Java 8, so can't upgrade past 2.6 -->
291-
<!-- This means still possible exposure to CVE-2021-29425. -->
292288
<version>2.11.0</version>
293289
</dependency>
294290

@@ -748,13 +744,6 @@
748744
<artifactId>jdepend-maven-plugin</artifactId>
749745
<version>2.0</version>
750746
</plugin>
751-
752-
<plugin>
753-
<groupId>org.codehaus.mojo</groupId>
754-
<artifactId>versions-maven-plugin</artifactId>
755-
<version>2.8.1</version>
756-
</plugin>
757-
758747
<plugin>
759748
<groupId>org.eluder.coveralls</groupId>
760749
<artifactId>coveralls-maven-plugin</artifactId>
@@ -771,9 +760,6 @@
771760
</configuration>
772761
<executions>
773762
<execution>
774-
<!-- This version of Dep Ck requires Java 8. So only run it if using Java 8 or greater.
775-
This property set in a profile below. -->
776-
<phase>${PhaseIfJava8plus}</phase>
777763
<goals>
778764
<goal>check</goal>
779765
</goals>
@@ -875,41 +861,7 @@
875861
</reporting>
876862

877863
<profiles>
878-
<profile>
879-
<id>Java8plus</id>
880-
<activation>
881-
<jdk>[1.8,)</jdk>
882-
</activation>
883-
<properties>
884-
<PhaseIfJava8plus>site</PhaseIfJava8plus>
885-
</properties>
886-
887-
<reporting>
888-
<plugins>
889-
890-
<!-- Run SpotBugs with the FindSecBugs plugin and include results in site report.
891-
Is put in this profile as SpotBugs requires Java 8+ -->
892-
<plugin>
893-
<groupId>com.github.spotbugs</groupId>
894-
<artifactId>spotbugs-maven-plugin</artifactId>
895-
<configuration>
896-
<plugins>
897-
<plugin>
898-
<groupId>com.h3xstream.findsecbugs</groupId>
899-
<artifactId>findsecbugs-plugin</artifactId>
900-
<version>1.10.1</version>
901-
</plugin>
902-
</plugins>
903-
<effort>Max</effort>
904-
<relaxed>false</relaxed>
905-
</configuration>
906-
</plugin>
907-
</plugins>
908-
</reporting>
909-
910-
</profile>
911-
912-
<profile>
864+
<profile>
913865
<!-- Activate to sign jars and build distributable download. -->
914866
<id>dist</id>
915867

0 commit comments

Comments
 (0)