Skip to content
This repository has been archived by the owner on Apr 16, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/bleeding-1.X.X' into bleeding-1.X.X
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkL4YG committed Aug 15, 2020
2 parents 909afa6 + a623de1 commit 4aa9965
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ if (project.hasProperty("preRelease")) {

projectVersion += "-rc." + i


} else if (!project.hasProperty('release')) {
projectVersion += '-SNAPSHOT'
}
Expand Down Expand Up @@ -66,7 +65,7 @@ sourceSets {

dependencies {
apiCompile 'de.mlessmann:confort-api:1.1.0-rc.2'
apiCompile 'org.hibernate:hibernate-core:5.4.12.Final'
apiCompile 'org.hibernate:hibernate-core:5.4.20.Final'
apiCompile 'org.slf4j:slf4j-api:1.7.30'

compile sourceSets.api.output
Expand All @@ -75,17 +74,17 @@ dependencies {
compile 'org.reflections:reflections:0.9.10'
compile 'org.hibernate:hibernate-core:5.4.12.Final'
compile 'org.slf4j:slf4j-api:1.7.29'
compile 'com.zaxxer:HikariCP:3.4.2'
compile 'com.zaxxer:HikariCP:3.4.5'
compile 'com.sun.mail:mailapi:1.6.5'
compile 'com.sparkjava:spark-core:2.9.1'
compile 'com.fasterxml.jackson.core:jackson-core:2.10.2'
compile 'com.fasterxml.jackson.core:jackson-databind:2.10.2'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.10.2'
compile 'com.sparkjava:spark-core:2.9.2'
compile 'com.fasterxml.jackson.core:jackson-core:2.11.2'
compile 'com.fasterxml.jackson.core:jackson-databind:2.11.2'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.11.2'
compile 'org.antlr:antlr4:4.7.2'
antlr 'org.antlr:antlr4:4.7.2'

compile 'com.github.manevolent:ts3j:1.0'
compile 'org.apache.commons:commons-lang3:3.10'
compile 'org.apache.commons:commons-lang3:3.11'
compile 'net.tomp2p:opus-wrapper:1.4'
compile 'com.sun.jna:jna:3.0.9'
compile 'com.github.manevolent:ffmpeg4j:534e72e6e7'
Expand All @@ -94,8 +93,8 @@ dependencies {
runtime 'org.apache.logging.log4j:log4j-api:2.13.3'
runtime 'org.apache.logging.log4j:log4j-core:2.13.3'
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3'
runtime 'mysql:mysql-connector-java:8.0.19'
runtime 'org.mariadb.jdbc:mariadb-java-client:2.6.1'
runtime 'mysql:mysql-connector-java:8.0.21'
runtime 'org.mariadb.jdbc:mariadb-java-client:2.6.2'
runtime 'com.sun.mail:smtp:1.6.5'
runtime 'com.sun.mail:dsn:1.6.5'

Expand Down

0 comments on commit 4aa9965

Please sign in to comment.