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 @@ sign + + + --pinentry-mode + loopback + + diff --git a/src/main/java/com/contentstack/utils/render/DefaultOption.java b/src/main/java/com/contentstack/utils/render/DefaultOption.java index a713145..ac8bf6f 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 "" + "" + children + ""; + } return "" + children; } return "" + children;