Bumped dependencies

SymphonyPlatformSolutions · Jan 2, 2024 · b0a5ab9 · b0a5ab9
1 parent beb304c
commit b0a5ab9
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -16,7 +16,9 @@ jobs:
         java-version: 17
         cache: maven
 
-    - run: mvn package
+    - run: |
+        printf "testcontainers.reuse.enable=true" > ~/.testcontainers.properties
+        ./mvnw clean package
 
     - uses: codecov/codecov-action@v3
       env:

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ rsa/
 target/
 deploy/
 datafeed.id
-application-*.y*ml
+application-dev.y*ml
 
 ######################
 # Maven Wrapper

diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
             <dependency>
                 <groupId>org.finos.symphony.bdk</groupId>
                 <artifactId>symphony-bdk-bom</artifactId>
-                <version>3.0.0-RC4</version>
+                <version>3.0.0.RC6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.finos.symphony.bdk</groupId>
             <artifactId>symphony-bdk-test-spring-boot</artifactId>
-            <version>3.0.0-RC4</version>
+            <version>3.0.0.RC6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -87,6 +87,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -128,10 +129,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/test/java/com/symphony/devrel/pollbot/BaseTest.java b/src/test/java/com/symphony/devrel/pollbot/BaseTest.java
@@ -6,6 +6,7 @@
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
+import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD;
 import com.symphony.bdk.core.service.message.MessageService;
 import com.symphony.bdk.core.service.message.model.Message;
 import com.symphony.bdk.core.service.stream.StreamService;
@@ -23,19 +24,19 @@
 import com.symphony.bdk.test.spring.annotation.SymphonyBdkSpringBootTest;
 import com.symphony.devrel.pollbot.repository.PollRepository;
 import com.symphony.devrel.pollbot.repository.PollVoteRepository;
+import org.junit.jupiter.api.AfterEach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.junit.jupiter.Container;
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 
+@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD)
 @SymphonyBdkSpringBootTest
-@Testcontainers
-@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public class BaseTest {
     @Autowired
     MessageService messages;
@@ -56,12 +57,22 @@ public class BaseTest {
     final V4Stream imStream = new V4Stream().streamType("IM").streamId("my-im");
     final V4Stream roomStream = new V4Stream().streamType("ROOM").streamId("my-room");
 
+    @Container
+    static MongoDBContainer mongodb = new MongoDBContainer("mongo:6").withReuse(true);
+
+    static {
+        mongodb.start();
+    }
+
     @DynamicPropertySource
-    @SuppressWarnings("resource")
     public static void setDatasourceProperties(final DynamicPropertyRegistry registry) {
-        MongoDBContainer container = new MongoDBContainer("mongo:6");
-        container.start();
-        registry.add("spring.data.mongodb.uri", container::getReplicaSetUrl);
+        registry.add("spring.data.mongodb.uri", mongodb::getReplicaSetUrl);
+    }
+
+    @AfterEach
+    void afterEach() {
+        pollRepo.deleteAll();
+        pollVoteRepo.deleteAll();
     }
 
     void mockAllMessageSends() {

diff --git a/src/test/resources/application-integration-test.yaml b/src/test/resources/application-integration-test.yaml
@@ -0,0 +1,3 @@
+spring:
+  jmx.enabled: false
+  main.banner-mode: off