Merge branch 'master' of https://github.com/jpaulm/javafbp

jpaulm · Jun 3, 2021 · 324fe64 · 324fe64
2 parents 5641d5e + ad75d12
commit 324fe64
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/pom.xml b/pom.xml
@@ -16,13 +16,13 @@
  <dependency>
  <groupId>com.google.code.gson</groupId>
  <artifactId>gson</artifactId>
- <version>2.8.6</version>
+ <version>2.8.7</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>mysql</groupId>
  <artifactId>mysql-connector-java</artifactId>
- <version>8.0.22</version>
+ <version>8.0.25</version>
  <scope>provided</scope>
  </dependency>
  </dependencies>

diff --git a/renovate.json b/renovate.json
@@ -1,5 +1,9 @@
 {
  "extends": [
  "config:base"
- ]
+ ],
+ "automerge": true,
+ "major": {
+ "automerge": false
+ }
 }