Fix core-contrib (again) after branch delete. Keep json filter in core.

aoqfonseca · Feb 7, 2014 · bc2e9b6 · bc2e9b6
1 parent edfde16
commit bc2e9b6
Show file tree

Hide file tree

Showing 79 changed files with 3 additions and 9,807 deletions.
diff --git a/Makefile b/Makefile
@@ -2,8 +2,8 @@
 #   rsync
 #   wget or curl
 #
-JRUBY_VERSION=1.7.9
-ELASTICSEARCH_VERSION=0.90.9
+JRUBY_VERSION=1.7.10
+ELASTICSEARCH_VERSION=0.90.11
 
 WITH_JRUBY=java -jar $(shell pwd)/$(JRUBY) -S
 JRUBY=vendor/jar/jruby-complete-$(JRUBY_VERSION).jar
@@ -41,7 +41,7 @@ default:
 	@echo "  flatjar -- builds the flatjar jar"
 	@echo "  flatjar-test -- runs the test suite against the flatjar"
 
-TESTS=$(wildcard spec/inputs/gelf.rb spec/support/*.rb spec/filters/*.rb spec/examples/*.rb spec/codecs/*.rb spec/conditionals/*.rb spec/event.rb spec/jar.rb)
+TESTS=$(wildcard spec/inputs/file.rb spec/inputs/gelf.rb spec/inputs/imap.rb spec/support/*.rb spec/filters/*.rb spec/examples/*.rb spec/codecs/*.rb spec/conditionals/*.rb spec/event.rb spec/jar.rb)
 
 # The 'version' is generated based on the logstash version, git revision, etc.
 .VERSION.mk: REVISION=$(shell git rev-parse --short HEAD | tr -d ' ')

diff --git a/lib/logstash/codecs/compress_spooler.rb b/lib/logstash/codecs/compress_spooler.rb
diff --git a/lib/logstash/filters/advisor.rb b/lib/logstash/filters/advisor.rb