From 35fb1957a176b91446991d17a29990d1d3f4d1f5 Mon Sep 17 00:00:00 2001 From: Dmitry Studynsky Date: Sat, 29 Nov 2025 20:52:08 -0500 Subject: [PATCH 1/2] Upgrade dependencies (minor version): resteasy to 4.7.10.Final, jackson to 2.15.4, okhttp to 4.12.0, wiremock to 2.27.2. Refactored `AttachmentsApiTest`. Resteasy changed order in the new version. --- pom.xml | 8 ++++---- .../api/attachments/v2/AttachmentsApiTest.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 099a6504..c293760b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,11 +27,11 @@ UTF-8 UTF-8 2.0.4 - 4.6.1.Final + 4.7.10.Final 4.5.14 - 2.12.3 - 4.9.3 - 2.26.0 + 2.15.4 + 4.12.0 + 2.27.2 diff --git a/smartling-attachments-api/src/test/java/com/smartling/api/attachments/v2/AttachmentsApiTest.java b/smartling-attachments-api/src/test/java/com/smartling/api/attachments/v2/AttachmentsApiTest.java index 1d8b6550..b8ce572f 100644 --- a/smartling-attachments-api/src/test/java/com/smartling/api/attachments/v2/AttachmentsApiTest.java +++ b/smartling-attachments-api/src/test/java/com/smartling/api/attachments/v2/AttachmentsApiTest.java @@ -183,25 +183,25 @@ public void testUploadAttachment() throws Exception "\r\n" + "content\r\n" + partSeparator + "\r\n" + - "Content-Disposition: form-data; name=\"name\"\r\n" + + "Content-Disposition: form-data; name=\"entityUids\"\r\n" + "Content-Type: text/plain\r\n" + "\r\n" + - "test.txt\r\n" + + "jobUuid1\r\n" + partSeparator + "\r\n" + - "Content-Disposition: form-data; name=\"description\"\r\n" + + "Content-Disposition: form-data; name=\"entityUids\"\r\n" + "Content-Type: text/plain\r\n" + "\r\n" + - "description\r\n" + + "jobUuid2\r\n" + partSeparator + "\r\n" + - "Content-Disposition: form-data; name=\"entityUids\"\r\n" + + "Content-Disposition: form-data; name=\"name\"\r\n" + "Content-Type: text/plain\r\n" + "\r\n" + - "jobUuid1\r\n" + + "test.txt\r\n" + partSeparator + "\r\n" + - "Content-Disposition: form-data; name=\"entityUids\"\r\n" + + "Content-Disposition: form-data; name=\"description\"\r\n" + "Content-Type: text/plain\r\n" + "\r\n" + - "jobUuid2\r\n" + + "description\r\n" + partSeparator + "--"); assertEquals(expectedPTO.getAttachmentUid(), response.getAttachmentUid()); From 53d0c9b897a2d09d2a4c05a37c8890913df35bac Mon Sep 17 00:00:00 2001 From: Dmitry Studynsky Date: Sun, 30 Nov 2025 10:56:50 -0500 Subject: [PATCH 2/2] Changed build image to amazoncorretto --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ce72f20..983e07c8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: test: docker: - - image: openjdk:11 + - image: amazoncorretto:11 steps: - checkout - run: @@ -17,7 +17,7 @@ jobs: path: test-results deploy: docker: - - image: openjdk:11 + - image: amazoncorretto:11 steps: - add_ssh_keys: fingerprints: