yesamer commented on code in PR #6686:
URL:
https://github.com/apache/incubator-kie-drools/pull/6686#discussion_r3224642862
##########
build-parent/pom.xml:
##########
@@ -121,15 +122,15 @@
<version.jakarta.json-api>2.1.3</version.jakarta.json-api>
<version.org.apache.openjpa>4.0.0</version.org.apache.openjpa>
<version.org.jpmml.model>1.6.4</version.org.jpmml.model> <!-- jpmml-model
BSD 3C license - ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works
with 1.5.1 -->
- <version.org.junit.jupiter>5.13.4</version.org.junit.jupiter>
- <version.org.junit.platform>1.13.4</version.org.junit.platform> <!-- Keep
synchronized with junit-jupiter (middle and minor should be the same) -->
+ <version.org.junit.jupiter>6.0.3</version.org.junit.jupiter>
+ <version.org.junit.platform>6.0.3</version.org.junit.platform> <!-- JUnit
6 unified versioning: platform shares the jupiter version, managed by junit-bom
6.0.3 -->
Review Comment:
@nrknithin In this case, I guess we can use a single entry for both, WDYT?
##########
drools-model/drools-model-codegen/src/main/resources/class-templates/ruleunits/RestObjectMapperSpringTemplate.java:
##########
@@ -18,43 +18,56 @@
*/
package $Package$;
-import java.util.List;
-
import java.io.IOException;
import java.util.List;
-import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.type.CollectionType;
import org.drools.ruleunits.api.DataSource;
import org.drools.ruleunits.api.DataStore;
import org.drools.ruleunits.api.DataStream;
import org.drools.ruleunits.api.SingletonStore;
-import
org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.boot.SpringBootConfiguration;
+import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.http.MediaType;
+import
org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+// TODO Jackson 3 migration: drop this shim when the Spring add-ons move to
tools.jackson.databind.*.
@SpringBootConfiguration
public class RestObjectMapper {
+ public RestObjectMapper(ObjectMapper objectMapper) {
+ SimpleModule module = new SimpleModule();
+ module.addDeserializer(DataStream.class, new DataStreamDeserializer());
+ module.addDeserializer(DataStore.class, new DataStoreDeserializer());
+ module.addDeserializer(SingletonStore.class, new
SingletonStoreDeserializer());
+ objectMapper.registerModule(module);
+ }
+
+ // TODO Jackson 3 migration: SB 4 no longer auto-registers a Jackson 2
HTTP converter; register one
Review Comment:
@nrknithin Is this TODO still needed?
##########
build-parent/pom.xml:
##########
@@ -1342,6 +1343,13 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- CVE fix: use at.yawk.lz4:lz4-java instead of org.lz4:lz4-java -->
+ <dependency>
+ <groupId>at.yawk.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
+ <version>${version.at.yawk.lz4.java}</version>
Review Comment:
@nrknithin IS this required for SPringBoot4 of for a CVE?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
