Skip to content

Fix build script to run with Gradle 7 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## Unreleased
- Fix: update to Gradle 7 [#78](https://github.com/logstash-plugins/logstash-filter-dissect/pull/78)

## 1.2.1
- [DOC] Added note to clarify notation for dot or nested fields [#76](https://github.com/logstash-plugins/logstash-filter-dissect/pull/76)

Expand Down
16 changes: 7 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
}

plugins {
id "me.champeau.gradle.jmh" version "0.5.0"
id "me.champeau.jmh" version "0.6.6"
}
repositories {
mavenLocal()
mavenCentral()
jcenter()
}

apply plugin: 'java'
Expand All @@ -40,13 +38,13 @@ compileJava.options.encoding = 'UTF-8'
task sourcesJar(type: Jar, dependsOn: classes) {
from sourceSets.main.allSource
classifier 'sources'
extension 'jar'
archiveExtension = 'jar'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
from javadoc.destinationDir
classifier 'javadoc'
extension 'jar'
archiveExtension = 'jar'
}

configurations.create('sources')
Expand Down Expand Up @@ -93,9 +91,9 @@ dependencies {
provided group: "org.apache.logging.log4j", name: "log4j-core", version: "2.6.2"
provided 'org.jruby:jruby-core:9.1.12.0'
provided fileTree(dir: logstashCoreGemPath, include: '**/*.jar')
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:3.8.0'
jmhCompile fileTree(dir: logstashCoreGemPath, include: '**/*.jar')
testImplementation 'junit:junit:4.12'
testImplementation 'org.assertj:assertj-core:3.8.0'
jmh fileTree(dir: logstashCoreGemPath, include: '**/*.jar')
}

task generateGemJarRequiresFile {
Expand All @@ -104,7 +102,7 @@ task generateGemJarRequiresFile {
jars_file.newWriter().withWriter { w ->
w << "# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.\n\n"
w << "require \'jar_dependencies\'\n"
configurations.runtime.allDependencies.each {
configurations.runtimeClasspath.allDependencies.each {
w << "require_jar(\'${it.group}\', \'${it.name}\', \'${it.version}\')\n"
}
w << "require_jar(\'${project.group}\', \'${project.name}\', \'${project.version}\')\n"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion lib/jruby-dissect-library_jars.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.

require 'jar_dependencies'
require_jar('org.logstash.dissect', 'jruby-dissect-library', '1.2.0')
require_jar('org.logstash.dissect', 'jruby-dissect-library', '1.2.1')