Merge pull request #636 from m-dzianishchyts/CAY-2908-update-dependencies

CAY-2908 Update dependencies

Author: stariy95

docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java

@@ -125,7 +125,7 @@ protected String extractTableOfContents(Document document, String output) {
         tocDoc.select("div#toc").addClass("toc-side");
         String toc = tocDoc.body().html();
 
-        Object destDir = document.getOptions().get(Options.DESTINATION_DIR);
+        Object destDir = document.getOptions().get(Options.TO_DIR);
         Object docname = ((Map)document.getOptions().get(Options.ATTRIBUTES)).get("docname");
 
         Path path = FileSystems.getDefault().getPath((String) destDir, docname + ".toc.html");

docs/asciidoc/pom.xml

@@ -41,8 +41,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <asciidoctorj.version>2.5.12</asciidoctorj.version>
-        <asciidoctor.maven.plugin.version>2.2.6</asciidoctor.maven.plugin.version>
+        <asciidoctorj.version>3.0.1</asciidoctorj.version>
+        <asciidoctor.maven.plugin.version>3.2.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.pdf.version>2.1.4</asciidoctorj.pdf.version>
         <cayenne.version>${project.version}</cayenne.version>
         <cayenne.major.version>5.0</cayenne.major.version>
@@ -179,4 +179,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

pom.xml

@@ -38,12 +38,13 @@
 		<maven.build.timestamp.format>MMM dd yyyy HH:mm:ss</maven.build.timestamp.format>
 		<project.build.datetime>${maven.build.timestamp}</project.build.datetime>
 		<slf4j.version>1.7.36</slf4j.version>
-		<ant.version>1.10.12</ant.version>
-		<testcontainers.version>1.20.1</testcontainers.version>
-		<mysql.connector.version>9.2.0</mysql.connector.version>
+		<ant.version>1.10.15</ant.version>
+		<testcontainers.version>1.21.4</testcontainers.version>
+		<mysql.connector.version>9.5.0</mysql.connector.version>
+        <xmlunit.version>2.9.1</xmlunit.version>
 
-		<maven.compiler.target>11</maven.compiler.target>
-		<maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -331,12 +332,12 @@
 			<dependency>
 				<groupId>ognl</groupId>
 				<artifactId>ognl</artifactId>
-				<version>3.3.3</version>
+				<version>3.3.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-core</artifactId>
-				<version>5.3.37</version>
+				<version>5.3.39</version>
 				<scope>test</scope>
 				<exclusions>
 					<exclusion>
@@ -364,13 +365,19 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.18.0</version>
+				<version>3.20.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.velocity.tools</groupId>
 				<artifactId>velocity-tools-generic</artifactId>
 				<version>3.1</version>
 			</dependency>
+			<!-- Remove when velocity-tools-generic updates its commons-beanutils dependency. -->
+			<dependency>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils</artifactId>
+				<version>1.11.0</version>
+			</dependency>
 			<dependency>
 				<groupId>jgraph</groupId>
 				<artifactId>jgraph</artifactId>
@@ -390,13 +397,13 @@
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>4.6.1</version>
+				<version>4.11.0</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
-				<version>2.7.1</version>
+				<version>2.7.4</version>
 				<scope>test</scope>
 			</dependency>
 			<!-- Derby 10.16 requires Java 17, Derby 10.15 requires additional dependency - derbytools -->
@@ -415,13 +422,13 @@
 			<dependency>
 				<groupId>org.xmlunit</groupId>
 				<artifactId>xmlunit-matchers</artifactId>
-				<version>2.9.0</version>
+				<version>${xmlunit.version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.xmlunit</groupId>
 				<artifactId>xmlunit-jakarta-jaxb-impl</artifactId>
-				<version>2.9.0</version>
+				<version>${xmlunit.version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
@@ -440,7 +447,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-compress</artifactId>
-				<version>1.26.2</version>
+				<version>1.28.0</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>