Skip to content

Commit c2a396a

Browse files
committed
Move up to a minimum Java 8 requirement and upgrade all dependencies
and plugins with newer versions that required Java 8.
1 parent ca8c16a commit c2a396a

File tree

1 file changed

+15
-21
lines changed

1 file changed

+15
-21
lines changed

pom.xml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -639,8 +639,7 @@
639639
<dependency>
640640
<groupId>org.slf4j</groupId>
641641
<artifactId>slf4j-reload4j</artifactId>
642-
<!-- version 2.0.3+ requires Java 8 -->
643-
<version>1.7.36</version>
642+
<version>2.0.7</version>
644643
</dependency>
645644

646645
<dependency>
@@ -741,17 +740,16 @@
741740
<version>${version.apache-shared-ldap}</version>
742741
</dependency>
743742

744-
<!-- v5.2 of these two httpcomponents libs require Java 8 -->
745743
<dependency>
746744
<groupId>org.apache.httpcomponents.client5</groupId>
747745
<artifactId>httpclient5</artifactId>
748-
<version>5.1.4</version>
746+
<version>5.2.1</version>
749747
</dependency>
750748

751749
<dependency>
752750
<groupId>org.apache.httpcomponents.core5</groupId>
753751
<artifactId>httpcore5</artifactId>
754-
<version>5.1.5</version>
752+
<version>5.2.1</version>
755753
</dependency>
756754

757755
<dependency>
@@ -784,15 +782,14 @@
784782
<dependency>
785783
<groupId>org.hsqldb</groupId>
786784
<artifactId>hsqldb</artifactId>
787-
<!-- <version>2.7.1</version> 2.6.0+ requires Java 11. 2.3.6 is last version to support Java 7. 2.5.x versions support Java 8 -->
788-
<version>2.3.6</version>
785+
<!-- <version>2.7.1</version> 2.6.0+ requires Java 11. -->
786+
<version>2.5.2</version>
789787
</dependency>
790788

791789
<dependency>
792790
<groupId>org.owasp.esapi</groupId>
793791
<artifactId>esapi</artifactId>
794-
<!-- <version>2.4.0.0+</version> Is available, but requires Java 8. 2.3.0.0 is last version to support Java 7. -->
795-
<version>2.3.0.0</version>
792+
<version>2.5.2.0</version>
796793
</dependency>
797794

798795
<dependency>
@@ -936,11 +933,7 @@
936933
<rules>
937934
<enforceBytecodeVersion>
938935
<maxJdkVersion>${project.java.target}</maxJdkVersion>
939-
<excludes>
940-
<!-- guava includes backports for Java 7 compatibility -->
941-
<exclude>com.google.guava:guava</exclude>
942-
</excludes>
943-
<message>Dependencies shouldn't require Java 8+.</message>
936+
<message>Dependencies shouldn't require Java 9+.</message>
944937
</enforceBytecodeVersion>
945938
</rules>
946939
<fail>warn</fail>
@@ -955,7 +948,7 @@
955948
<rules>
956949
<requireJavaVersion>
957950
<version>${project.java.target}</version>
958-
<message>Benchmark is currently written to support Java 7 and 8.</message>
951+
<message>Benchmark is currently written to support Java 8+.</message>
959952
</requireJavaVersion>
960953
</rules>
961954
</configuration>
@@ -1150,7 +1143,7 @@
11501143

11511144
<!-- apply a specific flavor of google-java-format -->
11521145
<googleJavaFormat>
1153-
<version>${project.java.target}</version>
1146+
<version>1.7</version>
11541147
<style>AOSP</style>
11551148
</googleJavaFormat>
11561149
</java>
@@ -1208,7 +1201,7 @@
12081201
<properties>
12091202
<failOnMissingWebXml>false</failOnMissingWebXml>
12101203
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1211-
<project.java.target>1.7</project.java.target>
1204+
<project.java.target>1.8</project.java.target>
12121205
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
12131206
<maven.war.webxml>${basedir}/src/config/web.xml</maven.war.webxml>
12141207
<!-- runenv defaults to local here. But scripts can set this to 'remote' to launch remotely accessible Benchmark. e.g., mvn clean package cargo:run -Pdeploy1.2 -Drunenv=remote -->
@@ -1233,10 +1226,11 @@
12331226
<version.hibernate>3.6.10.Final</version.hibernate>
12341227
<version.spotbugs.maven>4.7.3.4</version.spotbugs.maven>
12351228
<version.spotbugs>4.7.3</version.spotbugs>
1236-
<version.springframework>4.3.30.RELEASE</version.springframework>
1237-
<!-- tomcat 8.5 is last version to support Java 7. Tomcat 9+ requires Java 8. -->
1238-
<tomcat.major.version>8</tomcat.major.version>
1239-
<version.tomcat>8.5.84</version.tomcat>
1229+
<!-- Spring 6.x requires Java 17 -->
1230+
<version.springframework>5.3.27</version.springframework>
1231+
<!-- Tomcat 10 moves from Java EE to Jakarta EE, moving packages javax.* to jakarta.* - code changes likely required to address this change. -->
1232+
<tomcat.major.version>9</tomcat.major.version>
1233+
<version.tomcat>9.0.74</version.tomcat>
12401234
<tomcat.url>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${version.tomcat}/bin/apache-tomcat-${version.tomcat}.zip</tomcat.url>
12411235
</properties>
12421236

0 commit comments

Comments
 (0)