Skip to content

Commit e2370f6

Browse files
authored
Fix build script to run with Gradle 7 (#78)
Update the Gradle wrapper used to version 7.2 and fixed build.gradle script.
1 parent b3dbef2 commit e2370f6

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## Unreleased
2+
- Fix: update to Gradle 7 [#78](https://github.com/logstash-plugins/logstash-filter-dissect/pull/78)
3+
14
## 1.2.1
25
- [DOC] Added note to clarify notation for dot or nested fields [#76](https://github.com/logstash-plugins/logstash-filter-dissect/pull/76)
36

build.gradle

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@ buildscript {
66
repositories {
77
mavenLocal()
88
mavenCentral()
9-
jcenter()
109
}
1110
}
1211

1312
plugins {
14-
id "me.champeau.gradle.jmh" version "0.5.0"
13+
id "me.champeau.jmh" version "0.6.6"
1514
}
1615
repositories {
1716
mavenLocal()
1817
mavenCentral()
19-
jcenter()
2018
}
2119

2220
apply plugin: 'java'
@@ -40,13 +38,13 @@ compileJava.options.encoding = 'UTF-8'
4038
task sourcesJar(type: Jar, dependsOn: classes) {
4139
from sourceSets.main.allSource
4240
classifier 'sources'
43-
extension 'jar'
41+
archiveExtension = 'jar'
4442
}
4543

4644
task javadocJar(type: Jar, dependsOn: javadoc) {
4745
from javadoc.destinationDir
4846
classifier 'javadoc'
49-
extension 'jar'
47+
archiveExtension = 'jar'
5048
}
5149

5250
configurations.create('sources')
@@ -93,9 +91,9 @@ dependencies {
9391
provided group: "org.apache.logging.log4j", name: "log4j-core", version: "2.6.2"
9492
provided 'org.jruby:jruby-core:9.1.12.0'
9593
provided fileTree(dir: logstashCoreGemPath, include: '**/*.jar')
96-
testCompile 'junit:junit:4.12'
97-
testCompile 'org.assertj:assertj-core:3.8.0'
98-
jmhCompile fileTree(dir: logstashCoreGemPath, include: '**/*.jar')
94+
testImplementation 'junit:junit:4.12'
95+
testImplementation 'org.assertj:assertj-core:3.8.0'
96+
jmh fileTree(dir: logstashCoreGemPath, include: '**/*.jar')
9997
}
10098

10199
task generateGemJarRequiresFile {
@@ -104,7 +102,7 @@ task generateGemJarRequiresFile {
104102
jars_file.newWriter().withWriter { w ->
105103
w << "# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.\n\n"
106104
w << "require \'jar_dependencies\'\n"
107-
configurations.runtime.allDependencies.each {
105+
configurations.runtimeClasspath.allDependencies.each {
108106
w << "require_jar(\'${it.group}\', \'${it.name}\', \'${it.version}\')\n"
109107
}
110108
w << "require_jar(\'${project.group}\', \'${project.name}\', \'${project.version}\')\n"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

lib/jruby-dissect-library_jars.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
22

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

0 commit comments

Comments
 (0)