3 commits

Author	SHA1	Message	Date
Tal Levy	7c75b59814	migrate logstash-core-event-java to logstash-core (#6760) ... Conflicts: logstash-core-event-java/lib/logstash-core-event-java/version.rb versions.yml	2017-03-01 15:37:41 -08:00
Jordan Sissel	69c3bc21d4	Remove unnecessary log4j-1.2-api depedency. ... This library provides a "log4j 1.2"-like API from the log4j2 library. We don't seem to use this, and including it seems to be the cause of the Logstash log4j input rejecting log4j 1.x's SocketAppender with this message: org.apache.log4j.spi.LoggingEvent; class invalid for deserialization The origin of this error is that log4j2's log4j-1.2-api defines LoggingEvent without `implements Serializable`. This commit also includes regenerated gemspec_jars.rb and logstash-core_jars.rb. Reference: https://github.com/logstash-plugins/logstash-input-log4j/issues/36 Fixes #6309	2016-12-14 02:19:57 -05:00
Colin Surprenant	ab05082a89	merge feature/java_persistence into 5.x	2016-10-31 17:03:40 -04:00