Update dependencies

Author: Brutus5000

build.gradle

@@ -234,7 +234,7 @@ dependencies {
   implementation("com.yahoo.elide:elide-datastore-multiplex:${elideVersion}")
 
   implementation("org.luaj:luaj-jse:${luajVersion}")
-  implementation("com.github.micheljung:nocatch:${nocatchVersion}")
+  implementation("io.github.micheljung:nocatch:${nocatchVersion}")
   implementation("org.apache.commons:commons-compress:${commonsCompressVersion}")
   implementation("org.json:json:${jsonVersion}")
 

gradle.properties

@@ -1,27 +1,26 @@
 version=snapshot
 profile=dev
 springDependencyManagementVersion=1.0.11.RELEASE
-springBootVersion=2.5.0
+springBootVersion=2.5.1
 javaxInjectVersion=1
-elideVersion=5.0.0-pr34
-mysqlConnectorVersion=8.0.23
+elideVersion=5.0.3
+mysqlConnectorVersion=8.0.25
 springfoxSwaggerVersion=3.0.0
 coverallsGradlePluginVersion=2.12.0
 springSecurityOauth2AutoConfigureVersion=2.5.0
 springSecurityOauth2Version=2.5.0.RELEASE
-guavaVersion=30.0-jre
+guavaVersion=30.1.1-jre
 jetbrainsAnnotationsVersion=13.0
 springBootAdminClientVersion=2.3.1
 luajVersion=3.0.1
-nocatchVersion=1.1
+nocatchVersion=2.0
 junitAddonsVersion=1.4
 githubApiVersion=1.127
-jgitVersionn=4.5.0.201609210915-r
-fafCommonsVersion=6d6219744c88f271fd1dd4903d4977f08db13c9e
-h2Version=1.4.193
+jgitVersionn=5.12.0.202106070339-r
+fafCommonsVersion=4330e1fffd8c8a78d18a9f3da74ddffb233ad159
 commonsCompressVersion=1.20
-jsonPath=2.2.0
-jsonPathAssert=2.2.0
-jsonapiConverterVersion=0.10
+jsonPath=2.6.0
+jsonPathAssert=2.6.0
+jsonapiConverterVersion=0.11
 codacyCoverageReporterVersion=6.2.0
-jsonVersion=20180813
+jsonVersion=20210307

src/main/java/com/faforever/api/data/domain/Achievement.java

@@ -22,7 +22,7 @@
 @Entity
 @Table(name = "achievement_definitions")
 @SecondaryTable(name = "achievement_statistics", pkJoinColumns = @PrimaryKeyJoinColumn(name = "achievement_id", referencedColumnName = "id"))
-@Include(type = Achievement.TYPE_NAME)
+@Include(name = Achievement.TYPE_NAME)
 @EntityListeners(AchievementLocalizationListener.class)
 @Setter
 public class Achievement {

src/main/java/com/faforever/api/data/domain/Avatar.java

@@ -21,7 +21,7 @@
 
 @Entity
 @Table(name = "avatars_list")
-@Include(type = Avatar.TYPE_NAME)
+@Include(name = Avatar.TYPE_NAME)
 @Setter
 @Type(Avatar.TYPE_NAME)
 @EntityListeners(AvatarEnricherListener.class)

src/main/java/com/faforever/api/data/domain/AvatarAssignment.java

@@ -24,7 +24,7 @@
 
 @Entity
 @Table(name = "avatars")
-@Include(type = AvatarAssignment.TYPE_NAME)
+@Include(name = AvatarAssignment.TYPE_NAME)
 @CreatePermission(expression = WriteAvatarCheck.EXPRESSION)
 @DeletePermission(expression = WriteAvatarCheck.EXPRESSION)
 @Audit(action = Action.CREATE, logStatement = "Avatar ''{0}'' has been assigned to player ''{1}''", logExpressions = {"${avatarAssignment.avatar.id}", "${avatarAssignment.player.id}"})

src/main/java/com/faforever/api/data/domain/BanInfo.java

@@ -31,7 +31,7 @@
 
 @Entity
 @Table(name = "ban")
-@Include(type = "banInfo")
+@Include(name = "banInfo")
 // Bans can never be deleted, only disabled over BanDisableData
 @DeletePermission(expression = Prefab.NONE)
 @ReadPermission(expression = AdminAccountBanCheck.EXPRESSION)

src/main/java/com/faforever/api/data/domain/Clan.java

@@ -29,7 +29,7 @@
 
 @Entity
 @Table(name = "clan")
-@Include(type = Clan.TYPE_NAME)
+@Include(name = Clan.TYPE_NAME)
 @DeletePermission(expression = IsEntityOwner.EXPRESSION)
 @CreatePermission(expression = Prefab.ALL)
 @Setter

src/main/java/com/faforever/api/data/domain/ClanMembership.java

@@ -15,7 +15,7 @@
 
 @Entity
 @Table(name = "clan_membership")
-@Include(type = "clanMembership")
+@Include(name = "clanMembership")
 @DeletePermission(expression = IsClanMembershipDeletable.EXPRESSION)
 @UpdatePermission(expression = IsClanMembershipDeletable.EXPRESSION)
 @Setter

src/main/java/com/faforever/api/data/domain/CoopMap.java

@@ -18,7 +18,7 @@
 @Entity
 @Table(name = "coop_map")
 @EntityListeners(CoopMapEnricher.class)
-@Include(type = "coopMission")
+@Include(name = "coopMission")
 @Setter
 public class CoopMap {
 

src/main/java/com/faforever/api/data/domain/CoopResult.java

@@ -13,7 +13,7 @@
 
 @Entity
 @Table(name = "coop_leaderboard")
-@Include(type = CoopResult.TYPE_NAME)
+@Include(name = CoopResult.TYPE_NAME)
 @Setter
 public class CoopResult {