diff options
author | 2019-03-16 23:56:27 +0300 | |
---|---|---|
committer | 2019-03-16 23:56:27 +0300 | |
commit | 06105f76dbfa3b65e63ed06f9c4d5107bd49ed88 (patch) | |
tree | 5702c01cec9688039d891f4a711878706101c1c5 /build.gradle | |
parent | 3ea4cd1942fa4e763034da11c5fa429407b67829 (diff) | |
parent | a49105285d0d7719d7f222a507af2d5ac5b4bdb1 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 51 |
1 files changed, 29 insertions, 22 deletions
diff --git a/build.gradle b/build.gradle index 84e19e3a..acaaf0f2 100644 --- a/build.gradle +++ b/build.gradle @@ -4,14 +4,14 @@ buildscript { jcenter() } dependencies { - classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0' classpath 'io.github.swagger2markup:swagger2markup-gradle-plugin:1.3.3' } } plugins { - id 'org.springframework.boot' version '2.1.1.RELEASE' apply false + id 'org.springframework.boot' version '2.1.3.RELEASE' apply false id "com.moowork.node" version "1.2.0" apply false - id("org.asciidoctor.convert") version "1.5.9.2" apply false + id("org.asciidoctor.convert") version "1.6.0" apply false } repositories { @@ -19,7 +19,6 @@ repositories { jcenter() maven { url "https://jitpack.io" } maven { url "https://repository.apache.org/content/repositories/snapshots/" } - maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } apply plugin: 'io.spring.dependency-management' dependencyManagement { @@ -112,15 +111,20 @@ dependencies { compile ('org.springframework.boot:spring-boot-starter-jdbc') compile ("org.springframework.boot:spring-boot-starter-security") compile ("org.springframework.boot:spring-boot-starter-web") - compile ("org.springframework.boot:spring-boot-starter-undertow") - compile ("org.springframework.boot:spring-boot-starter-websocket") + compile ("org.springframework.boot:spring-boot-starter-undertow") { + exclude group: 'org.jboss.xnio' + } + compile ("org.jboss.xnio:xnio-nio:3.7.0.Final") { + exclude group: 'org.jboss.threads' + } + compile 'org.jboss.threads:jboss-threads:2.3.3.Final' compile ("org.springframework.boot:spring-boot-starter-json") compile ('org.springframework.boot:spring-boot-devtools') compile "org.apache.commons:commons-lang3:3.8.1" - compile "org.apache.commons:commons-collections4:4.2" + compile "org.apache.commons:commons-collections4:4.3" compile 'org.apache.commons:commons-text:1.6' - compile "commons-codec:commons-codec:1.11" + compile "commons-codec:commons-codec:1.12" compile "commons-io:commons-io:2.6" compile 'com.google.code.findbugs:jsr305:3.0.2' @@ -128,25 +132,23 @@ dependencies { compile 'org.imgscalr:imgscalr-lib:4.2' compile "org.apache.commons:commons-imaging:1.0-SNAPSHOT" runtime "commons-fileupload:commons-fileupload:1.3.3" - compile 'com.github.ben-manes.caffeine:caffeine:2.6.2' + compile 'com.github.ben-manes.caffeine:caffeine:2.7.0' compile "javax.inject:javax.inject:1" compile "javax.xml.bind:jaxb-api:2.3.1" - compile 'org.glassfish.jaxb:jaxb-runtime:2.3.1' + runtime 'org.glassfish.jaxb:jaxb-runtime:2.3.2' compileOnly 'io.springfox:springfox-core:2.9.2' compile 'org.apache.commons:commons-email:1.5' - compile 'com.github.scribejava:scribejava-apis:6.1.0' - compile 'com.github.vitalyster:java-telegram-bot-api:file_api-SNAPSHOT' + compile 'com.github.scribejava:scribejava-apis:6.3.0' + compile 'com.github.pengrad:java-telegram-bot-api:4.1.1' compile 'com.twelvemonkeys.imageio:imageio-jpeg:3.4.1' compile 'org.imgscalr:imgscalr-lib:4.2' compile 'org.twitter4j:twitter4j-core:4.0.7' - compile 'xpp3:xpp3:1.1.4c' - - compile 'rocks.xmpp:xmpp-core-client:0.8.1-SNAPSHOT' - compile 'rocks.xmpp:xmpp-extensions-client:0.8.1-SNAPSHOT' + compile 'rocks.xmpp:xmpp-core-client:0.8.1' + compile 'rocks.xmpp:xmpp-extensions-client:0.8.1' compile "javax.inject:javax.inject:1" @@ -156,19 +158,21 @@ dependencies { compile 'org.flywaydb:flyway-core:5.2.4' runtime 'org.mariadb.jdbc:mariadb-java-client:2.3.0' - runtime 'com.h2database:h2:1.4.196' - runtime "commons-fileupload:commons-fileupload:1.3.3" + runtime 'net.java.dev.jna:jna:5.2.0' + runtime 'net.java.dev.jna:jna-platform:5.2.0' + runtime 'com.h2database:h2:1.4.199' + runtime "commons-fileupload:commons-fileupload:1.4" compile 'com.github.ooxi:serialized-php-parser:0.5.0' - compile 'io.pebbletemplates:pebble-spring5:3.0.6' + compile 'io.pebbletemplates:pebble-spring5:3.0.8' compile 'com.atlassian.commonmark:commonmark:0.12.1' compile 'com.atlassian.commonmark:commonmark-ext-autolink:0.12.1' compile 'org.tomitribe:tomitribe-http-signatures:1.1' - compile 'com.squareup.okhttp3:okhttp:3.12.0' - compile 'com.google.api-client:google-api-client:1.27.0' + compile 'com.google.api-client:google-api-client:1.28.0' + compile "com.kotcrab.remark:remark:1.0.0" testCompile("org.springframework.boot:spring-boot-starter-test") - testCompile('net.sourceforge.htmlunit:htmlunit:2.33') + testCompile('net.sourceforge.htmlunit:htmlunit:2.34.1') testCompile('org.springframework.security:spring-security-test') testCompile 'io.springfox:springfox-swagger2:2.9.2' @@ -186,6 +190,9 @@ bootRun.dependsOn ':generateDebugKey' compileFrontend.dependsOn 'yarn' processResources.dependsOn 'compileFrontend' +sourceCompatibility = JavaVersion.VERSION_11 +targetCompatibility = JavaVersion.VERSION_11 + class GenKey extends DefaultTask { @OutputFile String keystore |