diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e358bc..2bbda95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## Unreleased + - Fix: update to Gradle 7 [#184](https://github.com/logstash-plugins/logstash-input-tcp/pull/184) + ## 6.2.1 - Fix: restore logic to add the Bouncy-Castle security provider at runtime [#181](https://github.com/logstash-plugins/logstash-input-tcp/pull/181) - required to properly read encrypted (legacy) OpenSSL PKCS#5v1.5 keys diff --git a/build.gradle b/build.gradle index ab6b876..8ede969 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING * under the License. */ apply plugin: "java" -apply plugin: 'maven' +apply plugin: 'maven-publish' apply plugin: "distribution" apply plugin: "idea" @@ -32,11 +32,11 @@ sourceCompatibility = JavaVersion.VERSION_1_8 buildscript { repositories { mavenCentral() - jcenter() + gradlePluginPortal() } dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4' + classpath 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0' } } @@ -51,10 +51,10 @@ shadowJar { } dependencies { - compile 'io.netty:netty-all:4.1.65.Final' + implementation 'io.netty:netty-all:4.1.65.Final' - compile group: 'commons-io', name: 'commons-io', version: '2.8.0' - compile 'org.apache.logging.log4j:log4j-core:2.9.1' + implementation group: 'commons-io', name: 'commons-io', version: '2.8.0' + implementation 'org.apache.logging.log4j:log4j-core:2.9.1' // 1.60 effectively means jruby-openssl >= 0.10.2 (logstash > 6.7) compileOnly group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "1.60" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5028f28..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists