-
Notifications
You must be signed in to change notification settings - Fork 58
Update build to gradle #41
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,3 +14,6 @@ | |
| mkmf.log | ||
| vendor/ | ||
| /*.gem | ||
| /.gradle/ | ||
| /build/ | ||
| *.idea | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,19 @@ | ||
| require "bundler/gem_tasks" | ||
| require 'jars/version' | ||
|
|
||
| begin | ||
| require 'rspec/core/rake_task' | ||
| RSpec::Core::RakeTask.new(:spec) | ||
| rescue LoadError | ||
| end | ||
|
|
||
| task default: "spec" | ||
| # encoding: utf-8 | ||
| require "logstash/devutils/rake" | ||
| require "jars/installer" | ||
| require "fileutils" | ||
|
|
||
| require 'jars/installer' | ||
| desc 'Install the JAR dependencies to vendor/' | ||
| task :install_jars do | ||
| # We actually want jar-dependencies will download the jars and place it in | ||
| # vendor/jar-dependencies/runtime-jars | ||
| Jars::Installer.new.vendor_jars!(false, 'vendor/jar-dependencies/runtime-jars') | ||
| task :default do | ||
| system('rake -vT') | ||
| end | ||
|
|
||
| task build: :install_jars | ||
| require "logstash/devutils/rake" | ||
| task vendor: :install_jars | ||
| task :vendor do | ||
| exit(1) unless system './gradlew vendor' | ||
| end | ||
|
|
||
| task :clean do | ||
| ["vendor/jar-dependencies", "Gemfile.lock"].each do |p| | ||
| FileUtils.rm_rf(p) | ||
| end | ||
| end | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import java.nio.file.Files | ||
| import static java.nio.file.StandardCopyOption.REPLACE_EXISTING | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| apply plugin: "java" | ||
| apply plugin: 'maven' | ||
| apply plugin: "distribution" | ||
| apply plugin: "idea" | ||
|
|
||
| group "org.logstash.inputs" | ||
|
|
||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
|
|
||
| buildscript { | ||
| repositories { | ||
| mavenCentral() | ||
| jcenter() | ||
| } | ||
|
|
||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| task wrapper(type: Wrapper) { | ||
| gradleVersion = '4.0' | ||
| } | ||
|
|
||
| dependencies { | ||
| compile 'com.amazonaws:aws-java-sdk-kms:1.11.14' | ||
| compile 'com.amazonaws:amazon-kinesis-client:1.7.0' | ||
| compile 'com.amazonaws:aws-java-sdk-core:1.11.16' | ||
| compile 'commons-codec:commons-codec:1.9' | ||
| compile 'com.fasterxml.jackson.core:jackson-databind:2.6.6' | ||
| compile 'com.google.guava:guava:18.0' | ||
| compile 'commons-lang:commons-lang:2.6' | ||
| compile 'commons-logging:commons-logging:1.2' | ||
| compile 'joda-time:joda-time:2.8.1' | ||
| compile 'com.amazonaws:aws-java-sdk-s3:1.11.14' | ||
| compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.6' | ||
| compile 'com.fasterxml.jackson.core:jackson-core:2.6.6' | ||
| compile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.14' | ||
| compile 'com.amazonaws:aws-java-sdk-cloudwatch:1.11.14' | ||
| compile 'com.amazonaws:aws-java-sdk-kinesis:1.11.14' | ||
| compile 'org.apache.httpcomponents:httpclient:4.5.2' | ||
| compile 'org.apache.httpcomponents:httpcore:4.4.4' | ||
| compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0' | ||
| compile 'com.google.protobuf:protobuf-java:2.6.1' | ||
| } | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I still know very little about Gradle, so I'm not the best person to review this PR. But I see the two jar dependencies deleted from the gemspec in here. That's good. Now my comment: were we not pinning everything else at all? If so, this is a great improvement on build reproducibility. Good stuff! |
||
|
|
||
| task generateGemJarRequiresFile { | ||
| doLast { | ||
| File jars_file = file('lib/logstash-input-kinesis_jars.rb') | ||
| 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 { | ||
| w << "require_jar(\'${it.group}\', \'${it.name}\', \'${it.version}\')\n" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| task vendor { | ||
| doLast { | ||
| String vendorPathPrefix = "vendor/jar-dependencies" | ||
| configurations.runtime.allDependencies.each { dep -> | ||
| File f = configurations.runtime.filter { it.absolutePath.contains("${dep.group}/${dep.name}/${dep.version}") }.singleFile | ||
| String groupPath = dep.group.replaceAll('\\.', '/') | ||
| File newJarFile = file("${vendorPathPrefix}/${groupPath}/${dep.name}/${dep.version}/${dep.name}-${dep.version}.jar") | ||
| newJarFile.mkdirs() | ||
| Files.copy(f.toPath(), newJarFile.toPath(), REPLACE_EXISTING) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| vendor.dependsOn(generateGemJarRequiresFile) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| org.gradle.daemon=false |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #Wed Jun 21 11:39:16 CEST 2017 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I may be missing some context, but why delete
Gemfile.lockwhen cleaning? And why is the file in.gitignore?The lockfile is important to share a very precise known good set of resolved dependencies between developers working on this...
If the issue is that we need to test on multiple incompatible configurations (e.g. JRuby 1.7 & 9.x) and a single Gemfile doesn't cut it, we can always use a the appraisal gem to drive bundler.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't have the habit of committing the .lock file in the plugins, so the .lock is listed in the .gitignore.
When a plugin is used with logstash, logstash won't care about any locked dependencies besides the ones in the gemspec. So from this perspective, I think that recomputing the .lock on every test run is more likely to catch dependency-related issues that we would see on logstash, which is a good thing.