diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index baadb9cd..d57c46c5 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -75,7 +75,7 @@ task cleanjar(type: Jar, dependsOn: jar) { dependencies { pack project(':LauncherAPI') bundle group: 'me.tongfei', name: 'progressbar', version: '0.9.2' - bundle group: 'com.github.Marcono1234', name: 'gson-record-type-adapter-factory', version: 'v0.1.0' + bundle group: 'com.github.Marcono1234', name: 'gson-record-type-adapter-factory', version: 'v0.2.0' bundle group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi'] bundle group: 'org.jline', name: 'jline', version: rootProject['verJline'] bundle group: 'org.jline', name: 'jline-reader', version: rootProject['verJline'] @@ -84,8 +84,6 @@ pack project(':LauncherAPI') bundle group: 'org.ow2.asm', name: 'asm-commons', version: rootProject['verAsm'] bundle group: 'io.netty', name: 'netty-all', version: rootProject['verNetty'] bundle group: 'org.slf4j', name: 'slf4j-api', version: rootProject['verSlf4j'] - bundle group: 'org.hibernate', name: 'hibernate-core', version: rootProject['verHibernate'] - bundle group: 'org.hibernate', name: 'hibernate-hikaricp', version: rootProject['verHibernate'] bundle group: 'mysql', name: 'mysql-connector-java', version: rootProject['verMySQLConn'] bundle group: 'org.postgresql', name: 'postgresql', version: rootProject['verPostgreSQLConn'] bundle group: 'com.guardsquare', name: 'proguard-base', version: rootProject['verProguard'] @@ -96,8 +94,8 @@ pack project(':LauncherAPI') bundle group: 'io.jsonwebtoken', name: 'jjwt-gson', version: rootProject['verJwt'] testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit'] - hikari 'io.micrometer:micrometer-core:1.7.2' - hikari('com.zaxxer:HikariCP:5.0.0') { + hikari 'io.micrometer:micrometer-core:1.8.4' + hikari('com.zaxxer:HikariCP:5.0.1') { exclude group: 'javassist' exclude group: 'io.micrometer' exclude group: 'org.slf4j' diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java index a28b65d3..d01bf131 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java @@ -152,7 +152,7 @@ public Path process(Path inputFile) throws IOException { parser.parse(proguard_cfg); ProGuard proGuard = new ProGuard(proguard_cfg); proGuard.execute(); - } catch (ParseException e) { + } catch (Exception e) { logger.error(e); } } else diff --git a/props.gradle b/props.gradle index 6d5b39ab..df4cfa2f 100644 --- a/props.gradle +++ b/props.gradle @@ -1,20 +1,20 @@ project.ext { verAsm = '9.2' - verNetty = '4.1.70.Final' - verOshiCore = '6.0.0' + verNetty = '4.1.75.Final' + verOshiCore = '6.1.5' verJunit = '5.8.2' verGuavaC = '30.1.1-jre' - verJansi = '2.3.4' + verJansi = '2.4.0' verJline = '3.21.0' verJwt = '0.11.2' verBcprov = '1.70' - verGson = '2.8.9' + verGson = '2.9.0' verBcpkix = '1.70' - verSlf4j = '1.7.32' - verLog4j = '2.17.1' - verMySQLConn = '8.0.27' - verPostgreSQLConn = '42.3.1' - verProguard = '7.2.0-beta2' + verSlf4j = '1.7.36' + verLog4j = '2.17.2' + verMySQLConn = '8.0.28' + verPostgreSQLConn = '42.3.3' + verProguard = '7.2.1' verLaunch4j = '3.14' verHibernate = '5.5.6.Final' }