mirror of https://github.com/halo-dev/halo
Bump version of dependencies (#1602)
* Bump versions of dependencies * Bump spring boot to 2.5.8 Signed-off-by: John Niang <johnniang@fastmail.com> * Revert dependency of bce sdk Signed-off-by: John Niang <johnniang@fastmail.com>pull/1614/head
parent
201e93465c
commit
21de4d7e55
79
build.gradle
79
build.gradle
|
@ -1,5 +1,5 @@
|
|||
plugins {
|
||||
id "org.springframework.boot" version "2.5.1"
|
||||
id "org.springframework.boot" version "2.5.8"
|
||||
id "io.spring.dependency-management" version "1.0.11.RELEASE"
|
||||
id "checkstyle"
|
||||
id "java"
|
||||
|
@ -16,10 +16,10 @@ checkstyle {
|
|||
}
|
||||
|
||||
repositories {
|
||||
maven { url 'https://maven.aliyun.com/repository/public/' }
|
||||
maven { url 'https://maven.aliyun.com/repository/spring/'}
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
maven { url 'https://repo.spring.io/milestone' }
|
||||
jcenter()
|
||||
}
|
||||
|
||||
configurations {
|
||||
|
@ -49,62 +49,30 @@ bootJar {
|
|||
}
|
||||
}
|
||||
|
||||
bootBuildImage.doFirst {
|
||||
// check data
|
||||
assert System.getenv("DOCKER_USERNAME") != null
|
||||
assert System.getenv("DOCKER_TOKEN") != null
|
||||
}
|
||||
|
||||
bootBuildImage {
|
||||
// prepare data
|
||||
def tagLatest = Boolean.valueOf(System.getenv("TAG_LATEST"))
|
||||
def dockerImageName = System.getenv("DOCKER_IMAGE_NAME")
|
||||
def dockerUsername = System.getenv("DOCKER_USERNAME")
|
||||
def dockerToken = System.getenv("DOCKER_TOKEN")
|
||||
|
||||
if (dockerImageName == null) {
|
||||
dockerImageName = "${dockerUsername}/halo"
|
||||
}
|
||||
if (!tagLatest) {
|
||||
dockerImageName = "${dockerImageName}:${project.version}"
|
||||
}
|
||||
|
||||
// config plugin
|
||||
imageName = "${dockerImageName}"
|
||||
docker {
|
||||
publishRegistry {
|
||||
username = "${dockerUsername}"
|
||||
password = "${dockerToken}"
|
||||
email = "hi@halo.run"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ext {
|
||||
guavaVersion= "31.0-jre"
|
||||
upyunSdkVersion = "4.2.0"
|
||||
qiniuSdkVersion = "7.2.29"
|
||||
aliyunSdkVersion = "3.11.3"
|
||||
baiduSdkVersion = "0.10.36"
|
||||
qcloudSdkVersion = "5.6.25"
|
||||
minioSdkVersion = "7.1.4"
|
||||
guavaVersion= '31.0.1-jre'
|
||||
upyunSdkVersion = '4.2.3'
|
||||
qiniuSdkVersion = '7.8.0'
|
||||
aliyunSdkVersion = '3.13.2'
|
||||
baiduSdkVersion = '0.10.36'
|
||||
qcloudSdkVersion = '5.6.61'
|
||||
minioSdkVersion = '8.3.4'
|
||||
swaggerVersion = "3.0.0"
|
||||
commonsFileUploadVersion = "1.4"
|
||||
commonsLangVersion = "3.10"
|
||||
httpclientVersion = "4.5.12"
|
||||
dataformatYamlVersion = "2.11.0"
|
||||
commonsLangVersion = '3.12.0'
|
||||
httpclientVersion = '4.5.13'
|
||||
jgitVersion = "5.9.0.202009080501-r"
|
||||
flexmarkVersion = "0.62.2"
|
||||
thumbnailatorVersion = "0.4.13"
|
||||
thumbnailatorVersion = '0.4.14'
|
||||
image4jVersion = "0.7zensight1"
|
||||
flywayVersion = "7.5.1"
|
||||
h2Version = "1.4.197"
|
||||
flywayVersion = "7.15.0"
|
||||
h2Version = "1.4.199"
|
||||
levelDbVersion = "0.12"
|
||||
annotationsVersion = "3.0.1u2"
|
||||
zxingVersion = "3.4.0"
|
||||
huaweiObsVersion = "3.19.7"
|
||||
zxingVersion = '3.4.1'
|
||||
huaweiObsVersion = '3.21.8.1'
|
||||
templateInheritanceVersion = "0.4.RELEASE"
|
||||
jsoupVersion = "1.13.1"
|
||||
jsoupVersion = '1.14.3'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
@ -129,7 +97,7 @@ dependencies {
|
|||
implementation "commons-fileupload:commons-fileupload:$commonsFileUploadVersion"
|
||||
implementation "org.apache.commons:commons-lang3:$commonsLangVersion"
|
||||
implementation "org.apache.httpcomponents:httpclient:$httpclientVersion"
|
||||
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$dataformatYamlVersion"
|
||||
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
|
||||
implementation "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
|
||||
implementation "com.google.code.findbugs:annotations:$annotationsVersion"
|
||||
|
||||
|
@ -167,7 +135,7 @@ dependencies {
|
|||
testImplementation("org.springframework.boot:spring-boot-starter-test") {
|
||||
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
|
||||
}
|
||||
testImplementation("org.jsoup:jsoup:${jsoupVersion}")
|
||||
testImplementation "org.jsoup:jsoup:$jsoupVersion"
|
||||
|
||||
developmentOnly "org.springframework.boot:spring-boot-devtools"
|
||||
}
|
||||
|
@ -176,10 +144,3 @@ test {
|
|||
useJUnitPlatform()
|
||||
testLogging.showStandardStreams = true
|
||||
}
|
||||
|
||||
task projectVersion {
|
||||
description = 'Prints current project version.'
|
||||
doLast {
|
||||
println project.version
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
pluginManagement {
|
||||
repositories {
|
||||
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
|
||||
maven { url 'https://maven.aliyun.com/repository/spring-plugin' }
|
||||
maven { url 'https://repo.spring.io/milestone' }
|
||||
gradlePluginPortal()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue