github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix jar generation for artifact packaging

Browse source
This commit is contained in:
Colin Surprenant 2016-01-26 17:52:13 -05:00
parent b985abebfc
commit 2eddfcfb0c
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
logstash-core-event-java/build.gradle
View file

@ -43,17 +43,17 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
task copyGemjar(type: Copy, dependsOn: sourcesJar) {
from project.jar
into project.file('lib/')
into project.file('lib/logstash-core-event-java/')
}
task cleanGemjar {
delete fileTree(project.file('lib/')) {
delete fileTree(project.file('lib/logstash-core-event-java/')) {
include '*.jar'
}
}
clean.dependsOn(cleanGemjar)
build.finalizedBy(copyGemjar)
jar.finalizedBy(copyGemjar)
configurations.create('sources')
configurations.create('javadoc')

6
logstash-core-event-java/lib/logstash-core-event-java/logstash-core-event-java.rb
View file

@ -16,11 +16,9 @@ if File.directory?(classes_dir)
else
# otherwise use included jar
begin
jar = Dir[File.dirname(__FILE__) + "/logstash-core-event-java*.jar"].first
raise("No logstash-core-event-java jar file found") unless jar
require jar
require "logstash-core-event-java/logstash-core-event-java.jar"
rescue Exception => e
raise("Error loading logstash-core-event-java jar file, cause: #{e.message}")
raise("Error loading logstash-core-event-java/logstash-core-event-java.jar file, cause: #{e.message}")
end
end