Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Snyk issues #22

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
005cf5c
Fixed Snyk issues
reeshika-h Apr 26, 2024
57b9bfa
fixed snyk issue:
reeshika-h Apr 26, 2024
29f21c6
fix: codeql analysis
reeshika-h Apr 26, 2024
b33e41d
fix:codeql
reeshika-h Apr 26, 2024
d97061e
fixed codeql : upgraded java version from 1.8 to 11
reeshika-h Apr 26, 2024
a5cd324
added build project command
reeshika-h Apr 26, 2024
751a0ac
added the correct file path
reeshika-h Apr 26, 2024
2a6696b
java version changes
reeshika-h Apr 29, 2024
fd11b63
removed build in codeql.yml
reeshika-h Apr 29, 2024
1c94402
java version 1.8
reeshika-h Apr 29, 2024
18b151a
java version 1.8
reeshika-h Apr 29, 2024
172b94b
java version upgrade
reeshika-h Apr 29, 2024
53742a1
Merge branch 'master' into snyk/cs-44516-upgrade
aravindbuilt Jun 19, 2024
6b9f39c
Update sca-scan.yml
aravindbuilt Jun 19, 2024
d93b852
fix: brought back autobuild task in codeql workflow
Jul 23, 2024
20ec089
fix: upgraded java version
Aug 6, 2024
f63bc47
fix: updated java version
Aug 6, 2024
84f8397
fix: updated workflow file
Aug 6, 2024
3b3227e
fix: updated workflow file
Aug 6, 2024
35e23b1
fix: updated workflow file
Aug 6, 2024
15e7d7c
fix: updated workflow file
Aug 6, 2024
eb6bd5b
fix: updated workflow file
Aug 6, 2024
f6c7a86
fix: updated workflow file
Aug 6, 2024
9745fd2
fix: updated workflow file
Aug 6, 2024
51fc23b
fix: updated workflow file
Aug 6, 2024
44ecd65
fix: updated pom.xml
Aug 10, 2024
483985e
fix: updated pom.xml
Aug 10, 2024
048d725
fix: updated pom.xml
Aug 10, 2024
bf6aa20
fix: updated pom.xml
Aug 10, 2024
67a0252
fix: updated pom.xml
Aug 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ name: "CodeQL"
on:
pull_request:
# The branches below must be a subset of the branches above
branches: '*'
branches: [ master ]

jobs:
analyze:
Expand Down Expand Up @@ -48,21 +48,34 @@ jobs:
# 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
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
# - name: Autobuild
# uses: github/codeql-action/autobuild@v2

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
# - name: Autobuild
# uses: github/codeql-action/autobuild@v2

# Conditional build steps based on the language
# Custom build steps
- name: Set up JDK 8
if: matrix.language == 'java'
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin' # You can use 'zulu' or other distributions if preferred

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
- name: Build with Maven
if: matrix.language == 'java'
run: mvn -B package --file pom.xml

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v2
9 changes: 5 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 1.8
java-version: '8'
distribution: 'temurin' # You can use 'zulu' or other distributions if preferred
- name: Build with Maven
run: mvn -B package --file pom.xml
run: mvn -B package --file pom.xml
4 changes: 2 additions & 2 deletions .github/workflows/sca-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/node@master
uses: snyk/actions/maven@master
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
with:
args: --all-projects --fail-on=all
args: --fail-on=all
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,6 @@ Temporary Items
.project
*/target/**
/.env

.vscode/
target/*
40 changes: 31 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,30 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.4</version>
<!-- <version>3.1.11</version> -->
<version>2.7.13</version>
</parent>

<properties>
<java.version>1.8</java.version>
<spring-boot.version>3.1.4</spring-boot.version>
<!-- <java.version>8</java.version>
<spring-boot.version>3.2.0</spring-boot.version>
<json-smart.version>5.2.2</json-smart.version>
<contentstack.version>1.12.2</contentstack.version>
<contentstack.version>1.13.0</contentstack.version> -->
<java.version>1.8</java.version> <!-- Updated to match JDK 8 syntax -->
<spring-boot.version>2.7.13</spring-boot.version> <!-- Matching Spring Boot version -->
<json-smart.version>5.2.2</json-smart.version>
<contentstack.version>1.13.0</contentstack.version>
<maven.compiler.source>1.8</maven.compiler.source> <!-- Source version -->
<maven.compiler.target>1.8</maven.compiler.target> <!-- Target version -->
<maven.compiler.verbose>true</maven.compiler.verbose>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<!-- <version>${spring-boot.version}</version> -->
<version>3.2.7</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -35,17 +44,19 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
<version>${spring-boot.version}</version>
<!-- <version>${spring-boot.version}</version> -->
<version>3.0.10</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot.version}</version>
<!-- <version>${spring-boot.version}</version> -->
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>com.contentstack.sdk</groupId>
<artifactId>java</artifactId>
<version>1.12.2</version>
<version>1.13.0</version>
</dependency>
<dependency>
<groupId>io.github.cdimascio</groupId>
Expand All @@ -60,7 +71,18 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>3.1.4</version>
<version>2.7.13</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<verbose>true</verbose>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Loading