Skip to content

Commit

Permalink
Merge pull request #8 from contentstack/development
Browse files Browse the repository at this point in the history
Development : Updated all dependencies to the latest one
  • Loading branch information
ishaileshmishra authored Sep 25, 2023
2 parents 13a3653 + fb65711 commit 7acdb34
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 124 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ jobs:

# 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
# - name: Autobuild
# uses: github/codeql-action/autobuild@v2

# ℹ️ 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
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/sast-scan.yml

This file was deleted.

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
11 changes: 0 additions & 11 deletions .github/workflows/secrets-scan.yml

This file was deleted.

63 changes: 0 additions & 63 deletions news-webapp.iml

This file was deleted.

77 changes: 42 additions & 35 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,59 +1,66 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.contentstack.springbootquickstart</groupId>
<artifactId>news-webapp</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>contentstack-java-webapp-example</name>
<description>Example News web app using contentstack java sdk and Spring Boot</description>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.contentstack.springbootquickstart</groupId>
<artifactId>news-webapp</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>contentstack-java-webapp-example</name>
<description>Example News web app using contentstack java sdk and Spring Boot</description>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.2.RELEASE</version>
</parent>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.4</version>
</parent>

<properties>
<java.version>1.8</java.version>
</properties>
<properties>
<java.version>1.8</java.version>
<spring-boot.version>3.1.4</spring-boot.version>
<json-smart.version>5.2.2</json-smart.version>
<contentstack.version>1.12.2</contentstack.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<dependency>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>com.contentstack.sdk</groupId>
<artifactId>java</artifactId>
<version>1.5.3</version>
<version>1.12.2</version>
</dependency>
<dependency>
<groupId>io.github.cdimascio</groupId>
<artifactId>java-dotenv</artifactId>
<version>${json-smart.version}</version>
</dependency>

<dependency>
<groupId>io.github.cdimascio</groupId>
<artifactId>java-dotenv</artifactId>
<version>5.2.2</version>
</dependency>

</dependencies>
</dependencies>

<build>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>3.1.4</version>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 7acdb34

Please sign in to comment.