Skip to content

Commit 3054ab3

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # pom.xml
2 parents 962bedb + 412a261 commit 3054ab3

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ on:
33
push:
44
branches:
55
- master
6-
- 'dependabot/**'
7-
- '*'
86
pull_request:
97
types: [opened, synchronize, reopened]
108
jobs:
@@ -45,4 +43,4 @@ jobs:
4543
env:
4644
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
4745
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
48-
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=zzh1991_React-SpringBoot
46+
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=zzh1991_React-SpringBoot

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<a href="https://github.com/zzh1991/React-SpringBoot/blob/master/.travis.yml">
1717
<img src="https://img.shields.io/travis/zzh1991/React-SpringBoot/master.svg">
1818
</a>
19-
<a href="https://snyk.io/test/github/zzh1991/React-SpringBoot?targetFile=pom.xml">
20-
<img src="https://snyk.io/test/github/zzh1991/React-SpringBoot/badge.svg?targetFile=pom.xml" alt="Known Vulnerabilities" data-canonical-src="https://snyk.io/test/github/zzh1991/React-SpringBoot?targetFile=pom.xml" style="max-width:100%;">
21-
</a>
2219
</div>
2320
</div>
2421

@@ -248,5 +245,5 @@ Please ⭐️ this repository if this project helped you!
248245

249246
## 📝 License
250247

251-
Copyright © 2021 [zzh1991](https://github.com/zzh1991).<br />
248+
Copyright © 2022 [zzh1991](https://github.com/zzh1991).<br />
252249
This project is [MIT](https://github.com/zzh1991/React-SpringBoot/blob/master/LICENSE) licensed.

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<java.version>1.8</java.version>
1919
<guava.version>31.1-jre</guava.version>
2020
<swagger.version>3.0.0</swagger.version>
21-
<mybatis-plus-boot-starter.version>3.4.3.4</mybatis-plus-boot-starter.version>
21+
<mybatis-plus-boot-starter.version>3.5.2</mybatis-plus-boot-starter.version>
2222
<graphql-spring-boot-starter.version>11.1.0</graphql-spring-boot-starter.version>
2323
<graphql-java-tools.version>11.1.2</graphql-java-tools.version>
2424
<jsoup.version>1.14.3</jsoup.version>
@@ -27,7 +27,7 @@
2727
<druid.version>1.2.8</druid.version>
2828

2929
<graphql-java-extended-scalars.version>17.0</graphql-java-extended-scalars.version>
30-
<spring-cloud-commons.version>3.1.2</spring-cloud-commons.version>
30+
<spring-cloud-commons.version>3.1.3</spring-cloud-commons.version>
3131
<!-- plugin version -->
3232
<maven-lombok.version>1.18.20.0</maven-lombok.version>
3333

@@ -258,7 +258,7 @@
258258
<plugin>
259259
<groupId>org.apache.maven.plugins</groupId>
260260
<artifactId>maven-compiler-plugin</artifactId>
261-
<version>3.8.1</version>
261+
<version>3.10.1</version>
262262
<configuration>
263263
<source>1.8</source>
264264
<target>1.8</target>

0 commit comments

Comments
 (0)