From b0cea18e55291f1fc622e3d6abf00cfc1f238920 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Fri, 6 Sep 2024 07:17:23 +0100 Subject: [PATCH 01/13] fix: added dummy workflow test --- .github/workflows/maven-publish.yml | 66 +++++++++++-------- AUTHORS.md | 6 +- SECURITY.md | 4 +- pom.xml | 8 +-- .../com/contentstack/utils/RTEResult.java | 2 +- .../com/contentstack/utils/RTEString.java | 4 +- src/test/resources/file.json | 12 ++-- src/test/resources/issue/jsonfile.json | 8 +-- .../resources/multiple_rich_text_content.json | 8 +-- src/test/resources/reports/article2.json | 4 +- src/test/resources/reports/article3.json | 4 +- src/test/resources/reports/article4.json | 12 ++-- src/test/resources/reports/issue007.json | 56 ++++++++-------- 13 files changed, 101 insertions(+), 93 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 8c073f1..7631c81 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -1,7 +1,8 @@ name: Publish package to the Maven Central Repository on: - release: - types: [ created ] + pull_request: + # release: + # types: [ created ] jobs: publish-maven: runs-on: ubuntu-latest @@ -15,30 +16,37 @@ jobs: with: java-version: '11' distribution: 'adopt' - server-id: ossrh - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: GPG_PASSPHRASE - - name: Publish package - run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - publish-github: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Java for publishing to GitHub Packages - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'adopt' - server-id: github - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} - - name: Publish to GitHub Packages - run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + # server-id: ossrh + # server-username: MAVEN_USERNAME + # server-password: MAVEN_PASSWORD + # gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + # gpg-passphrase: GPG_PASSPHRASE + # Build and publish to a local Maven repository for testing + - name: Build and Publish to Local Maven Repository + run: mvn --batch-mode clean install deploy -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository + + # - name: Publish package + # run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy + # env: + # MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + # MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + # GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + # Optional: Verify the artifacts are published in the local repository + - name: Verify Local Publish + run: ls -R $HOME/.m2/repository/com.contentstack.sdk/utils + # publish-github: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Set up Java for publishing to GitHub Packages + # uses: actions/setup-java@v3 + # with: + # java-version: '11' + # distribution: 'adopt' + # server-id: github + # gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + # gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} + # - name: Publish to GitHub Packages + # run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/AUTHORS.md b/AUTHORS.md index b28a963..8f8453b 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,5 +1,5 @@ # Authors -- [ishaileshmishra](shailesh.mishra@contentstack.com) -- [shaileshmishra](mshaileshr@contentstack.com) -- [admin](dev@contentstack.com) +- [ishaileshmishra](shailesh.mishra@***REMOVED***) +- [shaileshmishra](mshaileshr@***REMOVED***) +- [admin](dev@***REMOVED***) diff --git a/SECURITY.md b/SECURITY.md index 88da02e..bbdeecd 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -8,7 +8,7 @@ If you believe you have found a security vulnerability in any Contentstack-owned **Please do not report security vulnerabilities through public GitHub issues.** -Send email to [security@contentstack.com](mailto:security@contentstack.com). +Send email to [security@***REMOVED***](mailto:security@***REMOVED***). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. @@ -24,4 +24,4 @@ Please include the requested information listed below (as much as you can provid This information will help us triage your report more quickly. -[https://www.contentstack.com/trust/](https://www.contentstack.com/trust/) +[https://www.***REMOVED***/trust/](https://www.***REMOVED***/trust/) diff --git a/pom.xml b/pom.xml index 8c00e61..d81d322 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ jar Contentstack-utils Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS - https://www.contentstack.com + https://www.***REMOVED*** UTF-8 @@ -35,9 +35,9 @@ shaileshmishra - shailesh.mishra@contentstack.com + shailesh.mishra@***REMOVED*** contentstack - https://www.contentstack.com/ + https://www.***REMOVED***/ @@ -73,7 +73,7 @@ Contentstack. - http://contentstack.com + http://***REMOVED*** diff --git a/src/test/java/com/contentstack/utils/RTEResult.java b/src/test/java/com/contentstack/utils/RTEResult.java index 3b2b6e5..9062ea7 100644 --- a/src/test/java/com/contentstack/utils/RTEResult.java +++ b/src/test/java/com/contentstack/utils/RTEResult.java @@ -12,7 +12,7 @@ public class RTEResult { public static String kH6Html = "
Nunc porta diam vitae purus semper, ut consequat lorem vehicula.
"; public static String kOrderListHtml = "
  1. Morbi in quam molestie, fermentum diam vitae, bibendum ipsum.
  2. Pellentesque mattis lacus in quam aliquam congue
  3. Integer feugiat leo dignissim, lobortis enim vitae, mollis lectus.
  4. Sed in ante lacinia, molestie metus eu, fringilla sapien.
"; public static String kIUnorderListHtml = "
  • Sed quis metus sed mi hendrerit mollis vel et odio.
  • Integer vitae sem dignissim, elementum libero vel, fringilla massa.
  • Integer imperdiet arcu sit amet tortor faucibus aliquet.
  • Aenean scelerisque velit vitae dui vehicula, at congue massa sagittis.
"; - public static String kImgHtml = ""; + public static String kImgHtml = ""; public static String kTableHtml = "

Header 1

Header 2

Body row 1 data 1

Body row 1 data 2

Body row 2 data 1

Body row 2 data 2

"; public static String kBlockquoteHtml = "
Praesent eu ex sed nibh venenatis pretium.
"; public static String kCodeHtml = "Code template."; diff --git a/src/test/java/com/contentstack/utils/RTEString.java b/src/test/java/com/contentstack/utils/RTEString.java index 698d12a..4907c64 100644 --- a/src/test/java/com/contentstack/utils/RTEString.java +++ b/src/test/java/com/contentstack/utils/RTEString.java @@ -12,14 +12,14 @@ public class RTEString { public static String kH6Json = "{ \"uid\": \"06e34a71190849d7fcd\", \"_version\": 13, \"attrs\": { }, \"children\": [ { \"type\": \"h6\", \"attrs\": {}, \"uid\": \"c2dfa672242cfb7e2e1\", \"children\": [ { \"text\": \"Nunc porta diam vitae purus semper, ut consequat lorem vehicula.\", } ] } ], \"type\": \"doc\" }"; public static String kOrderListJson = "{ \"uid\":\"06e35 48119084 9d7fc2acd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"uid\":\"2b5b4acbb3cfce02d3e\",\"type\":\"ol\",\"children\":[{\"type\":\"li\",\"attrs\":{\"style\":{\"text-align\":\"justify\"},\"redactor-attributes\":{ }},\"uid\":\"160bbd7430b98bd3d996\",\"children\":[{\"text\":\"Morbi in quam molestie, fermentum diam vitae, bibendum ipsum.\"}]},{ \"type\":\"li\",\"attrs\":{ \"style\":{ \"text-align\":\"justify\"},\"redactor-attributes\":{ } },\"uid\":\"a15f4d749bc2903d\",\"children\":[{ \"text\":\"Pellentesque mattis lacus in quam aliquam congue\"}]},{ \"type\":\"li\",\"attrs\":{ \"style\":{ \"text-align\":\"justify\"},\"redactor-attributes\":{ } },\"uid\":\"e54224bbcb6f9e8f1e43\",\"children\":[{ \"text\":\"Integer feugiat leo dignissim, lobortis enim vitae, mollis lectus.\"}]},{ \"type\":\"li\",\"attrs\":{ \"style\":{ \"text-align\":\"justify\"},\"redactor-attributes\":{ } },\"uid\":\"c0148bab9af758784\",\"children\":[{ \"text\":\"Sed in ante lacinia, molestie metus eu, fringilla sapien.\"}]}],\"id\":\"7f413d448a\",\"attrs\":{ }}],\"type\":\"doc\"}"; public static String kUnorderListJson = "{ \"uid\":\"0e5481190849a\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"uid\":\"a3a2b443ebffc867b\",\"type\":\"ul\",\"children\":[{\"uid\":\"f67354d4eed64451922\",\"type\":\"li\",\"children\":[{\"text\":\"Sed quis metus sed mi hendrerit mollis vel et odio.\"}],\"attrs\":{ }},{ \"uid\":\"5 50cba5 bea92f23e36fd1\",\"type\":\"li\",\"children\":[{ \"text\":\"Integer vitae sem dignissim, elementum libero vel, fringilla massa.\"}],\"attrs\":{ } },{ \"uid\":\"0e5c9b4cd983e8fd543\",\"type\":\"li\",\"children\":[{ \"text\":\"Integer imperdiet arcu sit amet tortor faucibus aliquet.\"}],\"attrs\":{ } },{ \"uid\":\"6d9a43a3816bd83a9a\",\"type\":\"li\",\"children\":[{ \"text\":\"Aenean scelerisque velit vitae dui vehicula, at congue massa sagittis.\"}],\"attrs\":{ } }],\"id\":\"b083fa46ef899420ab19\",\"attrs\":{ }}],\"type\":\"doc\"}"; - public static String kImgJson = "{ \"uid\":\"06e34a7a4849d7fc2acd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"uid\":\"f3be74be3b64646e626\",\"type\":\"img\",\"attrs\":{\"url\":\"images.contentstack.com/v3/assets/UID_13/Donald.jog.png\",\"width\":33.69418132611637,\"height\":\"auto\",\"redactor-attributes\":{\"asset_uid\":\"47f1aa5ae422cd1\"}},\"children\":[{\"text\":\"\"}]}],\"type\":\"doc\"}"; + public static String kImgJson = "{ \"uid\":\"06e34a7a4849d7fc2acd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"uid\":\"f3be74be3b64646e626\",\"type\":\"img\",\"attrs\":{\"url\":\"images.***REMOVED***/v3/assets/UID_13/Donald.jog.png\",\"width\":33.69418132611637,\"height\":\"auto\",\"redactor-attributes\":{\"asset_uid\":\"47f1aa5ae422cd1\"}},\"children\":[{\"text\":\"\"}]}],\"type\":\"doc\"}"; public static String kParagraphJson = "{ \"uid\":\"0d7fd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"type\":\"p\",\"attrs\":{},\"uid\":\"0a1b5676aa510e5a\",\"children\":[{\"text\":\"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed condimentum iaculis magna in vehicula. Vestibulum vitae convallis lacus. Praesent a diam iaculis turpis rhoncus faucibus. Aliquam sed pulvinar sem.\"}]}],\"type\":\"doc\"}"; public static String kBlockquoteJson = "{ \"uid\":\"06084d7fd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"uid\":\"503f9cc97534db55\",\"type\":\"blockquote\",\"id\":\"431f78e567161460\",\"children\":[{\"text\":\"Praesent eu ex sed nibh venenatis pretium.\"}],\"attrs\":{ }}],\"type\":\"doc\"}"; public static String kCodeJson = "{ \"uid\":\"06ea490849d7fc2acd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"uid\":\"83fba92c91b30002b\",\"type\":\"code\",\"attrs\":{},\"children\":[{\"text\":\"Code template.\"}]}],\"type\":\"doc\"}"; public static String kTableJson = "{ \"uid\": \"06e481190849d7fcd\", \"_version\": 13, \"attrs\": { }, \"children\": [ { \"uid\": \"6dd64343bf634bfadd4\", \"type\": \"table\", \"attrs\": { \"rows\": 4, \"cols\": 2, \"colWidths\": [ 250, 250 ] }, \"children\": [ { \"uid\": \"b9082\", \"type\": \"thead\", \"attrs\": {}, \"children\": [ { \"type\": \"tr\", \"attrs\": {}, \"children\": [ { \"type\": \"th\", \"attrs\": {}, \"children\": [ { \"type\": \"p\", \"attrs\": {}, \"children\": [ { \"text\": \"Header 1\" } ], \"uid\": \"daa3ef\" } ], \"uid\": \"4b3124414a3\" }, { \"type\": \"th\", \"attrs\": { }, \"children\": [ { \"type\": \"p\", \"attrs\": { }, \"children\": [ { \"text\": \"Header 2\" } ], \"uid\": \"eae83c5797d\" } ], \"uid\": \"bca9b6f037a04fb485\" } ], \"uid\": \"b91ae7a48ef2e9da1\" } ] }, { \"type\": \"tbody\", \"attrs\": { }, \"children\": [ { \"type\": \"tr\", \"attrs\": { }, \"children\": [ { \"type\": \"td\", \"attrs\": { }, \"children\": [ { \"type\": \"p\", \"attrs\": { }, \"children\": [ { \"text\": \"Body row 1 data 1\" } ], \"uid\": \"ec674ccc5ce70b7cab\" } ], \"uid\": \"2a70bdeeb99a\" }, { \"type\": \"td\", \"attrs\": { }, \"children\": [ { \"type\": \"p\", \"attrs\": { }, \"children\": [ { \"text\": \"Body row 1 data 2\" } ], \"uid\": \"769a 3f9db34 ce8ec 10486d50\" } ], \"uid\": \"d6407 34a5c6 1ab1e5f7d1\" } ], \"uid\": \"77f6 b951c68 7f9eb397c5\" }, { \"type\": \"tr\", \"attrs\": { }, \"children\": [ { \"type\": \"td\", \"attrs\": { }, \"children\": [ { \"type\": \"p\", \"attrs\": { }, \"children\": [ { \"text\": \"Body row 2 data 1\" } ], \"uid\": \"a6bf 11bb48 630e87d721c0\" } ], \"uid\": \"3da39838b0feaf\" }, { \"type\": \"td\", \"attrs\": { }, \"children\": [ { \"type\": \"p\", \"attrs\": { }, \"children\": [ { \"text\": \"Body row 2 data 2\" } ], \"uid\": \"3b7d12 1f694202 49029e86313\" } ], \"uid\": \"95b38b04abcbc25e94f\" } ], \"uid\": \"b 227fea 8d247013 4f1e1e8\" } ], \"uid\": \"fd5ab86aa642798451b\" } ] }, ], \"type\": \"doc\" }"; public static String kLinkInPJson = "{ \"uid\":\"06e34a7190849d7f2acd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"type\":\"p\",\"attrs\":{\"style\":{\"text-align\":\"left\"},\"redactor-attributes\":{ }},\"uid\":\"d88dcdf4590dff2d\",\"children\":[{\"text\":\"\",\"bold\":true,\"italic\":true,\"underline\":true,\"subscript\":true},{ \"uid\":\"0d06598201aa8b47\",\"type\":\"a\",\"attrs\":{ \"url\":\"LINK.com\",\"target\":\"_self\"},\"children\":[{ \"text\":\"LINK\"}]},{ \"text\":\"\"}]}],\"type\":\"doc\"}"; public static String kEmbedJson = "{ \"uid\":\"06e34a7190849d7f2acd\", \"_version\":13, \"attrs\":{ }, \"children\":[{\"uid\":\"251017315905c35d42c9\",\"type\":\"embed\",\"attrs\":{\"url\":\"https://www.youtube.com/watch?v=AOP0yARiW8U\"},\"children\":[{\"text\":\"\"}]}],\"type\":\"doc\"}"; - public static String kAssetReferenceJson = "{\"uid\":\"06e34a7 5e4 e549d \", \"_version\":1, \"attrs\":{}, \"children\":[{ \"uid\": \"4f7e33 3390a955 de10c1 c836\", \"type\":\"reference\",\"attrs\":{\"display-type\":\"display\",\"asset-uid\":\"UID_12\",\"content-type-uid\":\"sys_assets\",\"asset-link\":\"https://images.contentstack.com/v3/assets/UID_14/11.jpg\",\"asset-name\":\"11.jpg\",\"asset-type\":\"image/jpeg\",\"type\":\"asset\",\"class-name\":\"embedded-asset\",\"width\":25.16914749661705,\"className\":\"dsd\",\"id\":\"sdf\"},\"children\":[{\"text\":\"\"}]}],\"type\":\"doc\"}"; + public static String kAssetReferenceJson = "{\"uid\":\"06e34a7 5e4 e549d \", \"_version\":1, \"attrs\":{}, \"children\":[{ \"uid\": \"4f7e33 3390a955 de10c1 c836\", \"type\":\"reference\",\"attrs\":{\"display-type\":\"display\",\"asset-uid\":\"UID_12\",\"content-type-uid\":\"sys_assets\",\"asset-link\":\"https://images.***REMOVED***/v3/assets/UID_14/11.jpg\",\"asset-name\":\"11.jpg\",\"asset-type\":\"image/jpeg\",\"type\":\"asset\",\"class-name\":\"embedded-asset\",\"width\":25.16914749661705,\"className\":\"dsd\",\"id\":\"sdf\"},\"children\":[{\"text\":\"\"}]}],\"type\":\"doc\"}"; public static String kEntryReferenceBlockJson = "{ \"uid\":\"06e34a7 5e4 e549d \", \"_version\":1, \"attrs\":{ }, \"children\":[{\"uid\":\"70f9b 325075d43 128c0d0 aa3eb7f291f\",\"type\":\"reference\",\"attrs\":{\"display-type\":\"block\",\"entry-uid\":\"UID_07\",\"content-type-uid\":\"content_block\",\"locale\":\"en-us\",\"type\":\"entry\",\"class-name\":\"embedded-entry\"},\"children\":[{\"text\":\"\"}]}],\"type\":\"doc\"}"; public static String kEntryReferenceLinkJson = "{ \"uid\":\"06e34a7 5e4 e549d\", \"_version\":1, \"attrs\":{ }, \"children\":[{\"uid\":\"7626ea98e0e95d602210\",\"type\":\"reference\",\"attrs\":{\"target\":\"_self\",\"href\":\"/copy-of-entry-final-02\",\"display-type\":\"link\",\"entry-uid\":\"UID_08\",\"content-type-uid\":\"embeddedrte\",\"locale\":\"en-us\",\"type\":\"entry\",\"class-name\":\"embedded-entry\"},\"children\":[{\"text\":\"/copy-of-entry-final-02\"}]}],\"type\":\"doc\"}"; public static String kEntryReferenceInlineJson = "{ \"uid\":\"06e34a7 5e4 e549d\", \"_version\":1, \"attrs\":{ }, \"children\":[{\"uid\":\"506 4878f3f46 s21f0cbc aff\",\"type\":\"reference\",\"attrs\":{\"display-type\":\"inline\",\"entry-uid\":\"UID_09\",\"content-type-uid\":\"embeddedrte\",\"locale\":\"en-us\",\"type\":\"entry\",\"class-name\":\"embedded-entry\"},\"children\":[{\"text\":\"\"}]}],\"type\":\"doc\"}"; diff --git a/src/test/resources/file.json b/src/test/resources/file.json index 734c309..f9db7c7 100644 --- a/src/test/resources/file.json +++ b/src/test/resources/file.json @@ -14,7 +14,7 @@ "display-type": "display", "asset-uid": "blt51f558a28ef555ca", "content-type-uid": "sys_assets", - "asset-link": "https://images.contentstack.io/v3/assets/***REMOVED***/blt51f558a28ef555ca/6643371882c344cb839ec1a8/ben.jpeg", + "asset-link": "https://images.***REMOVED***/v3/assets/***REMOVED***/blt51f558a28ef555ca/6643371882c344cb839ec1a8/ben.jpeg", "asset-name": "Designer.png", "asset-type": "image/jpeg", "type": "asset", @@ -47,7 +47,7 @@ { "node": { "title": "Designer.png", - "url": "https://images.contentstack.io/v3/assets/***REMOVED***/blt51f558a28ef555ca/66545ff10258be81fc639ae5/Virginia_Woolf_Headshot.jpg", + "url": "https://images.***REMOVED***/v3/assets/***REMOVED***/blt51f558a28ef555ca/66545ff10258be81fc639ae5/Virginia_Woolf_Headshot.jpg", "system": { "uid": "blt51f558a28ef555ca", "content_type_uid": "sys_assets" @@ -63,7 +63,7 @@ { "node": { "title": "W._E._B._Du_Bois_Headshot.jpg", - "url": "https://images.contentstack.io/v3/assets/***REMOVED***/blt897c06ebf8c6353a/66545fe479abeeb60a3d4e35/Mark_Twain_Headshot.jpg", + "url": "https://images.***REMOVED***/v3/assets/***REMOVED***/blt897c06ebf8c6353a/66545fe479abeeb60a3d4e35/Mark_Twain_Headshot.jpg", "system": { "content_type_uid": "sys_assets", "uid": "blt897c06ebf8c6353a" @@ -73,7 +73,7 @@ { "node": { "title": "iot-icon.png", - "url": "https://images.contentstack.io/v3/assets/***REMOVED***/bltbd81ff2ed42f1317/6654501e466a1c9b3edecb21/iot-icon.png", + "url": "https://images.***REMOVED***/v3/assets/***REMOVED***/bltbd81ff2ed42f1317/6654501e466a1c9b3edecb21/iot-icon.png", "system": { "content_type_uid": "sys_assets", "uid": "bltbd81ff2ed42f1317" @@ -94,7 +94,7 @@ "display-type": "display", "asset-uid": "blt897c06ebf8c6353a", "content-type-uid": "sys_assets", - "asset-link": "https://images.contentstack.io/v3/assets/***REMOVED***/blt897c06ebf8c6353a/6644340e015b1c2d2b56ca48/W._E._B._Du_Bois_Headshot.jpg", + "asset-link": "https://images.***REMOVED***/v3/assets/***REMOVED***/blt897c06ebf8c6353a/6644340e015b1c2d2b56ca48/W._E._B._Du_Bois_Headshot.jpg", "asset-name": "W._E._B._Du_Bois_Headshot.jpg", "asset-type": "image/jpeg", "type": "asset", @@ -126,7 +126,7 @@ "display-type": "display", "asset-uid": "bltbd81ff2ed42f1317", "content-type-uid": "sys_assets", - "asset-link": "https://images.contentstack.io/v3/assets/***REMOVED***/bltbd81ff2ed42f1317/664425e3a3f9df03dfc0e5e6/5216292.jpg", + "asset-link": "https://images.***REMOVED***/v3/assets/***REMOVED***/bltbd81ff2ed42f1317/664425e3a3f9df03dfc0e5e6/5216292.jpg", "asset-name": "iot-icon.png", "asset-type": "image/jpeg", "type": "asset", diff --git a/src/test/resources/issue/jsonfile.json b/src/test/resources/issue/jsonfile.json index 0129c63..89ef2a6 100644 --- a/src/test/resources/issue/jsonfile.json +++ b/src/test/resources/issue/jsonfile.json @@ -336,12 +336,12 @@ } ], "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"220px-Bastet_Istanbul_museum.JPG\"", + "rich_text_editor": "\"220px-Bastet_Istanbul_museum.JPG\"", "single_line": "Single line textbox", "suraj_123": [ { "single_line": "Multi line textbox", - "rich_text_editor": "\"220px-House_sparrow04.jpg\"", + "rich_text_editor": "\"220px-House_sparrow04.jpg\"", "markdown": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", "number": 45346346 } @@ -670,12 +670,12 @@ } ], "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"220px-Bastet_Istanbul_museum.JPG\"", + "rich_text_editor": "\"220px-Bastet_Istanbul_museum.JPG\"", "single_line": "Single line textbox", "suraj_123": [ { "single_line": "Multi line textbox", - "rich_text_editor": "\"220px-House_sparrow04.jpg\"", + "rich_text_editor": "\"220px-House_sparrow04.jpg\"", "markdown": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", "number": 45346346 } diff --git a/src/test/resources/multiple_rich_text_content.json b/src/test/resources/multiple_rich_text_content.json index cdbbd78..5caad6e 100644 --- a/src/test/resources/multiple_rich_text_content.json +++ b/src/test/resources/multiple_rich_text_content.json @@ -282,11 +282,11 @@ } }], "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"220px-Bastet_Istanbul_museum.JPG\"", + "rich_text_editor": "\"220px-Bastet_Istanbul_museum.JPG\"", "single_line": "Single line textbox", "suraj_123": [{ "single_line": "Multi line textbox", - "rich_text_editor": "\"220px-House_sparrow04.jpg\"", + "rich_text_editor": "\"220px-House_sparrow04.jpg\"", "markdown": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", "number": 45346346 @@ -586,11 +586,11 @@ } }], "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", - "rich_text_editor": "\"220px-Bastet_Istanbul_museum.JPG\"", + "rich_text_editor": "\"220px-Bastet_Istanbul_museum.JPG\"", "single_line": "Single line textbox", "suraj_123": [{ "single_line": "Multi line textbox", - "rich_text_editor": "\"220px-House_sparrow04.jpg\"", + "rich_text_editor": "\"220px-House_sparrow04.jpg\"", "markdown": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox", "number": 45346346 diff --git a/src/test/resources/reports/article2.json b/src/test/resources/reports/article2.json index f171228..2ae41a8 100644 --- a/src/test/resources/reports/article2.json +++ b/src/test/resources/reports/article2.json @@ -1444,7 +1444,7 @@ "display-type": "display", "asset-uid": "blt1e8458b798a67cf5", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt1e8458b798a67cf5/650b78874f22f8000d8c82e5/couldnt_submit_shipment.png", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt1e8458b798a67cf5/650b78874f22f8000d8c82e5/couldnt_submit_shipment.png", "asset-name": "couldnt_submit_shipment.png", "asset-type": "image/png", "type": "asset", @@ -1597,7 +1597,7 @@ "file_size": "97657", "tags": [], "filename": "couldnt_submit_shipment.png", - "url": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt1e8458b798a67cf5/650b78874f22f8000d8c82e5/couldnt_submit_shipment.png", + "url": "***REMOVED***/v3/assets/***REMOVED***/blt1e8458b798a67cf5/650b78874f22f8000d8c82e5/couldnt_submit_shipment.png", "ACL": [], "parent_uid": "blt7c541342b35c3564", "_version": 1, diff --git a/src/test/resources/reports/article3.json b/src/test/resources/reports/article3.json index a4cec22..0234e59 100644 --- a/src/test/resources/reports/article3.json +++ b/src/test/resources/reports/article3.json @@ -546,7 +546,7 @@ "display-type": "display", "asset-uid": "blt80fc6f2ccca9406a", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt80fc6f2ccca9406a/64fa50d5b979ea000d97a176/Big_and_Bulky.png", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt80fc6f2ccca9406a/64fa50d5b979ea000d97a176/Big_and_Bulky.png", "asset-name": "Big_and_Bulky.png", "asset-type": "image/png", "type": "asset", @@ -1935,7 +1935,7 @@ "file_size": "136896", "tags": [], "filename": "Big_and_Bulky.png", - "url": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt80fc6f2ccca9406a/64fa50d5b979ea000d97a176/Big_and_Bulky.png", + "url": "***REMOVED***/v3/assets/***REMOVED***/blt80fc6f2ccca9406a/64fa50d5b979ea000d97a176/Big_and_Bulky.png", "ACL": [], "parent_uid": "blt7fdffe41992d7f16", "_version": 1, diff --git a/src/test/resources/reports/article4.json b/src/test/resources/reports/article4.json index bc1b83e..27bf23b 100644 --- a/src/test/resources/reports/article4.json +++ b/src/test/resources/reports/article4.json @@ -765,7 +765,7 @@ "display-type": "display", "asset-uid": "blt759bd3ebb372f518", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt759bd3ebb372f518/6500d116a39049000db76491/Image_1.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt759bd3ebb372f518/6500d116a39049000db76491/Image_1.jpeg", "asset-name": "Image_1.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -867,7 +867,7 @@ "display-type": "display", "asset-uid": "blta55d379a7c380155", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blta55d379a7c380155/6500d116a39049000db7648d/Image_2.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blta55d379a7c380155/6500d116a39049000db7648d/Image_2.jpeg", "asset-name": "Image_2.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -973,7 +973,7 @@ "display-type": "display", "asset-uid": "blt691bf4de7736a124", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt691bf4de7736a124/6500d117103154000dae6bd7/Image_3.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt691bf4de7736a124/6500d117103154000dae6bd7/Image_3.jpeg", "asset-name": "Image_3.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -1256,7 +1256,7 @@ "file_size": "370751", "tags": [], "filename": "Image_1.jpeg", - "url": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt759bd3ebb372f518/6500d116a39049000db76491/Image_1.jpeg", + "url": "***REMOVED***/v3/assets/***REMOVED***/blt759bd3ebb372f518/6500d116a39049000db76491/Image_1.jpeg", "ACL": [], "parent_uid": "bltecb4c7ac7cba49cf", "_version": 1, @@ -1282,7 +1282,7 @@ "file_size": "432469", "tags": [], "filename": "Image_2.jpeg", - "url": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blta55d379a7c380155/6500d116a39049000db7648d/Image_2.jpeg", + "url": "***REMOVED***/v3/assets/***REMOVED***/blta55d379a7c380155/6500d116a39049000db7648d/Image_2.jpeg", "ACL": [], "parent_uid": "bltecb4c7ac7cba49cf", "_version": 1, @@ -1308,7 +1308,7 @@ "file_size": "178058", "tags": [], "filename": "Image_3.jpeg", - "url": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt691bf4de7736a124/6500d117103154000dae6bd7/Image_3.jpeg", + "url": "***REMOVED***/v3/assets/***REMOVED***/blt691bf4de7736a124/6500d117103154000dae6bd7/Image_3.jpeg", "ACL": [], "parent_uid": "bltecb4c7ac7cba49cf", "_version": 1, diff --git a/src/test/resources/reports/issue007.json b/src/test/resources/reports/issue007.json index 1c2eeb3..976653a 100644 --- a/src/test/resources/reports/issue007.json +++ b/src/test/resources/reports/issue007.json @@ -160,7 +160,7 @@ "text": " " } ], - "uid": "eaac147bdd274e57b9c62175cd6e9ec9" + "uid": "***REMOVED***" }, { "text": "" @@ -596,7 +596,7 @@ "display-type": "display", "asset-uid": "blt3ac5326ad75c23c1", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt3ac5326ad75c23c1/64ff36e00812c3000a04e7c2/7667.gif", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt3ac5326ad75c23c1/64ff36e00812c3000a04e7c2/7667.gif", "asset-name": "7667.gif", "asset-type": "image/gif", "type": "asset", @@ -696,7 +696,7 @@ "display-type": "display", "asset-uid": "blt7b78a9dd75a31b47", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt7b78a9dd75a31b47/64ff370fa39049000db760b8/rtaImage_(26).jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt7b78a9dd75a31b47/64ff370fa39049000db760b8/rtaImage_(26).jpeg", "asset-name": "rtaImage_(26).jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -856,7 +856,7 @@ "display-type": "display", "asset-uid": "blta6f1f0e7fe266d3f", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blta6f1f0e7fe266d3f/65087f426517c0000dfcb255/rtaImage_-_2023-09-18T094741.995.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blta6f1f0e7fe266d3f/65087f426517c0000dfcb255/rtaImage_-_2023-09-18T094741.995.jpeg", "asset-name": "rtaImage_-_2023-09-18T094741.995.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -956,7 +956,7 @@ "display-type": "display", "asset-uid": "bltcaa03bd408b030ea", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/bltcaa03bd408b030ea/65087f6c380e94000a18896c/rtaImage_-_2023-09-18T094828.540.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/bltcaa03bd408b030ea/65087f6c380e94000a18896c/rtaImage_-_2023-09-18T094828.540.jpeg", "asset-name": "rtaImage_-_2023-09-18T094828.540.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -1025,7 +1025,7 @@ "display-type": "display", "asset-uid": "blt37ea67f83b7296a9", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt37ea67f83b7296a9/65087faca39049000db77846/rtaImage_-_2023-09-18T094930.009.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt37ea67f83b7296a9/65087faca39049000db77846/rtaImage_-_2023-09-18T094930.009.jpeg", "asset-name": "rtaImage_-_2023-09-18T094930.009.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -1130,7 +1130,7 @@ "display-type": "display", "asset-uid": "blt9a040f6870840f3d", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt9a040f6870840f3d/65087fe6269cb7000ace3fed/rtaImage_-_2023-09-18T095028.304.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt9a040f6870840f3d/65087fe6269cb7000ace3fed/rtaImage_-_2023-09-18T095028.304.jpeg", "asset-name": "rtaImage_-_2023-09-18T095028.304.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -1457,7 +1457,7 @@ "display-type": "display", "asset-uid": "bltb9bbe5a6cd194057", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/bltb9bbe5a6cd194057/6508803fd63b5d000a9cd924/rtaImage_-_2023-09-18T095159.369.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/bltb9bbe5a6cd194057/6508803fd63b5d000a9cd924/rtaImage_-_2023-09-18T095159.369.jpeg", "asset-name": "rtaImage_-_2023-09-18T095159.369.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -1549,7 +1549,7 @@ "display-type": "display", "asset-uid": "bltecc3e6194d52b087", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/bltecc3e6194d52b087/6508806b269cb7000ace3ff1/rtaImage_-_2023-09-18T095240.404.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/bltecc3e6194d52b087/6508806b269cb7000ace3ff1/rtaImage_-_2023-09-18T095240.404.jpeg", "asset-name": "rtaImage_-_2023-09-18T095240.404.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -1625,7 +1625,7 @@ "display-type": "display", "asset-uid": "blt3e86d2491d932566", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt3e86d2491d932566/650880954f22f8000d8c7b79/rtaImage_-_2023-09-18T095319.050.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt3e86d2491d932566/650880954f22f8000d8c7b79/rtaImage_-_2023-09-18T095319.050.jpeg", "asset-name": "rtaImage_-_2023-09-18T095319.050.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -1722,7 +1722,7 @@ "display-type": "display", "asset-uid": "blta11605d23b0cbb0a", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blta11605d23b0cbb0a/650880cd103154000dae7f57/rtaImage_-_2023-09-18T095415.921.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blta11605d23b0cbb0a/650880cd103154000dae7f57/rtaImage_-_2023-09-18T095415.921.jpeg", "asset-name": "rtaImage_-_2023-09-18T095415.921.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -1805,7 +1805,7 @@ "display-type": "display", "asset-uid": "blt30e7dfc04df37f95", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt30e7dfc04df37f95/650880fc4f22f8000d8c7b82/rtaImage_-_2023-09-18T095500.557.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt30e7dfc04df37f95/650880fc4f22f8000d8c7b82/rtaImage_-_2023-09-18T095500.557.jpeg", "asset-name": "rtaImage_-_2023-09-18T095500.557.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -2025,7 +2025,7 @@ "display-type": "display", "asset-uid": "blt702e8734e2fed7c4", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt702e8734e2fed7c4/650881376517c0000dfcb263/rtaImage_-_2023-09-18T095554.987.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt702e8734e2fed7c4/650881376517c0000dfcb263/rtaImage_-_2023-09-18T095554.987.jpeg", "asset-name": "rtaImage_-_2023-09-18T095554.987.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -2250,7 +2250,7 @@ "display-type": "display", "asset-uid": "blt45bf67d4d60a48cb", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt45bf67d4d60a48cb/6508823d6517c0000dfcb26d/rtaImage_-_2023-09-18T095854.808.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt45bf67d4d60a48cb/6508823d6517c0000dfcb26d/rtaImage_-_2023-09-18T095854.808.jpeg", "asset-name": "rtaImage_-_2023-09-18T095854.808.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -2577,7 +2577,7 @@ "display-type": "display", "asset-uid": "blta657be3f26a6e6c4", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blta657be3f26a6e6c4/6508828d6517c0000dfcb272/rtaImage_-_2023-09-18T100148.041.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blta657be3f26a6e6c4/6508828d6517c0000dfcb272/rtaImage_-_2023-09-18T100148.041.jpeg", "asset-name": "rtaImage_-_2023-09-18T100148.041.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -2646,7 +2646,7 @@ "display-type": "display", "asset-uid": "blt4ecce8fc93706a60", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt4ecce8fc93706a60/650882c0a39049000db7785c/rtaImage_-_2023-09-18T100237.804.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt4ecce8fc93706a60/650882c0a39049000db7785c/rtaImage_-_2023-09-18T100237.804.jpeg", "asset-name": "rtaImage_-_2023-09-18T100237.804.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -2715,7 +2715,7 @@ "display-type": "display", "asset-uid": "blt120fa9024a2c9623", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt120fa9024a2c9623/650882e7a39049000db77860/rtaImage_-_2023-09-18T100318.987.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt120fa9024a2c9623/650882e7a39049000db77860/rtaImage_-_2023-09-18T100318.987.jpeg", "asset-name": "rtaImage_-_2023-09-18T100318.987.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -2891,7 +2891,7 @@ "display-type": "display", "asset-uid": "blt388f503810e45210", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt388f503810e45210/65088368380e94000a188980/rtaImage_-_2023-09-18T100448.348.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt388f503810e45210/65088368380e94000a188980/rtaImage_-_2023-09-18T100448.348.jpeg", "asset-name": "rtaImage_-_2023-09-18T100448.348.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -3497,7 +3497,7 @@ "display-type": "display", "asset-uid": "blt8fe8ec2de66453e4", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt8fe8ec2de66453e4/650883d26517c0000dfcb27b/rtaImage_-_2023-09-18T100703.887.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt8fe8ec2de66453e4/650883d26517c0000dfcb27b/rtaImage_-_2023-09-18T100703.887.jpeg", "asset-name": "rtaImage_-_2023-09-18T100703.887.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -3632,7 +3632,7 @@ "display-type": "display", "asset-uid": "blt886c8f2ef564ee52", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt886c8f2ef564ee52/6508840fd63b5d000a9cd935/rtaImage_-_2023-09-18T100802.800.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt886c8f2ef564ee52/6508840fd63b5d000a9cd935/rtaImage_-_2023-09-18T100802.800.jpeg", "asset-name": "rtaImage_-_2023-09-18T100802.800.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -3873,7 +3873,7 @@ "display-type": "display", "asset-uid": "bltf93c8e91f02fa09f", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/bltf93c8e91f02fa09f/65088449d63b5d000a9cd939/rtaImage_-_2023-09-18T100902.181.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/bltf93c8e91f02fa09f/65088449d63b5d000a9cd939/rtaImage_-_2023-09-18T100902.181.jpeg", "asset-name": "rtaImage_-_2023-09-18T100902.181.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -4238,7 +4238,7 @@ "display-type": "display", "asset-uid": "blte313047d7d705499", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blte313047d7d705499/65088493269cb7000ace4002/rtaImage_(27).png", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blte313047d7d705499/65088493269cb7000ace4002/rtaImage_(27).png", "asset-name": "rtaImage_(27).png", "asset-type": "image/png", "type": "asset", @@ -4498,7 +4498,7 @@ "display-type": "display", "asset-uid": "blt9757ec78b480abc5", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt9757ec78b480abc5/650884f4269cb7000ace4006/Remove_Variants_(2).png", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt9757ec78b480abc5/650884f4269cb7000ace4006/Remove_Variants_(2).png", "asset-name": "Remove_Variants_(2).png", "asset-type": "image/png", "type": "asset", @@ -4594,7 +4594,7 @@ "display-type": "display", "asset-uid": "blt5836f49fccc75730", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt5836f49fccc75730/65088535e877e9000ae88e34/rtaImage_-_2023-09-18T101306.095.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt5836f49fccc75730/65088535e877e9000ae88e34/rtaImage_-_2023-09-18T101306.095.jpeg", "asset-name": "rtaImage_-_2023-09-18T101306.095.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -4674,7 +4674,7 @@ "display-type": "display", "asset-uid": "blt7786512e2c01899a", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt7786512e2c01899a/65088560103154000dae7f6e/rtaImage_-_2023-09-18T101351.206.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt7786512e2c01899a/65088560103154000dae7f6e/rtaImage_-_2023-09-18T101351.206.jpeg", "asset-name": "rtaImage_-_2023-09-18T101351.206.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -4754,7 +4754,7 @@ "display-type": "display", "asset-uid": "blt78ff501a37adf5d6", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt78ff501a37adf5d6/650885946517c0000dfcb280/rtaImage_-_2023-09-18T101442.883.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt78ff501a37adf5d6/650885946517c0000dfcb280/rtaImage_-_2023-09-18T101442.883.jpeg", "asset-name": "rtaImage_-_2023-09-18T101442.883.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -4859,7 +4859,7 @@ "display-type": "display", "asset-uid": "blt7004615fb784971b", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blt7004615fb784971b/650885bca39049000db77869/rtaImage_-_2023-09-18T101524.314.jpeg", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blt7004615fb784971b/650885bca39049000db77869/rtaImage_-_2023-09-18T101524.314.jpeg", "asset-name": "rtaImage_-_2023-09-18T101524.314.jpeg", "asset-type": "image/jpeg", "type": "asset", @@ -4948,7 +4948,7 @@ "display-type": "display", "asset-uid": "blte644efc92e6967c3", "content-type-uid": "sys_assets", - "asset-link": "https://***REMOVED***.contentstack.com/v3/assets/***REMOVED***/blte644efc92e6967c3/650885e74f22f8000d8c7b93/rtaImage_(28).png", + "asset-link": "***REMOVED***/v3/assets/***REMOVED***/blte644efc92e6967c3/650885e74f22f8000d8c7b93/rtaImage_(28).png", "asset-name": "rtaImage_(28).png", "asset-type": "image/png", "type": "asset", From 59160d1584eb4f68ac87545181c1e32104f31b44 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Fri, 6 Sep 2024 07:23:28 +0100 Subject: [PATCH 02/13] fix: maven publish take 2 --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 7631c81..41be741 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -23,7 +23,7 @@ jobs: # gpg-passphrase: GPG_PASSPHRASE # Build and publish to a local Maven repository for testing - name: Build and Publish to Local Maven Repository - run: mvn --batch-mode clean install deploy -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository + run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository # - name: Publish package # run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy From 082457c752dc068ec0ce964bc106e480cbc0437a Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Fri, 6 Sep 2024 07:27:31 +0100 Subject: [PATCH 03/13] fix: maven publish take 3 --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 41be741..24bcf60 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -23,7 +23,7 @@ jobs: # gpg-passphrase: GPG_PASSPHRASE # Build and publish to a local Maven repository for testing - name: Build and Publish to Local Maven Repository - run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository + run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DskipTests=true -DskipNexusStaging=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository # - name: Publish package # run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy From e3e59f2967935aa3af483fa1539a665ba10f28e2 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Fri, 6 Sep 2024 07:28:58 +0100 Subject: [PATCH 04/13] fix: maven publish take 4 --- .github/workflows/maven-publish.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 24bcf60..16f47b2 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -16,11 +16,11 @@ jobs: with: java-version: '11' distribution: 'adopt' - # server-id: ossrh - # server-username: MAVEN_USERNAME - # server-password: MAVEN_PASSWORD - # gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - # gpg-passphrase: GPG_PASSPHRASE + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: GPG_PASSPHRASE # Build and publish to a local Maven repository for testing - name: Build and Publish to Local Maven Repository run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DskipTests=true -DskipNexusStaging=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository From f5a117f0b31464334ee259ef80ad5dfce2d006eb Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Fri, 6 Sep 2024 07:38:15 +0100 Subject: [PATCH 05/13] fix: maven publish take 5 --- .github/workflows/maven-publish.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 16f47b2..2160a13 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -22,8 +22,15 @@ jobs: gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE # Build and publish to a local Maven repository for testing - - name: Build and Publish to Local Maven Repository - run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DskipTests=true -DskipNexusStaging=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository + # - name: Build and Publish to Local Maven Repository + # run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DskipTests=true -DskipNexusStaging=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository + - name: Set up Maven settings + run: | + mkdir -p $HOME/.m2 + echo "ossrh${{ secrets.OSSRH_USERNAME }}${{ secrets.OSSRH_PASSWORD }}" > $HOME/.m2/settings.xml + + - name: Publish to Maven Central + run: mvn --batch-mode clean deploy # - name: Publish package # run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy From 2a5a4a8304417ff6c7c2b685e43e972486b5feb4 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Fri, 6 Sep 2024 07:39:55 +0100 Subject: [PATCH 06/13] fix: maven publish take 6 --- .github/workflows/maven-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 2160a13..4e632ff 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -29,8 +29,8 @@ jobs: mkdir -p $HOME/.m2 echo "ossrh${{ secrets.OSSRH_USERNAME }}${{ secrets.OSSRH_PASSWORD }}" > $HOME/.m2/settings.xml - - name: Publish to Maven Central - run: mvn --batch-mode clean deploy + - name: Build and Publish to Local Maven Repository + run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DskipTests=true -DskipNexusStaging=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository # - name: Publish package # run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy From bb4647a9eef60ea3f877a433979da73cb0a4a57b Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Sun, 8 Sep 2024 13:43:41 +0100 Subject: [PATCH 07/13] fix: trying to publish with original config --- .github/workflows/maven-publish.yml | 61 +++++++++++------------------ 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 4e632ff..30e7abd 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -1,8 +1,7 @@ name: Publish package to the Maven Central Repository on: pull_request: - # release: - # types: [ created ] + # types: [ created ] jobs: publish-maven: runs-on: ubuntu-latest @@ -21,39 +20,25 @@ jobs: server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE - # Build and publish to a local Maven repository for testing - # - name: Build and Publish to Local Maven Repository - # run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DskipTests=true -DskipNexusStaging=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository - - name: Set up Maven settings - run: | - mkdir -p $HOME/.m2 - echo "ossrh${{ secrets.OSSRH_USERNAME }}${{ secrets.OSSRH_PASSWORD }}" > $HOME/.m2/settings.xml - - - name: Build and Publish to Local Maven Repository - run: mvn --batch-mode clean install deploy -Dgpg.skip=true -DskipTests=true -DskipNexusStaging=true -DaltDeploymentRepository=local::default::file://$HOME/.m2/repository - - # - name: Publish package - # run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy - # env: - # MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - # MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - # GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - # Optional: Verify the artifacts are published in the local repository - - name: Verify Local Publish - run: ls -R $HOME/.m2/repository/com.contentstack.sdk/utils - # publish-github: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # - name: Set up Java for publishing to GitHub Packages - # uses: actions/setup-java@v3 - # with: - # java-version: '11' - # distribution: 'adopt' - # server-id: github - # gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - # gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} - # - name: Publish to GitHub Packages - # run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + - name: Publish package + run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + publish-github: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Java for publishing to GitHub Packages + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + server-id: github + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} + - name: Publish to GitHub Packages + run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From e4b4a83a56aa807b32a5cf8cac23c439840e2ca6 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Sun, 8 Sep 2024 13:56:43 +0100 Subject: [PATCH 08/13] fix: trying to publish with original config take 2 --- .github/workflows/maven-publish.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 30e7abd..61aff1c 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -38,6 +38,10 @@ jobs: server-id: github gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} + - name: Set up Maven settings + run: | + mkdir -p $HOME/.m2 + echo "ossrh${{ secrets.OSSRH_USERNAME }}${{ secrets.OSSRH_PASSWORD }}" > $HOME/.m2/settings.xml - name: Publish to GitHub Packages run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy env: From d05392bf1400febeb21448b4789f1a94f16f971e Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Sun, 8 Sep 2024 14:00:21 +0100 Subject: [PATCH 09/13] fix: trying to publish with original config take 3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d81d322..d332c8e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.contentstack.sdk utils - 1.2.11 + 1.2.12 jar Contentstack-utils Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS From 930a6b5626c0f32a45dd5d90a97ff7c51f78502f Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Sun, 8 Sep 2024 14:15:22 +0100 Subject: [PATCH 10/13] fix: trying to publish with original config take 4 --- .github/workflows/maven-publish.yml | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 61aff1c..647c53d 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -38,10 +38,10 @@ jobs: server-id: github gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} - - name: Set up Maven settings - run: | - mkdir -p $HOME/.m2 - echo "ossrh${{ secrets.OSSRH_USERNAME }}${{ secrets.OSSRH_PASSWORD }}" > $HOME/.m2/settings.xml + # - name: Set up Maven settings + # run: | + # mkdir -p $HOME/.m2 + # echo "ossrh${{ secrets.OSSRH_USERNAME }}${{ secrets.OSSRH_PASSWORD }}" > $HOME/.m2/settings.xml - name: Publish to GitHub Packages run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy env: diff --git a/pom.xml b/pom.xml index d332c8e..0fbf341 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.contentstack.sdk utils - 1.2.12 + 1.2.13 jar Contentstack-utils Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS From a2a23de6220d65fb25271ed4cb605535cfb8c349 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Sun, 8 Sep 2024 15:14:46 +0100 Subject: [PATCH 11/13] fix: trying to publish with original config take 5 --- .github/workflows/maven-publish.yml | 21 +++++++++++++++++---- pom.xml | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 647c53d..2b7754b 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -38,10 +38,23 @@ jobs: server-id: github gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} - # - name: Set up Maven settings - # run: | - # mkdir -p $HOME/.m2 - # echo "ossrh${{ secrets.OSSRH_USERNAME }}${{ secrets.OSSRH_PASSWORD }}" > $HOME/.m2/settings.xml + - name: Set up Maven settings for OSSRH + run: | + mkdir -p $HOME/.m2 + echo " + + + ossrh + ${{ secrets.OSSRH_USERNAME }} + ${{ secrets.OSSRH_PASSWORD }} + + + github + ${{ github.actor }} + ${{ secrets.GITHUB_TOKEN }} + + + " > $HOME/.m2/settings.xml - name: Publish to GitHub Packages run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy env: diff --git a/pom.xml b/pom.xml index 0fbf341..bf57422 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.contentstack.sdk utils - 1.2.13 + 1.2.14 jar Contentstack-utils Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS From b5ee2165b9e016da4b10c486a2cbca0ca5457160 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Sun, 8 Sep 2024 15:18:17 +0100 Subject: [PATCH 12/13] fix: fixed github workflow issue --- .github/workflows/maven-publish.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 2b7754b..add35be 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -1,7 +1,7 @@ name: Publish package to the Maven Central Repository on: - pull_request: - # types: [ created ] + release: + types: [ created ] jobs: publish-maven: runs-on: ubuntu-latest diff --git a/pom.xml b/pom.xml index bf57422..cc0058c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.contentstack.sdk utils - 1.2.14 + 1.2.15 jar Contentstack-utils Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS From adb3753c7ad8f8bdbf62352cae59c37a1c006513 Mon Sep 17 00:00:00 2001 From: Vikram Kalta Date: Mon, 30 Sep 2024 21:59:11 +0100 Subject: [PATCH 13/13] fix: snyk issue --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc0058c..83f2ac1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.5.3 2.0.1.Final 20240303 - 6.1.6 + 6.1.12 1.12.0