Skip to content

Commit ebd9a55

Browse files
ishaileshmishraishaileshmishra
committed
Merge branch 'master' into development
2 parents 766d46f + 896f68b commit ebd9a55

23 files changed

+246
-55
lines changed

‎.github/workflows/check-branch.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: 'Check Branch'
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
check_branch:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Comment PR
11+
if: github.base_ref == 'master' && github.head_ref != 'next'
12+
uses: thollander/actions-comment-pull-request@v2
13+
with:
14+
message: |
15+
We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
16+
- name: Check branch
17+
if: github.base_ref == 'master' && github.head_ref != 'next'
18+
run: |
19+
echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
20+
exit 1

‎.github/workflows/jira.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Create JIRA ISSUE
2+
on:
3+
pull_request:
4+
types: [opened]
5+
jobs:
6+
security:
7+
if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'snyk-bot' || contains(github.event.pull_request.head.ref, 'snyk-fix-') || contains(github.event.pull_request.head.ref, 'snyk-upgrade-')}}
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Login into JIRA
12+
uses: atlassian/gajira-login@master
13+
env:
14+
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
15+
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
16+
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
17+
- name: Create a JIRA Issue
18+
id: create
19+
uses: atlassian/gajira-create@master
20+
with:
21+
project: ${{ secrets.JIRA_PROJECT }}
22+
issuetype: ${{ secrets.JIRA_ISSUE_TYPE }}
23+
summary: |
24+
${{ github.event.pull_request.title }}
25+
description: |
26+
PR: ${{ github.event.pull_request.html_url }}
27+
28+
fields: "${{ secrets.JIRA_FIELDS }}"

‎.github/workflows/maven-publish.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Publish package to the Maven Central Repository
2+
on:
3+
release:
4+
types: [ created ]
5+
jobs:
6+
publish-maven:
7+
runs-on: ubuntu-latest
8+
permissions:
9+
contents: read
10+
packages: write
11+
steps:
12+
- uses: actions/checkout@v3
13+
- name: Set up Maven Central Repository
14+
uses: actions/setup-java@v3
15+
with:
16+
java-version: '8'
17+
distribution: 'adopt'
18+
server-id: ossrh
19+
server-username: ${{ secrets.OSSRH_USERNAME }}
20+
server-password: ${{ secrets.OSSRH_TOKEN }}
21+
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
22+
- name: Publish package
23+
run: mvn --batch-mode deploy
24+
publish-github:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v3
28+
- name: Set up Java for publishing to GitHub Packages
29+
uses: actions/setup-java@v3
30+
with:
31+
java-version: '8'
32+
distribution: 'adopt'
33+
server-id: github
34+
- name: Publish to GitHub Packages
35+
run: mvn --batch-mode deploy
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sca-scan.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ jobs:
1111
uses: snyk/actions/maven@master
1212
env:
1313
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
14+
with:
15+
args: --fail-on=all

‎AUTHORS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Authors
2+
3+
- [ishaileshmishra](shailesh.mishra@***REMOVED***)
4+
- [shaileshmishra](mshaileshr@***REMOVED***)
5+
- [admin](dev@***REMOVED***)

‎CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @contentstack/security-admin @contentstack/sdk-admin
1+
* @contentstack/security-admin

‎Changelog.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
2+
# Changelog
3+
4+
A brief description of what changes project contains
5+
6+
7+
## Jun 26, 2023
8+
#### v1.2.1
9+
##### Jun 26, 2023
10+
New Line Issues while rendering Json object To HTML
11+
12+
## Updated Jsoup vulnerable dependency
13+
#### v1.2.0
14+
##### Oct 6, 2022
15+
- Updated Jsoup vulnerable dependency
16+
- jsonToHTML function support added
17+
18+
19+
## Fixed compile Issue
20+
#### v1.1.2
21+
##### Jun 16, 2022
22+
Fixed compile Issue
23+
24+
## Transitive dependencies updated
25+
#### v1.1.1
26+
##### Apr-06-2021
27+
Updated transitive dependencies to pom.xml
28+
29+
30+
## JSON RTE Feature Support
31+
#### v1.1.0
32+
##### Jun 1, 2022
33+
JSON RTE Feature Support
34+
35+
## Introducing Release Of Java Utils SDK
36+
#### v1.0.0
37+
##### Apr 6, 2021
38+
Initial release for Utils SDK
39+
## Support
40+
41+
For support, email [email protected] or join our Slack channel.
42+

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2012 - 2021 Contentstack
3+
Copyright (c) 2012 - 2023 Contentstack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This guide will help you get started with Contentstack Java Utils SDK to build a
1212

1313
### SDK Installation and Setup
1414

15-
To setup Utils SDK in your Java project, add the following dependency in the pom.xml file
15+
To setup [Utils SDK](https://mvnrepository.com/artifact/com.contentstack.sdk/utils) in your Java project, add the following dependency in the pom.xml file
1616

1717
```java
1818
<dependency>

‎SECURITY.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Security
2+
3+
Contentstack takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations.
4+
5+
If you believe you have found a security vulnerability in any Contentstack-owned repository, please report it to us as described below.
6+
7+
## Reporting Security Issues
8+
9+
**Please do not report security vulnerabilities through public GitHub issues.**
10+
11+
Send email to [security@***REMOVED***](mailto:security@***REMOVED***).
12+
13+
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.
14+
15+
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
16+
17+
- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
18+
- Full paths of source file(s) related to the manifestation of the issue
19+
- The location of the affected source code (tag/branch/commit or direct URL)
20+
- Any special configuration required to reproduce the issue
21+
- Step-by-step instructions to reproduce the issue
22+
- Proof-of-concept or exploit code (if possible)
23+
- Impact of the issue, including how an attacker might exploit the issue
24+
25+
This information will help us triage your report more quickly.
26+
27+
[https://www.***REMOVED***/trust/](https://www.***REMOVED***/trust/)

0 commit comments

Comments
 (0)