diff --git a/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/NewClaim.java b/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/NewClaim.java index b122376ca..0350f7484 100644 --- a/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/NewClaim.java +++ b/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/NewClaim.java @@ -1,9 +1,9 @@ package org.finos.springbot.example.claim.expenses; -import javax.validation.constraints.Min; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.constraints.Min; + @Work public class NewClaim { diff --git a/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/OpenedClaim.java b/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/OpenedClaim.java index 77df0afb6..bf066407c 100644 --- a/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/OpenedClaim.java +++ b/demos/claim-bot/src/main/java/org/finos/springbot/example/claim/expenses/OpenedClaim.java @@ -1,12 +1,12 @@ package org.finos.springbot.example.claim.expenses; -import javax.validation.constraints.Min; - import org.finos.springbot.workflow.actions.Action; import org.finos.springbot.workflow.annotations.Display; import org.finos.springbot.workflow.annotations.Work; import org.finos.springbot.workflow.content.User; +import jakarta.validation.constraints.Min; + @Work public class OpenedClaim { diff --git a/demos/todo-bot/src/main/java/org/finos/springbot/example/todo/ToDoList.java b/demos/todo-bot/src/main/java/org/finos/springbot/example/todo/ToDoList.java index 49bca36a3..422a30082 100644 --- a/demos/todo-bot/src/main/java/org/finos/springbot/example/todo/ToDoList.java +++ b/demos/todo-bot/src/main/java/org/finos/springbot/example/todo/ToDoList.java @@ -6,11 +6,11 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.Valid; - import org.finos.springbot.workflow.annotations.RequiresUserList; import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.Valid; + /** * @author rupnsur * diff --git a/libs/chat-workflow-testing/pom.xml b/libs/chat-workflow-testing/pom.xml index 89b245cce..e2c23f137 100644 --- a/libs/chat-workflow-testing/pom.xml +++ b/libs/chat-workflow-testing/pom.xml @@ -14,8 +14,8 @@ - 1.8 - 1.8 + 17 + 17 @@ -24,14 +24,31 @@ chat-workflow 9.0.3-SNAPSHOT - - + - org.springframework.boot - spring-boot-starter-test - - + org.springframework.boot + spring-boot-starter-validation + + + + + + org.springframework.boot + spring-boot-starter-test + + + junit + junit + + + + + + org.junit.jupiter + junit-jupiter-engine + + diff --git a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObject.java b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObject.java index 4b37c1e43..0f237d565 100644 --- a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObject.java +++ b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObject.java @@ -1,10 +1,10 @@ package org.finos.springbot.tests.controller; -import javax.validation.constraints.Email; -import javax.validation.constraints.Size; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Size; + @Work() public class TestObject { diff --git a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObjects.java b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObjects.java index 300485484..efc0d6991 100644 --- a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObjects.java +++ b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/controller/TestObjects.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.Valid; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.Valid; + @Work() public class TestObjects { diff --git a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/form/Collection.java b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/form/Collection.java index 564b72427..143d4b3c3 100644 --- a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/form/Collection.java +++ b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/form/Collection.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.Valid; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.Valid; + @Work() public class Collection { diff --git a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/IntegerWork.java b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/IntegerWork.java index 58398beea..19dec07a0 100644 --- a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/IntegerWork.java +++ b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/IntegerWork.java @@ -1,10 +1,10 @@ package org.finos.springbot.tests.work; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; + @Work public class IntegerWork { diff --git a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/StringWork.java b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/StringWork.java index a57def85f..90edee60f 100644 --- a/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/StringWork.java +++ b/libs/chat-workflow-testing/src/main/java/org/finos/springbot/tests/work/StringWork.java @@ -1,10 +1,10 @@ package org.finos.springbot.tests.work; -import javax.validation.constraints.Pattern; - import org.finos.springbot.workflow.annotations.Work; import org.hibernate.validator.constraints.Length; +import jakarta.validation.constraints.Pattern; + @Work public class StringWork { diff --git a/libs/chat-workflow/pom.xml b/libs/chat-workflow/pom.xml index 44ee2d98a..008eba6a7 100644 --- a/libs/chat-workflow/pom.xml +++ b/libs/chat-workflow/pom.xml @@ -16,8 +16,8 @@ - 1.8 - 1.8 + 17 + 17 @@ -25,10 +25,6 @@ org.springframework.boot spring-boot-starter-validation - - javax.validation - validation-api - org.springframework.boot diff --git a/libs/entity-json/pom.xml b/libs/entity-json/pom.xml index 6ff8be682..a8bea9c55 100644 --- a/libs/entity-json/pom.xml +++ b/libs/entity-json/pom.xml @@ -15,8 +15,8 @@ - 1.8 - 1.8 + 17 + 17 diff --git a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml index 9d16ec6cd..12f17e18f 100644 --- a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml +++ b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml @@ -14,8 +14,8 @@ - 1.8 - 1.8 + 17 + 17 diff --git a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/controller/SymphonyHandlerMappingTest.java b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/controller/SymphonyHandlerMappingTest.java index 520a8d7a7..f26dc42e9 100644 --- a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/controller/SymphonyHandlerMappingTest.java +++ b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/controller/SymphonyHandlerMappingTest.java @@ -1,12 +1,11 @@ package org.finos.springbot.symphony.controller; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.symphony.bdk.core.service.message.MessageService; -import com.symphony.bdk.core.service.message.model.Attachment; -import com.symphony.bdk.gen.api.model.*; -import com.symphony.bdk.spring.events.RealTimeEvent; +import static org.mockito.Mockito.atMost; + +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; + import org.finos.springbot.entityjson.EntityJson; import org.finos.springbot.symphony.SymphonyMockConfiguration; import org.finos.springbot.symphony.SymphonyWorkflowConfig; @@ -36,11 +35,20 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.util.StreamUtils; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.symphony.bdk.core.service.message.MessageService; +import com.symphony.bdk.core.service.message.model.Attachment; +import com.symphony.bdk.gen.api.model.StreamType; +import com.symphony.bdk.gen.api.model.V4Initiator; +import com.symphony.bdk.gen.api.model.V4Message; +import com.symphony.bdk.gen.api.model.V4MessageSent; +import com.symphony.bdk.gen.api.model.V4Stream; +import com.symphony.bdk.gen.api.model.V4SymphonyElementsAction; +import com.symphony.bdk.gen.api.model.V4User; +import com.symphony.bdk.spring.events.RealTimeEvent; -import static org.mockito.Mockito.atMost; @SpringBootTest(classes = { diff --git a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObject.java b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObject.java index 0a8a3359c..be43687ea 100644 --- a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObject.java +++ b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObject.java @@ -1,10 +1,10 @@ package org.finos.springbot.symphony.history; -import javax.validation.constraints.Email; -import javax.validation.constraints.Size; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Size; + @Work() public class TestObject { diff --git a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObjects.java b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObjects.java index da7f3b663..088390031 100644 --- a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObjects.java +++ b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/history/TestObjects.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.Valid; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.Valid; + @Work() public class TestObjects { diff --git a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBean.java b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBean.java index 3fbd0bcdd..9c3afe399 100644 --- a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBean.java +++ b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBean.java @@ -1,10 +1,10 @@ package org.finos.springbot.symphony.json; -import javax.validation.constraints.Email; -import javax.validation.constraints.Size; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Size; + @Work() public class TestBean { diff --git a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBeans.java b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBeans.java index 7563a3220..eb18d28c7 100644 --- a/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBeans.java +++ b/libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/symphony/json/TestBeans.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.Valid; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.Valid; + @Work() public class TestBeans { diff --git a/libs/symphony/entities/pom.xml b/libs/symphony/entities/pom.xml index edb6c9c50..f7b9eb63e 100644 --- a/libs/symphony/entities/pom.xml +++ b/libs/symphony/entities/pom.xml @@ -15,8 +15,8 @@ - 1.8 - 1.8 + 17 + 17 diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml b/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml index 03bb53583..396232e4a 100644 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml @@ -14,8 +14,8 @@ - 1.8 - 1.8 + 17 + 17 @@ -32,6 +32,7 @@ ${teams.version} compile + com.microsoft.bot bot-azure @@ -43,6 +44,14 @@ org.json json + + com.azure + azure-storage-blob + + + com.google.guava + guava + @@ -50,8 +59,31 @@ bot-builder ${teams.version} compile + + + com.squareup.okio + okio-jvm + + + com.google.guava + guava + + - + + + com.azure + azure-storage-blob + ${azure-storage-blob.version} + + + + com.squareup.okio + okio-jvm + ${okio-jvm.version} + + org.jsoup @@ -66,12 +98,18 @@ ${graalvm.version} - + org.springframework.boot spring-boot-starter-thymeleaf + + com.google.guava + guava + ${guava.version} + diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/templating/thymeleaf/ThymeleafEngineConfig.java b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/templating/thymeleaf/ThymeleafEngineConfig.java index 63826355e..80fb2e171 100644 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/templating/thymeleaf/ThymeleafEngineConfig.java +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/templating/thymeleaf/ThymeleafEngineConfig.java @@ -9,8 +9,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.thymeleaf.dialect.IDialect; -import org.thymeleaf.spring5.ISpringTemplateEngine; -import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring6.ISpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; import org.thymeleaf.templateresolver.ITemplateResolver; @Configuration diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/templating/thymeleaf/ThymeleafTemplateProvider.java b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/templating/thymeleaf/ThymeleafTemplateProvider.java index b2e8277ba..7fddc398f 100644 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/templating/thymeleaf/ThymeleafTemplateProvider.java +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/templating/thymeleaf/ThymeleafTemplateProvider.java @@ -19,7 +19,7 @@ import org.springframework.util.StreamUtils; import org.thymeleaf.TemplateSpec; import org.thymeleaf.context.Context; -import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templateresolver.StringTemplateResolver; diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/teams/history/TestObject.java b/libs/teams/teams-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/teams/history/TestObject.java index b975d4d0a..fac6ad4f5 100644 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/teams/history/TestObject.java +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/teams/history/TestObject.java @@ -1,10 +1,10 @@ package org.finos.springbot.teams.history; -import javax.validation.constraints.Email; -import javax.validation.constraints.Size; - import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Size; + @Work() public class TestObject { diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/teams/history/TestObjects.java b/libs/teams/teams-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/teams/history/TestObjects.java index fa3f708a9..4122d825d 100644 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/teams/history/TestObjects.java +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/src/test/java/org/finos/springbot/teams/history/TestObjects.java @@ -1,13 +1,11 @@ package org.finos.springbot.teams.history; -import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; -import org.finos.springbot.workflow.annotations.ChatRequest; import org.finos.springbot.workflow.annotations.Work; -import org.finos.springbot.workflow.content.Word; -import java.util.ArrayList; -import java.util.List; +import jakarta.validation.Valid; @Work() public class TestObjects { diff --git a/pom.xml b/pom.xml index a16cfe1a0..60e0642ad 100644 --- a/pom.xml +++ b/pom.xml @@ -49,22 +49,27 @@ UTF-8 - 2.7.10 - 1.8 - 1.8 - 1.8 + 3.1.8 + 17 + 17 + 17 - 2.14.2 - 2.14.2 + 2.16.2 + 2.16.2 + 2.16.2 4.4.0 1.3.5 1.15.0 4.14.3 - 1.14.3 - 21.2.0 - 2.12.0 - 1.9.15 + 12.20.1 + 3.4.0 + 32.1.0-jre + 1.17.2 + 23.0.3 + 3.0.0 + + @@ -206,18 +211,30 @@ - + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + com.fasterxml.jackson.core jackson-core ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-annotations.version} + org.springframework.boot @@ -248,9 +265,10 @@ org.yaml snakeyaml - 2.0 - - + 2.2 + + + diff --git a/tools/poll-bot/src/main/java/org/finos/springbot/tool/poll/poll/PollCreateForm.java b/tools/poll-bot/src/main/java/org/finos/springbot/tool/poll/poll/PollCreateForm.java index 3df9c0a93..31aab3bc8 100644 --- a/tools/poll-bot/src/main/java/org/finos/springbot/tool/poll/poll/PollCreateForm.java +++ b/tools/poll-bot/src/main/java/org/finos/springbot/tool/poll/poll/PollCreateForm.java @@ -2,13 +2,13 @@ import java.time.temporal.ChronoUnit; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - import org.apache.commons.lang3.StringUtils; import org.finos.springbot.workflow.annotations.Template; import org.finos.springbot.workflow.annotations.Work; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; + @Work @Template(edit="poll-create-form") diff --git a/tools/reminder-bot/src/main/java/org/finos/springbot/tool/reminders/TimeFinder.java b/tools/reminder-bot/src/main/java/org/finos/springbot/tool/reminders/TimeFinder.java index 3f4632381..f933d754b 100644 --- a/tools/reminder-bot/src/main/java/org/finos/springbot/tool/reminders/TimeFinder.java +++ b/tools/reminder-bot/src/main/java/org/finos/springbot/tool/reminders/TimeFinder.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.Properties; -import javax.annotation.PostConstruct; - import org.finos.springbot.workflow.actions.Action; import org.finos.springbot.workflow.actions.SimpleMessageAction; import org.finos.springbot.workflow.actions.consumers.AbstractActionConsumer; @@ -31,6 +29,7 @@ import edu.stanford.nlp.pipeline.StanfordCoreNLP; import edu.stanford.nlp.time.TimeAnnotations; import edu.stanford.nlp.time.Timex; +import jakarta.annotation.PostConstruct; public class TimeFinder extends AbstractActionConsumer { diff --git a/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/FeedLoader.java b/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/FeedLoader.java index fa1287edf..f121b1abd 100644 --- a/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/FeedLoader.java +++ b/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/FeedLoader.java @@ -5,11 +5,6 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.Status.Family; - import org.finos.springbot.tool.rssbot.ProxyProperties; import org.finos.springbot.tool.rssbot.feed.Feed; import org.slf4j.Logger; @@ -21,6 +16,11 @@ import com.rometools.rome.io.SyndFeedInput; import com.rometools.rome.io.XmlReader; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status.Family; + public class FeedLoader { public static final Logger LOG = LoggerFactory.getLogger(FeedLoader.class); diff --git a/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/JerseyApiBuilder.java b/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/JerseyApiBuilder.java index 0bc417ff3..e2aa59734 100644 --- a/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/JerseyApiBuilder.java +++ b/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/JerseyApiBuilder.java @@ -5,9 +5,6 @@ import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; import org.glassfish.jersey.client.ClientConfig; @@ -15,6 +12,10 @@ import org.glassfish.jersey.client.JerseyClientBuilder; import org.glassfish.jersey.media.multipart.MultiPartFeature; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; + /** * Provides a basic Jersey client creation wrapper which includes: *
    @@ -65,7 +66,7 @@ public WebTarget newWebTarget() { protected void registerFeatures(JerseyClientBuilder jcb) { jcb.register(MultiPartFeature.class); - jcb.register(LenientJacksonJsonProvider.class); + //jcb.register(LenientJacksonJsonProvider.class); } protected SSLContext createSSLContext() throws NoSuchAlgorithmException, KeyManagementException { diff --git a/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/LenientJacksonJsonProvider.java b/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/LenientJacksonJsonProvider.java index 68b28b346..a2e7cd0c1 100644 --- a/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/LenientJacksonJsonProvider.java +++ b/tools/rss-bot/src/main/java/org/finos/springbot/tool/rssbot/load/LenientJacksonJsonProvider.java @@ -1,6 +1,5 @@ package org.finos.springbot.tool.rssbot.load; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; /** @@ -12,11 +11,11 @@ * @author robmoffat * */ -public class LenientJacksonJsonProvider extends JacksonJsonProvider { - - public LenientJacksonJsonProvider() { - super(); - configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - } - -} +/* + * public class LenientJacksonJsonProvider extends JacksonJsonProvider { + * + * public LenientJacksonJsonProvider() { super(); + * //configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } + * + * } + */ \ No newline at end of file