From 8d0a7d20039982137928727b7cc1e082daa1cef7 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Tue, 2 Apr 2024 19:06:57 +0530 Subject: [PATCH 1/8] DONE: [Snyk] Upgrade org.json:json from 20231013 to 20240205 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f0de33..39bb5ef 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 1.6.7 2.5.3 2.0.1.Final - 20231013 + 20240205 6.0.18 1.10.0 From 00bda0c41dc329e50192b96dc08ccb24cec37aa5 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 12 Apr 2024 16:33:29 +0530 Subject: [PATCH 2/8] added: surefire plugin to produce the test reports --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 9f0de33..14ce15d 100644 --- a/pom.xml +++ b/pom.xml @@ -141,6 +141,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + ${project.build.directory}/surefire-reports + true + + org.apache.maven.plugins maven-surefire-report-plugin From 51056bc8242c32102075bba882f86bd3710519c6 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 12 Apr 2024 17:47:27 +0530 Subject: [PATCH 3/8] added: version update and changelog.md --- Changelog.md | 4 ++++ pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index e02a2d8..2b28d67 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ A brief description of what changes project contains +#### v1.2.8 + +- added surefire plugin to generate test reports + ## March 24, 2024 #### v1.2.7 diff --git a/pom.xml b/pom.xml index 14ce15d..9030b0e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.contentstack.sdk utils - 1.2.7 + 1.2.8 jar Contentstack-utils Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS From 8b3f52cf8d9cdc27c903e9d118bf1eca54ba5446 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 19 Apr 2024 12:10:49 +0530 Subject: [PATCH 4/8] Fixed the snyk issues and added surefire plugin to generate test reports --- Changelog.md | 3 +++ pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2b28d67..9bce73f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,9 +2,12 @@ A brief description of what changes project contains +## April 23, 2024 + #### v1.2.8 - added surefire plugin to generate test reports +- Fixed Snyk issues ## March 24, 2024 diff --git a/pom.xml b/pom.xml index 9a19769..edd54ad 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.2.1 3.1.1 4.13.2 - 1.16.1 + 1.16.2 1.1.1 3.3 1.5 @@ -28,8 +28,8 @@ 2.5.3 2.0.1.Final 20240205 - 6.0.18 - 1.10.0 + 6.0.19 + 1.11.0 From 8442458f931884702cce7e5f780c88b99841a985 Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Mon, 22 Apr 2024 11:02:28 +0530 Subject: [PATCH 5/8] fix: sre issue fix, license update --- LICENSE | 2 +- src/test/resources/issue/jsonfile.json | 34 +++++++++---------- src/test/resources/multiple_objects.json | 12 +++---- .../resources/multiple_rich_text_content.json | 34 +++++++++---------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/LICENSE b/LICENSE index 981ba26..d77c7f4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2012 - 2023 Contentstack +Copyright (c) 2012 - 2024 Contentstack Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/resources/issue/jsonfile.json b/src/test/resources/issue/jsonfile.json index 891940a..6b5bdd9 100644 --- a/src/test/resources/issue/jsonfile.json +++ b/src/test/resources/issue/jsonfile.json @@ -45,7 +45,7 @@ "file_size": "11773", "_content_type_uid": "asset", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -68,7 +68,7 @@ "file_size": "11773", "_content_type_uid": "0_solve", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -91,7 +91,7 @@ "file_size": "11773", "_content_type_uid": "0_solve", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -114,7 +114,7 @@ "file_size": "11773", "_content_type_uid": "0_solve", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -132,7 +132,7 @@ "url": "/suraj-123-entry", "single_line": "Single line textbox", "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"Ticket.pdf\"", + "rich_text_editor": "\"Ticket.pdf\"", "markdown": "fsdfsdfsdfasf", "modular_blocks": [ { @@ -191,7 +191,7 @@ "file_size": "59014", "_content_type_uid": "0_solve", "filename": "iphone-mockup.png", - "url": "https://dev16-images.contentstack.com/v3/assets/iphone-mockup.png", + "url": "https://images/v3/assets/iphone-mockup.png", "ACL": {}, "_version": 1, "title": "iphone-mockup.png", @@ -214,7 +214,7 @@ "file_size": "11773", "_content_type_uid": "0_solve", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -232,7 +232,7 @@ "url": "/suraj-123-entry", "single_line": "Single line textbox", "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"Ticket.pdf\"", + "rich_text_editor": "\"Ticket.pdf\"", "markdown": "fsdfsdfsdfasf", "modular_blocks": [ { @@ -441,7 +441,7 @@ "url": "/suraj-123-entry", "single_line": "Single line textbox", "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"Ticket.pdf\"", + "rich_text_editor": "\"Ticket.pdf\"", "markdown": "fsdfsdfsdfasf", "modular_blocks": [ { @@ -545,7 +545,7 @@ } ], "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"Ticket.pdf\"", + "rich_text_editor": "\"Ticket.pdf\"", "single_line": "Single line textbox", "suraj_123": [ { @@ -718,7 +718,7 @@ "modular_blocks": [ { "rich_in_modular": { - "rich_text_editor": "

global 

\n

modular 1

", + "rich_text_editor": "

global 

\n

modular 1

", "rich_text_editor_multiple": [ "

global modular 2

" ], @@ -736,9 +736,9 @@ "

Global multiple 2

" ], "group": { - "rich_text_editor": "

Global multiple group 1

", + "rich_text_editor": "

Global multiple group 1

", "rich_text_editor_multiple": [ - "

Global multiple group 2

" + "

Global multiple group 2

" ] }, "modular_blocks": [ @@ -746,7 +746,7 @@ "rich_in_modular": { "rich_text_editor": "

Global multiple modular 1

", "rich_text_editor_multiple": [ - "

Global multiple modular

\n

2

" + "

Global multiple modular

\n

2

" ], "_metadata": { "uid": "cs6d492f34be84aa04" @@ -770,7 +770,7 @@ "rich_text_inmodular": { "rich_text_editor": "
\n

Modul 1

", "rich_text_editor_multiple": [ - "

module 2 

" + "

module 2 

" ], "_metadata": { "uid": "csb005424df53ebe6d" @@ -814,9 +814,9 @@ "_content_type_uid": "embed_entry" } ], - "rich_text_editor": "
\n

one

\n
", + "rich_text_editor": "
\n

one

\n
", "rich_text_editor_multiple": [ - "

Two

\"11.jpg\"" + "

Two

\"11.jpg\"" ], "title": "Test Rich Text", "updated_at": "2020-11-05T08:26:14.590Z", diff --git a/src/test/resources/multiple_objects.json b/src/test/resources/multiple_objects.json index 19286d7..70643fb 100644 --- a/src/test/resources/multiple_objects.json +++ b/src/test/resources/multiple_objects.json @@ -13,7 +13,7 @@ "file_size": "59014", "tags": [], "filename": "iphone-mockup.png", - "url": "https://dev16-images.contentstack.com/v3/assets/iphone-mockup.png", + "url": "https://images/v3/assets/iphone-mockup.png", "ACL": [], "_version": 1, "title": "iphone-mockup.png", @@ -37,7 +37,7 @@ "created_at": "2020-10-05T06:20:12.914Z", "created_by": "theUserId", "rich_text_editor": [ - "
" + "
" ], "tags": [], "title": "Alaukik assets", @@ -58,7 +58,7 @@ "created_at": "2020-10-05T07:28:48.062Z", "created_by": "theUserId", "rich_text_editor": [ - "

test example Hey how are you 

\n
" + "

test example Hey how are you 

\n
" ], "tags": [], "title": "this is unique title", @@ -90,7 +90,7 @@ "created_at": "2020-10-05T06:20:12.914Z", "created_by": "theUserId", "rich_text_editor": [ - "
" + "
" ], "tags": [], "title": "Alaukik assets", @@ -140,7 +140,7 @@ "file_size": "59014", "tags": [], "filename": "iphone-mockup.png", - "url": "https://dev16-images.contentstack.com/v3/assets/iphone-mockup.png", + "url": "https://images/v3/assets/iphone-mockup.png", "ACL": [], "_version": 1, "title": "iphone-mockup.png", @@ -155,7 +155,7 @@ "created_at": "2020-10-05T06:20:12.914Z", "created_by": "theUserId", "rich_text_editor": [ - "
" + "
" ], "tags": [], "title": "Alaukik assets", diff --git a/src/test/resources/multiple_rich_text_content.json b/src/test/resources/multiple_rich_text_content.json index 81dee08..001db60 100644 --- a/src/test/resources/multiple_rich_text_content.json +++ b/src/test/resources/multiple_rich_text_content.json @@ -15,7 +15,7 @@ "file_size": "11773", "_content_type_uid": "asset", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -36,7 +36,7 @@ "file_size": "11773", "_content_type_uid": "0_solve", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -57,7 +57,7 @@ "file_size": "11773", "_content_type_uid": "0_solve", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -78,7 +78,7 @@ "file_size": "11773", "_content_type_uid": "0_solve", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -94,7 +94,7 @@ "url": "/suraj-123-entry", "single_line": "Single line textbox", "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"Ticket.pdf\"", + "rich_text_editor": "\"Ticket.pdf\"", "markdown": "fsdfsdfsdfasf", "modular_blocks": [{ "block_1": { @@ -152,7 +152,7 @@ "file_size": "59014", "_content_type_uid": "0_solve", "filename": "iphone-mockup.png", - "url": "https://dev16-images.contentstack.com/v3/assets/iphone-mockup.png", + "url": "https://images/v3/assets/iphone-mockup.png", "ACL": {}, "_version": 1, "title": "iphone-mockup.png", @@ -174,7 +174,7 @@ "file_size": "11773", "_content_type_uid": "0_solve", "filename": "11.jpg", - "url": "https://dev16-images.contentstack.com/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", + "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg", "_version": 2, "title": "11.jpg", "description": "dddd", @@ -190,7 +190,7 @@ "url": "/suraj-123-entry", "single_line": "Single line textbox", "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"Ticket.pdf\"", + "rich_text_editor": "\"Ticket.pdf\"", "markdown": "fsdfsdfsdfasf", "modular_blocks": [{ "block_1": { @@ -374,7 +374,7 @@ "url": "/suraj-123-entry", "single_line": "Single line textbox", "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"Ticket.pdf\"", + "rich_text_editor": "\"Ticket.pdf\"", "markdown": "fsdfsdfsdfasf", "modular_blocks": [{ "block_1": { @@ -469,7 +469,7 @@ } }], "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"Ticket.pdf\"", + "rich_text_editor": "\"Ticket.pdf\"", "single_line": "Single line textbox", "suraj_123": [{ "single_line": "FSDGSDGSDGDF", @@ -630,7 +630,7 @@ }, "modular_blocks": [{ "rich_in_modular": { - "rich_text_editor": "

global 

\n

modular 1

", + "rich_text_editor": "

global 

\n

modular 1

", "rich_text_editor_multiple": [ "

global modular 2

" ], @@ -646,16 +646,16 @@ "

Global multiple 2

" ], "group": { - "rich_text_editor": "

Global multiple group 1

", + "rich_text_editor": "

Global multiple group 1

", "rich_text_editor_multiple": [ - "

Global multiple group 2

" + "

Global multiple group 2

" ] }, "modular_blocks": [{ "rich_in_modular": { "rich_text_editor": "

Global multiple modular 1

", "rich_text_editor_multiple": [ - "

Global multiple modular

\n

2

" + "

Global multiple modular

\n

2

" ], "_metadata": { "uid": "cs6d492f34be84aa04" @@ -676,7 +676,7 @@ "rich_text_inmodular": { "rich_text_editor": "
\n

Modul 1

", "rich_text_editor_multiple": [ - "

module 2 

" + "

module 2 

" ], "_metadata": { "uid": "csb005424df53ebe6d" @@ -716,9 +716,9 @@ "uid": "9c95983f8f327537", "_content_type_uid": "embed_entry" }], - "rich_text_editor": "
\n

one

\n
", + "rich_text_editor": "
\n

one

\n
", "rich_text_editor_multiple": [ - "

Two

\"11.jpg\"" + "

Two

\"11.jpg\"" ], "title": "Test Rich Text", From d6a1465c88e17a6e12b9bf20dcbc8e575f145403 Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Mon, 22 Apr 2024 11:12:06 +0530 Subject: [PATCH 6/8] build: snyk upgrades --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index edd54ad..9001f53 100644 --- a/pom.xml +++ b/pom.xml @@ -20,15 +20,15 @@ 2.2.1 3.1.1 4.13.2 - 1.16.2 + 1.17.2 1.1.1 3.3 1.5 1.6.7 2.5.3 2.0.1.Final - 20240205 - 6.0.19 + 20240303 + 6.1.5 1.11.0 From 1aa3296384e2afb189ffbf1aa7f243b4717bbc22 Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Mon, 22 Apr 2024 11:24:51 +0530 Subject: [PATCH 7/8] chore: upgraded spring-web-version to 6.1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9001f53..3ff59ce 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.5.3 2.0.1.Final 20240303 - 6.1.5 + 6.1.6 1.11.0 From 0e71bf86816affd907ba9c4c6c2c4b395958aec8 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Sat, 27 Apr 2024 23:09:27 +0100 Subject: [PATCH 8/8] fix: fixed anchor tag early closing issue --- pom.xml | 2 +- src/main/java/com/contentstack/utils/render/DefaultOption.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2fd21dc..27ab5d8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.contentstack.sdk utils - 1.2.7 + 1.2.8 jar Contentstack-utils Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS diff --git a/src/main/java/com/contentstack/utils/render/DefaultOption.java b/src/main/java/com/contentstack/utils/render/DefaultOption.java index ac8bf6f..e384698 100644 --- a/src/main/java/com/contentstack/utils/render/DefaultOption.java +++ b/src/main/java/com/contentstack/utils/render/DefaultOption.java @@ -111,7 +111,7 @@ public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback ca if (!assetLink.isEmpty()) { JSONObject attrs = nodeObject.optJSONObject("attrs"); if (attrs.has("link")) { - return "" + "" + children + ""; + return "" + "" + children + ""; } return "" + children; }