Skip to content

Commit 992439e

Browse files
Merge branch 'master' into dev
2 parents 5d23c6e + 9d6e4e0 commit 992439e

File tree

13 files changed

+328
-158
lines changed

13 files changed

+328
-158
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
pull_request:
16+
# The branches below must be a subset of the branches above
17+
branches: '*'
18+
19+
jobs:
20+
analyze:
21+
name: Analyze
22+
runs-on: ubuntu-latest
23+
permissions:
24+
actions: read
25+
contents: read
26+
security-events: write
27+
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
language: [ 'java' ]
32+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
33+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
34+
35+
steps:
36+
- name: Checkout repository
37+
uses: actions/checkout@v3
38+
39+
# Initializes the CodeQL tools for scanning.
40+
- name: Initialize CodeQL
41+
uses: github/codeql-action/init@v2
42+
with:
43+
languages: ${{ matrix.language }}
44+
# If you wish to specify custom queries, you can do so here or in a config file.
45+
# By default, queries listed here will override any specified in a config file.
46+
# Prefix the list here with "+" to use these queries and those in the config file.
47+
48+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
49+
# queries: security-extended,security-and-quality
50+
51+
52+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
53+
# If this step fails, then you should remove it and run the build manually (see below)
54+
- name: Autobuild
55+
uses: github/codeql-action/autobuild@v2
56+
57+
# ℹ️ Command-line programs to run using the OS shell.
58+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
59+
60+
# If the Autobuild fails above, remove it and uncomment the following three lines.
61+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
62+
63+
# - run: |
64+
# echo "Run, Build Application using script"
65+
# ./location_of_script_within_repo/buildscript.sh
66+
67+
- name: Perform CodeQL Analysis
68+
uses: github/codeql-action/analyze@v2

.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/sast-scan.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: SAST Scan
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
jobs:
6+
security:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Horusec Scan
11+
run: docker run -v /var/run/docker.sock:/var/run/docker.sock -v $(pwd):/src horuszup/horusec-cli:latest horusec start -p /src -P $(pwd)

.github/workflows/sca-scan.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Source Composition Analysis Scan
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
jobs:
6+
security:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@master
10+
- name: Run Snyk to check for vulnerabilities
11+
uses: snyk/actions/maven@master
12+
env:
13+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/secrets-scan.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Secrets Scan
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
jobs:
6+
security:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Gittyleaks
11+
uses: gupy-io/gittyleaks-action@v0.1

CHANGELOG.md

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
# CHANGELOG
22

3-
## Version 1.10.0
3+
## v1.10.1
44

5-
### Date: 16-May-2022
5+
### Date: 17-Jun-2022
6+
7+
- #57 CompileJava issue in Gradle build ecosystem (contentstack-utils)
8+
- #58 content_type : Invalid warning for contentTypeUid
9+
10+
---
11+
12+
## v1.10.0
13+
14+
### Date: 03-Jun-2022
615

716
- High increase in memory consumption & thread count when updated to the 1.9.0 version
817
- Setting Proxy in config [#52](https://github.com/contentstack/contentstack-java/issues/52)
918
- Adding query parameter for the Live Preview
10-
- Enhancement in logger for the different class ( Suggested through a pull request ) [#51](https://github.com/contentstack/contentstack-java/pull/51)
19+
- Enhancement in logger for the different class ( Suggested through a pull
20+
request ) [#51](https://github.com/contentstack/contentstack-java/pull/51)
1121

1222
---
1323

14-
## Version 1.9.0
24+
## v1.9.0
1525

1626
### Date: 16-Mar-2022
1727

@@ -21,7 +31,7 @@
2131

2232
---
2333

24-
## Version 1.8.1
34+
## v1.8.1
2535

2636
### Date: 27-Jan-2022
2737

@@ -31,7 +41,7 @@
3141

3242
---
3343

34-
## Version 1.8.0
44+
## v1.8.0
3545

3646
### Date: 01-Nov-2021
3747

@@ -44,7 +54,7 @@
4454

4555
---
4656

47-
## Version 1.7.0
57+
## v1.7.0
4858

4959
### Date: 12-JUL-2021
5060

@@ -54,7 +64,7 @@
5464

5565
---
5666

57-
## Version 1.6.0
67+
## v1.6.0
5868

5969
### Date: 05-APR-2021
6070

@@ -63,15 +73,15 @@
6373

6474
---
6575

66-
## Version 1.5.7
76+
## v1.5.7
6777

6878
### Date: 20-Feb-2021
6979

7080
Document updated
7181

7282
---
7383

74-
## Version 1.5.6
84+
## v1.5.6
7585

7686
### Date: 27-Jan-2021
7787

@@ -82,7 +92,7 @@ New Features:
8292

8393
---
8494

85-
## Version 1.5.5
95+
## v1.5.5
8696

8797
### Date: 22-Jan-2021
8898

@@ -103,7 +113,7 @@ New Features:
103113

104114
---
105115

106-
## Version 1.5.4
116+
## v1.5.4
107117

108118
### Date: 08-DEC-2020
109119

@@ -116,15 +126,15 @@ New Features:
116126

117127
---
118128

119-
## Version 1.5.3
129+
## v1.5.3
120130

121131
### Date: 28-July-2020
122132

123133
- **Build Issue** Build update issue fixed
124134

125135
---
126136

127-
## Version 1.5.2
137+
## v1.5.2
128138

129139
### Date: 23-July-2020
130140

@@ -134,15 +144,15 @@ New Features:
134144

135145
---
136146

137-
## Version 1.5.1
147+
## v1.5.1
138148

139149
### Date: 13-Jan-2020
140150

141151
- **Dependency Vulnerability** Java Github reported vulnerable issue on dependency logj
142152

143153
---
144154

145-
## Version 1.5.0
155+
## v1.5.0
146156

147157
### Date: 15-Nov-2019
148158

@@ -153,15 +163,15 @@ New Features:
153163

154164
---
155165

156-
## Version 1.4.2
166+
## v1.4.2
157167

158168
### Date: 03-Sept-2019
159169

160170
- **Config** - Added support for Region in Config.
161171

162172
---
163173

164-
## Version 1.4.1
174+
## v1.4.1
165175

166176
### Date: 21-August-2019
167177

@@ -170,7 +180,7 @@ New Features:
170180

171181
---
172182

173-
## Version 1.4.0
183+
## v1.4.0
174184

175185
### Date: 26-July-2019
176186

@@ -184,15 +194,15 @@ New Features:
184194

185195
---
186196

187-
## Version 1.3.3
197+
## v1.3.3
188198

189199
### Date: 21-June-2019
190200

191201
- **HOTFIX**: Override response hot-fix
192202

193203
---
194204

195-
## Version 1.3.2
205+
## v1.3.2
196206

197207
### Date: 13-May-2019
198208

@@ -201,7 +211,7 @@ New Features:
201211

202212
---
203213

204-
## Version 1.3.1
214+
## v1.3.1
205215

206216
### Date: May-02-2019
207217

@@ -210,7 +220,7 @@ New Features:
210220

211221
---
212222

213-
## Version 1.3.0
223+
## v1.3.0
214224

215225
### Date: Apr-12-2019
216226

@@ -228,7 +238,7 @@ Below two support from the Config class has been removed permanently
228238

229239
---
230240

231-
## Version 1.2.1
241+
## v1.2.1
232242

233243
### Date: 14-Mar-2019
234244

@@ -240,7 +250,7 @@ Folder structure modified.
240250

241251
---
242252

243-
## Version 1.2.0
253+
## v1.2.0
244254

245255
### Date: 15-Dec-2017
246256

@@ -254,7 +264,7 @@ Folder structure modified.
254264

255265
---
256266

257-
## Version 1.1.0
267+
## v1.1.0
258268

259269
### Date: 10-Nov-2017
260270

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313

1414

1515
<properties>
16-
<sdk.version.snapshot>1.10.0-SNAPSHOT</sdk.version.snapshot>
17-
<sdk.version.release>1.10.0</sdk.version.release>
16+
<sdk.version.release>1.10.1-SNAPSHOT</sdk.version.release>
1817
<maven.compiler.target>1.8</maven.compiler.target>
1918
<maven.compiler.source>1.8</maven.compiler.source>
2019
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/contentstack/sdk/APIService.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88

99
import java.util.LinkedHashMap;
1010

11+
/**
12+
* @author Shailesh Mishra
13+
* @version 1.0.0
14+
* @since 12-12-2021
15+
*/
1116
public interface APIService {
1217
@GET
1318
Call<ResponseBody> getRequest(@Url String url, @HeaderMap LinkedHashMap<String, Object> headers);

0 commit comments

Comments
 (0)