Bump spring versions

madama · Jun 16, 2021 · 026b033 · 026b033
1 parent b2cc5f3
commit 026b033
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,18 +3,20 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.etalia</groupId>
 	<artifactId>jalia-spring-boot</artifactId>
-	<version>0.5.7</version>
+	<version>0.5.8</version>
 	<packaging>jar</packaging>
 	<url>https://github.com/madama/jalia-spring-boot</url>
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
+		<springboot.version>2.5.1</springboot.version>
+		<springframework.version>5.3.8</springframework.version>
 	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>net.etalia</groupId>
 			<artifactId>jalia</artifactId>
-			<version>0.5.7</version>
+			<version>0.5.8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.orbit</groupId>
@@ -25,13 +27,13 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot</artifactId>
-			<version>2.1.0.RELEASE</version>
+			<version>${springboot.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
-			<version>2.1.0.RELEASE</version>
+			<version>${springboot.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -43,31 +45,31 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>5.1.2.RELEASE</version>
+			<version>${springframework.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>5.1.2.RELEASE</version>
+			<version>${springframework.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-			<version>5.1.2.RELEASE</version>
+			<version>${springframework.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons</artifactId>
-			<version>2.1.2.RELEASE</version>
+			<version>2.5.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-core</artifactId>
-			<version>3.2.2.RELEASE</version>
+			<version>3.4.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/src/main/java/net/etalia/jalia/boot/JaliaJsonEncoder.java b/src/main/java/net/etalia/jalia/boot/JaliaJsonEncoder.java
@@ -83,6 +83,12 @@ protected Charset getJsonEncoding(@Nullable MimeType mimeType) {
         return charset;
     }
 
+    @Override
+    public DataBuffer encodeValue(Object value, DataBufferFactory bufferFactory, ResolvableType valueType, MimeType mimeType,
+            Map<String, Object> hints) {
+        Charset encoding = getJsonEncoding(mimeType);
+        return encodeValue(value, mimeType, bufferFactory, valueType, hints, encoding);
+    }
 
     private DataBuffer encodeValue(Object value, @Nullable MimeType mimeType, DataBufferFactory bufferFactory,
             ResolvableType elementType, @Nullable Map<String, Object> hints, Charset encoding) {