From 9b2eea597ef36ec2a3a1324153d7b252492ecd3d Mon Sep 17 00:00:00 2001
From: Vikram Kalta <vikramkalta@Vikrams-MacBook-Pro.local>
Date: Tue, 2 Apr 2024 20:46:23 +0100
Subject: [PATCH 1/2] fix: wrapped img tag with a tag

---
 pom.xml                                                       | 2 +-
 .../java/com/contentstack/utils/render/DefaultOption.java     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d68f72d..0941302 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.6</version>
+    <version>1.2.7</version>
     <packaging>jar</packaging>
     <name>Contentstack-utils</name>
     <description>Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS</description>
diff --git a/src/main/java/com/contentstack/utils/render/DefaultOption.java b/src/main/java/com/contentstack/utils/render/DefaultOption.java
index 7bdeab7..f1d0611 100644
--- a/src/main/java/com/contentstack/utils/render/DefaultOption.java
+++ b/src/main/java/com/contentstack/utils/render/DefaultOption.java
@@ -109,6 +109,10 @@ public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback ca
             case "img":
                 String assetLink = getNodeStr(nodeObject, "asset-link");
                 if (!assetLink.isEmpty()) {
+                    JSONObject attrs = nodeObject.optJSONObject("attrs");
+                    if (attrs.has("link")) {
+                        return "<a href=\"" + escapeInjectHtml(nodeObject, "link") + "\" />" + "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + children + "</a>";
+                    }
                     return "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + children;
                 }
                 return "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "src") + "\" />" + children;

From f486c5bb2075f96aa7142b12da15eae566d4ffa0 Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <abhinav.gupta@contentstack.com>
Date: Fri, 5 Apr 2024 11:17:59 +0530
Subject: [PATCH 2/2] fix: added a fix for publish workflow issue

---
 .github/workflows/maven-publish.yml | 21 ++++++++++++++-------
 pom.xml                             |  6 ++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index e10b45d..8c073f1 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -13,14 +13,19 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'adopt'
           server-id: ossrh
-          server-username: ${{ secrets.OSSRH_USERNAME }}
-          server-password: ${{ secrets.OSSRH_TOKEN }}
-          gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          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 deploy
+        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:
@@ -28,10 +33,12 @@ jobs:
       - name: Set up Java for publishing to GitHub Packages
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          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 deploy
+        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/pom.xml b/pom.xml
index 9f0de33..2fd21dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,6 +210,12 @@
                         <goals>
                             <goal>sign</goal>
                         </goals>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>