|
639 | 639 | <dependency> |
640 | 640 | <groupId>org.slf4j</groupId> |
641 | 641 | <artifactId>slf4j-reload4j</artifactId> |
642 | | - <!-- version 2.0.3+ requires Java 8 --> |
643 | | - <version>1.7.36</version> |
| 642 | + <version>2.0.7</version> |
644 | 643 | </dependency> |
645 | 644 |
|
646 | 645 | <dependency> |
|
741 | 740 | <version>${version.apache-shared-ldap}</version> |
742 | 741 | </dependency> |
743 | 742 |
|
744 | | - <!-- v5.2 of these two httpcomponents libs require Java 8 --> |
745 | 743 | <dependency> |
746 | 744 | <groupId>org.apache.httpcomponents.client5</groupId> |
747 | 745 | <artifactId>httpclient5</artifactId> |
748 | | - <version>5.1.4</version> |
| 746 | + <version>5.2.1</version> |
749 | 747 | </dependency> |
750 | 748 |
|
751 | 749 | <dependency> |
752 | 750 | <groupId>org.apache.httpcomponents.core5</groupId> |
753 | 751 | <artifactId>httpcore5</artifactId> |
754 | | - <version>5.1.5</version> |
| 752 | + <version>5.2.1</version> |
755 | 753 | </dependency> |
756 | 754 |
|
757 | 755 | <dependency> |
|
784 | 782 | <dependency> |
785 | 783 | <groupId>org.hsqldb</groupId> |
786 | 784 | <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> |
789 | 787 | </dependency> |
790 | 788 |
|
791 | 789 | <dependency> |
792 | 790 | <groupId>org.owasp.esapi</groupId> |
793 | 791 | <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> |
796 | 793 | </dependency> |
797 | 794 |
|
798 | 795 | <dependency> |
|
936 | 933 | <rules> |
937 | 934 | <enforceBytecodeVersion> |
938 | 935 | <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> |
944 | 937 | </enforceBytecodeVersion> |
945 | 938 | </rules> |
946 | 939 | <fail>warn</fail> |
|
955 | 948 | <rules> |
956 | 949 | <requireJavaVersion> |
957 | 950 | <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> |
959 | 952 | </requireJavaVersion> |
960 | 953 | </rules> |
961 | 954 | </configuration> |
|
1150 | 1143 |
|
1151 | 1144 | <!-- apply a specific flavor of google-java-format --> |
1152 | 1145 | <googleJavaFormat> |
1153 | | - <version>${project.java.target}</version> |
| 1146 | + <version>1.7</version> |
1154 | 1147 | <style>AOSP</style> |
1155 | 1148 | </googleJavaFormat> |
1156 | 1149 | </java> |
|
1208 | 1201 | <properties> |
1209 | 1202 | <failOnMissingWebXml>false</failOnMissingWebXml> |
1210 | 1203 | <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> |
1212 | 1205 | <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
1213 | 1206 | <maven.war.webxml>${basedir}/src/config/web.xml</maven.war.webxml> |
1214 | 1207 | <!-- 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 | 1226 | <version.hibernate>3.6.10.Final</version.hibernate> |
1234 | 1227 | <version.spotbugs.maven>4.7.3.4</version.spotbugs.maven> |
1235 | 1228 | <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> |
1240 | 1234 | <tomcat.url>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${version.tomcat}/bin/apache-tomcat-${version.tomcat}.zip</tomcat.url> |
1241 | 1235 | </properties> |
1242 | 1236 |
|
|
0 commit comments