updated Spring Boot to 2.6.0, Jackson to 2.13

Erudika · Nov 22, 2021 · e0baeff · e0baeff
1 parent ec34cb0
commit e0baeff
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/para-core/pom.xml b/para-core/pom.xml
@@ -12,7 +12,7 @@
 	<name>para-core</name>
 
 	<properties>
-		<jacksonVer>2.12.4</jacksonVer>
+		<jacksonVer>2.13.0</jacksonVer>
 		<flexmarkVer>0.62.2</flexmarkVer>
 	</properties>
 
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>io.github.classgraph</groupId>
 			<artifactId>classgraph</artifactId>
-			<version>4.8.114</version>
+			<version>4.8.131</version>
 		</dependency>
 
 		<!--	 INJECT & JAX-RS -->
@@ -191,7 +191,7 @@
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.14.2</version>
+			<version>1.14.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
@@ -229,6 +229,11 @@
 			<artifactId>flexmark-ext-autolink</artifactId>
 			<version>${flexmarkVer}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.vladsch.flexmark</groupId>
+			<artifactId>flexmark-ext-media-tags</artifactId>
+			<version>${flexmarkVer}</version>
+		</dependency>
 		<dependency>
 			<groupId>de.svenkubiak</groupId>
 			<artifactId>jBCrypt</artifactId>

diff --git a/para-core/src/main/java/com/erudika/para/persistence/MockDAO.java b/para-core/src/main/java/com/erudika/para/persistence/MockDAO.java
@@ -122,8 +122,8 @@ public <P extends ParaObject> List<P> readPage(String appid, Pager pager) {
 		String lastKey = pager.getLastKey();
 		boolean found = false;
 		int	i = 0;
-		Map<String, ParaObject> ordered_MAPS = new TreeMap<String, ParaObject>(getMap(appid));
-		for (String key : ordered_MAPS.keySet()) {
+		Map<String, ParaObject> orderedMAPS = new TreeMap<String, ParaObject>(getMap(appid));
+		for (String key : orderedMAPS.keySet()) {
 			if (lastKey != null && !found) {
 				found = key.equals(lastKey);
 			} else {

diff --git a/para-server/pom.xml b/para-server/pom.xml
@@ -12,7 +12,7 @@
 	<name>para-server</name>
 
 	<properties>
-		<springSecVer>5.5.2</springSecVer>
+		<springSecVer>5.5.3</springSecVer>
 		<springLdapVer>2.3.4.RELEASE</springLdapVer>
 	</properties>
 

diff --git a/para-server/src/main/java/com/erudika/para/queue/River.java b/para-server/src/main/java/com/erudika/para/queue/River.java
@@ -44,7 +44,10 @@
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,6 +68,7 @@ public abstract class River implements Runnable {
 	static {
 		int timeout = 10;
 		HTTP = HttpClientBuilder.create().
+				setConnectionReuseStrategy((HttpRequest hr, HttpResponse hr1, HttpContext hc) -> false).
 				setDefaultRequestConfig(RequestConfig.custom().
 						setConnectTimeout(timeout, TimeUnit.SECONDS).
 						setConnectionRequestTimeout(timeout, TimeUnit.SECONDS).

diff --git a/pom.xml b/pom.xml
@@ -83,8 +83,8 @@
 		<logbackVer>1.2.5</logbackVer>
 		<awsJdkVer>2.17.51</awsJdkVer>
 		<jerseyVer>2.35</jerseyVer>
-		<jettyVer>9.4.43.v20210629</jettyVer>
-		<springBootVer>2.5.4</springBootVer>
+		<jettyVer>9.4.44.v20210927</jettyVer>
+		<springBootVer>2.6.0</springBootVer>
 		<metricsVer>4.1.16</metricsVer>
 		<httpClientVer>5.1</httpClientVer>
 		<httpCoreVer>5.1.2</httpCoreVer>