Update build dependencies (#250)

* Update build dependencies --------- Co-authored-by: Mark Price <[email protected]> Co-authored-by: ras-rm-pr-bot <[email protected]>
ONSdigital · Feb 21, 2024 · 5e2e055 · 5e2e055
1 parent 32265c1
commit 5e2e055
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,7 +54,7 @@ jobs:
         run: |
           export LD_LIBRARY_PATH=/usr/local/lib
           mvn fmt:check
-          mvn clean verify
+          mvn clean -DskipITs verify
 
       - name: pr docker tag
         if: github.ref != 'refs/heads/main'

diff --git a/_infra/helm/sample/Chart.yaml b/_infra/helm/sample/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 13.0.15
+version: 13.0.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 13.0.15
+appVersion: 13.0.16
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,38 +1,55 @@
 
 version: '2'
 services:
+
   postgres:
     container_name: postgres-it
-    image: sdcplatform/ras-rm-docker-postgres
+    image: eu.gcr.io/ons-rasrmbs-management/postgres
+    command: postgres -c 'max_connections=1000'
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=postgres
     ports:
-      - "36432:5432"
+      - "15432:5432"
 
   party-service:
     container_name: party-service-it
-    image: sdcplatform/ras-party
+    image: eu.gcr.io/ons-rasrmbs-management/party
     external_links:
       - postgres-it
     ports:
       - "38081:8081"
     environment:
-      - DATABASE_URI=postgresql://postgres:postgres@postgres-it:5432/postgres
+      - DATABASE_URI=postgresql://postgres:postgres@postgres-it:5432/postgres?sslmode=disable
       - SECURITY_USER_NAME=admin
       - SECURITY_USER_PASSWORD=secret
-  collection-exercise-service:
-    container_name: collection-exercise-it
-    image: sdcplatform/collectionexercisesvc
+
+  collectionexercise:
+    container_name: collex-case-it
     external_links:
-      - postgres-it
+      - postgres-case-it
+    image: eu.gcr.io/ons-rasrmbs-management/collection-exercise
+    environment:
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres-it:5432/postgres?sslmode=disable
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=postgres
+      - SPRING_LIQUIBASE_URL=jdbc:postgresql://postgres-it:5432/postgres
+      - SPRING_LIQUIBASE_USER=postgres
+      - SPRING_LIQUIBASE_PASSWORD=postgres
+      - SPRING_CLOUD_GCP_PROJECTID=test
+      - SPRING_CLOUD_GCP_PUBSUB_EMULATORHOST=pubsub-emulator-it:8681
+      - SURVEY_SVC_CONNECTION_CONFIG_HOST=survey-case-it
+      - SURVEY_SVC_CONNECTION_CONFIG_PORT=8080
+      - PUBSUB_EMULATOR_HOST=pubsub-emulator-it:8681
+
     ports:
       - "38145:8145"
-    environment:
-      - DATABASE_URI=postgresql://postgres:postgres@postgres-it:5432/postgres
-      - SECURITY_USER_NAME=admin
-      - SECURITY_USER_PASSWORD=secret
+
   pubsub-emulator:
     container_name: pubsub-emulator-it
     image: eu.gcr.io/ons-rasrmbs-management/pubsub-emulator
     ports:
       - "18681:8681"
     environment:
-      - PUBSUB_PROJECT1=test,test_topic:test_subscription
+      - PUBSUB_PROJECT1=test,test_topic:test_subscription
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,8 @@
 		<spring.cloud.gcp.version>1.2.8.RELEASE</spring.cloud.gcp.version>
 		<common.version>10.49.4</common.version>
 		<java.version>17</java.version>
-		<surefire.version>2.20</surefire.version>
+		<surefire.version>3.2.5</surefire.version>
+		<skipSurefire>false</skipSurefire>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
@@ -288,7 +289,7 @@
 			<plugin>
 				<groupId>com.spotify.fmt</groupId>
 				<artifactId>fmt-maven-plugin</artifactId>
-				<version>2.20</version>
+				<version>2.21.1</version>
 				<executions>
 					<execution>
 						<goals>
@@ -300,15 +301,15 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.11.0</version>
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>org.projectlombok</groupId>
 							<artifactId>lombok</artifactId>
-							<version>1.18.24</version>
+							<version>1.18.30</version>
 						</path>
 					</annotationProcessorPaths>
 				</configuration>
@@ -320,7 +321,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.18.1</version>
+				<version>3.2.2</version>
 				<!-- The below argument was added to prevent an error being thrown due to accessing of an unnamed
                source. This seemed to be the only solution -->
 				<configuration>
@@ -336,14 +337,15 @@
 						<configuration>
 							<!-- rerun tests because schema isn't create successfully first time -->
 							<rerunFailingTestsCount>2</rerunFailingTestsCount>
+							<classesDirectory>${project.build.outputDirectory}</classesDirectory>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
+				<version>3.3.1</version>
 				<configuration>
 					<excludes>
 						**/uk/gov/ons/ctp/response/party/definition/**/*,
@@ -423,15 +425,15 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.3</version>
+					<version>3.0.1</version>
 					<configuration>
 						<scmCommentPrefix>[ci skip]</scmCommentPrefix>
 					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.6.2</version>
+					<version>3.11.0</version>
 					<configuration>
 						<source>${java.version}</source>
 						<target>${java.version}</target>
@@ -443,6 +445,7 @@
 					<version>${surefire.version}</version>
 					<configuration>
 						<threadCount>1</threadCount>
+						<skip>${skipSurefire}</skip>
 					</configuration>
 					<!-- REQUIRED for unit tests to run -->
 					<dependencies>
@@ -461,7 +464,7 @@
 				<plugin>
 					<groupId>org.jvnet.jaxb2.maven2</groupId>
 					<artifactId>maven-jaxb2-plugin</artifactId>
-					<version>0.13.1</version>
+					<version>0.15.3</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>

diff --git a/src/main/java/uk/gov/ons/ctp/response/sample/message/SampleDeadLetterReceiver.java b/src/main/java/uk/gov/ons/ctp/response/sample/message/SampleDeadLetterReceiver.java
@@ -31,6 +31,7 @@ public class SampleDeadLetterReceiver {
   @Qualifier("sampleSummaryTransitionManager")
   private StateTransitionManager<SampleSummaryDTO.SampleState, SampleSummaryDTO.SampleEvent>
       sampleSummaryTransitionManager;
+
   /**
    * To process SampleSummaries from dead letter queue
    *

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
@@ -1,9 +1,10 @@
 spring:
   datasource:
-    url: jdbc:postgresql://localhost:36432/postgres
+    url: jdbc:postgresql://localhost:15432/postgres?sslmode=disable
+
   liquibase:
-    url: jdbc:postgresql://localhost:36432/postgres
-    default-schema: sample
+    url: jdbc:postgresql://localhost:15432/postgres?sslmode=disable
+    liquibase-schema: sample
 
   cloud:
     gcp:
@@ -24,4 +25,8 @@ collection-exercise-svc:
 
 gcp:
   project: "test"
+  sampleSummaryActivationSubscription: "test_activation_subscription"
+  sampleSummaryActivationStatusTopic: "test_activation_topic"
   caseNotificationTopic: "test_topic"
+  collectionExerciseEndSubscription: "test_collection_exercise_end_sample"
+  sampleSummaryDeadLetterSubscription: "test_dead_letter_subscription"
diff --git a/src/test/java/uk/gov/ons/ctp/response/sample/service/SampleSummaryActivationServiceTest.java b/src/test/java/uk/gov/ons/ctp/response/sample/service/SampleSummaryActivationServiceTest.java
@@ -30,7 +30,8 @@ public class SampleSummaryActivationServiceTest {
 
   @Test
   public void testActivateSampleSummaryFromPubsub()
-      throws SampleSummaryActivationException, UnknownSampleSummaryException,
+      throws SampleSummaryActivationException,
+          UnknownSampleSummaryException,
           NoSampleUnitsInSampleSummaryException {
 
     SampleSummaryActivationDTO sampleSummaryActivation = new SampleSummaryActivationDTO();
@@ -50,7 +51,8 @@ public void testActivateSampleSummaryFromPubsub()
 
   @Test(expected = SampleSummaryActivationException.class)
   public void testActivateSampleSummaryFromPubsubCorrectEnrichExceptionThrown()
-      throws UnknownSampleSummaryException, SampleSummaryActivationException,
+      throws UnknownSampleSummaryException,
+          SampleSummaryActivationException,
           NoSampleUnitsInSampleSummaryException {
     SampleSummaryActivationDTO sampleSummaryActivation = new SampleSummaryActivationDTO();
     sampleSummaryActivation.setSampleSummaryId(SAMPLE_SUMMARY_ID);
@@ -99,7 +101,8 @@ public void testActivateSampleSummaryFromPubsubCorrectNumberOfCallsOnEnrichFailu
 
   @Test(expected = SampleSummaryActivationException.class)
   public void testActivateSampleSummaryFromPubsubCorrectDistributeExceptionThrown()
-      throws SampleSummaryActivationException, NoSampleUnitsInSampleSummaryException,
+      throws SampleSummaryActivationException,
+          NoSampleUnitsInSampleSummaryException,
           UnknownSampleSummaryException {
     SampleSummaryActivationDTO sampleSummaryActivation = new SampleSummaryActivationDTO();
     sampleSummaryActivation.setSampleSummaryId(SAMPLE_SUMMARY_ID);

diff --git a/...esources/uk/gov/ons/ctp/response/sample/config/CachingTestIT.CollectionInstrumentDTO.json b/...esources/uk/gov/ons/ctp/response/sample/config/CachingTestIT.CollectionInstrumentDTO.json
@@ -0,0 +1,13 @@
+[{
+  "classifiers": {
+    "COLLECTION_EXERCISE": [
+      "8f078c99-2843-47c6-9c57-13e5966fbc9e"
+    ],
+    "RU_REF": [
+      "test_ru_ref"
+    ]
+  },
+  "file_name": "file_name",
+  "id": "7574283a-d1fd-49df-b684-d7b201e5748a",
+  "surveyId": "cb0711c3-0ac8-41d3-ae0e-567e5ea1ef87"
+}]
diff --git a/...sources/uk/gov/ons/ctp/response/sample/config/CachingTestIT.CollectionInstrumentDTO2.json b/...sources/uk/gov/ons/ctp/response/sample/config/CachingTestIT.CollectionInstrumentDTO2.json
@@ -0,0 +1,13 @@
+[{
+  "classifiers": {
+    "COLLECTION_EXERCISE": [
+      "8f078c99-2843-47c6-9c57-13e5966fbc9e"
+    ],
+    "RU_REF": [
+      "test_ru_ref"
+    ]
+  },
+  "file_name": "file_name",
+  "id": "7574283a-d1fd-49df-b684-d7b201e5748a",
+  "surveyId": "cb0711c3-0ac8-41d3-ae0e-567e5ea1ef88"
+}]