Skip to content

Commit

Permalink
Update dependencies and build file
Browse files Browse the repository at this point in the history
  • Loading branch information
hierynomus committed Feb 22, 2022
1 parent 25b7bee commit 8f1d4b9
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 29 deletions.
47 changes: 22 additions & 25 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ plugins {
id "jacoco"
id "maven-publish"
id "signing"
id 'pl.allegro.tech.build.axion-release' version '1.13.2'
id 'pl.allegro.tech.build.axion-release' version '1.13.3'
id "com.github.hierynomus.license" version "0.16.1"
id "com.bmuschko.docker-remote-api" version "6.4.0"
id "com.bmuschko.docker-remote-api" version "7.1.0"
// id 'ru.vyarus.java-lib' version '2.1.0'
id 'ru.vyarus.github-info' version '1.2.0'
id 'ru.vyarus.animalsniffer' version '1.5.3'
Expand All @@ -28,6 +28,19 @@ repositories {
maven { url "https://jitpack.io" }
}

scmVersion {
tag {
prefix = 'v'
versionSeparator = ''
}
hooks {
pre 'fileUpdate', [file: 'README.adoc', pattern: { v, c -> /:smbj_version: .*/}, replacement: { v, c -> ":smbj_version: $v" }]
pre 'commit'
}
}

project.version = scmVersion.version

sourceCompatibility = 1.8
targetCompatibility = 1.8

Expand Down Expand Up @@ -65,19 +78,6 @@ license {
excludes(['com/hierynomus/protocol/commons/Base64.java', '**/*.txt', '**/*.properties', "com/hierynomus/security/jce/messagedigest/MD4.java"])
}

scmVersion {
tag {
prefix = 'v'
versionSeparator = ''
}
hooks {
pre 'fileUpdate', [file: 'README.adoc', pattern: { v, c -> /:smbj_version: .*/}, replacement: { v, c -> ":smbj_version: $v" }]
pre 'commit'
}
}

project.version = scmVersion.version

jar {
inputs.property("moduleName", moduleName)

Expand Down Expand Up @@ -153,10 +153,8 @@ publishing {
project.signing {
required { project.gradle.taskGraph.hasTask("release") }
sign publishing.publications.maven
}

if (project.hasProperty("signingKeyId") || project.hasProperty("signingKey")) {
project.signing {
if (project.hasProperty("signingKeyId") || project.hasProperty("signingKey")) {
def signingKeyId = project.findProperty("signingKeyId")
def signingKey = project.findProperty("signingKey")
def signingPassword = project.findProperty("signingPassword")
Expand All @@ -165,7 +163,6 @@ if (project.hasProperty("signingKeyId") || project.hasProperty("signingKey")) {
} else if (signingKey) {
useInMemoryPgpKeys(signingKey, signingPassword)
}
sign publishing.publications.maven
}
}

Expand All @@ -189,11 +186,11 @@ project.plugins.withType(MavenPublishPlugin).all {
email = "jeroen@hierynomus.com"
}
}
scm {
connection = "scm:git:https://github.com/hierynomus/smbj"
developerConnection = "scm:git:ssh://github.com/hierynomus/smbj.git"
url = "https://github.com/hierynomus/smbj"
}
scm {
url = "https://github.com/hierynomus/${project.name}"
connection = "scm:git@github.com:hierynomus/${project.name}.git"
developerConnection = "scm:git@github.com:hierynomus/${project.name}.git"
}
}
}
}
Expand Down Expand Up @@ -257,7 +254,7 @@ project.tasks.integrationTest.finalizedBy(stopItestContainer)

task forkedUploadRelease(type: GradleBuild) {
buildFile = project.buildFile
tasks = ["publishToSonatype"]
tasks = ["clean", "publishToSonatype", "closeAndReleaseSonatypeStagingRepository"]
}

project.tasks.release.dependsOn([project.tasks.integrationTest, project.tasks.build])
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
BCPROV_JDK15ON=org.bouncycastle:bcprov-jdk15on:1.69
BCPROV_JDK15ON=org.bouncycastle:bcprov-jdk15on:1.70
CGLIB_NODEP=cglib:cglib-nodep:2.2
COMMONS_IO=commons-io:commons-io:2.5
GROOVY_ALL=org.codehaus.groovy:groovy-all:2.5.12
LOGBACK_CLASSIC=ch.qos.logback:logback-classic:1.2.3
LOGBACK_CLASSIC=ch.qos.logback:logback-classic:1.2.9
MBASSADOR=net.engio:mbassador:1.3.0
OBJENESIS=org.objenesis:objenesis:2.6
SLF4J_API=org.slf4j:slf4j-api:1.7.25
SLF4J_API=org.slf4j:slf4j-api:1.7.32
SPOCK_CORE=org.spockframework:spock-core:2.0-M4-groovy-2.5
ASN_ONE=com.hierynomus:asn-one:0.5.0
ASN_ONE=com.hierynomus:asn-one:0.6.0

0 comments on commit 8f1d4b9

Please sign in to comment.