Commit graph

250 commits

Author SHA1 Message Date
Richard Pijnenburg
60493acbd0 Add doc generation tasks to logstash
Fixes #2256
2014-12-17 16:57:04 +00:00
Colin Surprenant
9ad3384377 removed coveralls dev dependency, more .bundle dir cleanup, install without parameter fix
Fixes #2203
2014-12-10 23:48:17 +00:00
Colin Surprenant
345c4b6c0e remove old lock files
Fixes #2203
2014-12-10 23:48:17 +00:00
Colin Surprenant
c8e6b16762 updated lock files
Fixes #2203
2014-12-10 23:48:17 +00:00
Colin Surprenant
d955077d26 solid path to logstash
Fixes #2203
2014-12-10 23:48:17 +00:00
Colin Surprenant
9c09bc9271 tmp dummy lock file
Fixes #2203
2014-12-10 23:48:16 +00:00
Colin Surprenant
5bff91cadf updated .lock files
Fixes #2203
2014-12-10 23:48:16 +00:00
Pier-Hugues Pellerin
00899fc411 Adding bootstrap gem to the gem home
Fixes #2203
2014-12-10 23:48:16 +00:00
Joao Duarte
37df140bce minor fixes to moving plugins gemfile to tools/
Fixes #2171
2014-12-04 17:09:56 +00:00
Joao Duarte
68c03cf19e move plugins gemfile to tools
Fixes #2171
2014-12-04 17:09:56 +00:00
Richard Pijnenburg
e5366d2cf9 More fixes
Fixes #2166
2014-12-03 17:04:09 +00:00
Suyog Rao
6cf77cf867 Use v1.9.3 for gem ci_reporter. Fixes Jenkins tests 2014-10-10 10:54:05 -07:00
Colin Surprenant
b6c8e96480 gem bundling refactor
update jruby jar to 1.7.15

pinned i18n dependency and cosmetic cleanups

new generated Gemfile lock

refactor gem bundling using stadalone setup & use standard Gemfile with gemspec

update to jruby 1.7.16 and remove jar-dependencies, bouncy-castle-java, jruby-openssl from gemspec

get ready for future plugins mechanism
2014-10-06 17:02:48 -04:00
Suyog Rao
4683e51e4b Merge @joekiller's Kafka plugin to logstash-core
Add documentation and tests
Use scala version 2.9.2 and Kafka 0.8.1.1
Closes #1472
2014-09-03 15:00:04 -07:00
Suyog Rao
7b9aba2261 Use updated grok version 2014-08-27 13:20:48 -07:00
Richard Pijnenburg
adfbc34229 Update Gemfile for package testing 2014-08-19 12:39:23 +00:00
Colin Surprenant
0d3df38cb9 logstash boot sequence cleanup & drip support fix
deprecated USE_JRUBY environment var
added USE_RUBY and USE_DRIP environment vars
centralized gem path handling in LogStash::Environment

use consistent discovery strategy
2014-07-13 20:02:42 -04:00
Colin Surprenant
e03b67dc7d replace json parsers with JrJackson and Oj
refactored timestamps with new Timestamp class
closes #1434
2014-06-12 17:53:30 -04:00
Jordan Sissel
9ab36e44e1 accept new generated gemfile.lock 2014-04-28 15:52:40 -07:00
Richard Pijnenburg
4b173a5785 Add gemfile 2014-04-15 14:58:57 +02:00
Jordan Sissel
35789956c3 Merge branch '1.4.x' of github.com:elasticsearch/logstash into 1.4.x 2014-03-20 01:24:23 +00:00
Jordan Sissel
cc2bcbea7a Add s3 upload 2014-03-19 18:25:09 -07:00
Jordan Sissel
c82dc09586 Version bump 2014-03-19 23:10:40 +00:00
Jordan Sissel
7bbafecf37 Use 'make package' for building rpms/debs for contrib 2014-03-19 21:00:52 +00:00
Jordan Sissel
a9c28fe349 actually build rpm/debs 2014-03-14 00:12:32 +00:00
Jordan Sissel
92e87c8e6d bundler updated the MRI 1.9.1 lockfile 2014-03-13 23:43:44 +00:00
Jordan Sissel
36148fae62 Update gemfile.lock for jruby 2014-03-12 16:13:30 -07:00
Jordan Sissel
4886dc1e3c Add sinatra gem. This was accidentally removed in a previous commit.
This fixes 'bin/logstash web' to run correctly (was broken in an earlier
1.4.0 beta)
2014-03-12 14:51:00 -07:00
Jordan Sissel
e5383f28ce Add test coverage for LOGSTASH-1918 2014-03-12 14:02:05 -07:00
Jordan Sissel
94fe7a4d01 Update gemfile locks for various rubies.
Notable changes for JRuby:
* atomic 1.1.14-java -> 1.1.15-java
* aws-sdk 1.29.0 -> 1.35.0
* backports 3.3.5 -> 3.6.0
* bindata 1.6.0 -> 2.0.0
* cinch 2.0.10 -> 2.1.0
* docile 1.1.1 -> 1.1.3
* faraday 0.8.8 -> 0.9.0
* geoip 1.3.3 -> 1.3.5
* metaclass 0.0.1 -> 0.0.4
* metriks 0.9.9.5 -> 0.9.9.6
* minitest 5.0.8 -> 5.3.0
* msgpack-jruby 1.3.2-java -> 1.4.0-java
* multi_json 1.8.2 -> 1.8.4
* multipart-post 1.2.0 -> 2.0.0
* murmurhash3 0.1.3 -> 0.1.4
* nokogiri 1.6.0-java -> 1.6.1-java
* polyglot 0.3.3 -> 0.3.4
* redis 3.0.6 -> 3.0.7
* thread_safe 0.1.3-java -> 0.2.0-java
* user_agent_parser 2.1.1 -> 2.1.2
* xml-simple 1.1.2 -> 1.1.3
2014-02-27 14:23:28 -08:00
Aaron Mildenstein
aad144f801 No longer making the flatjar. 2014-02-27 15:44:10 -06:00
Jordan Sissel
5a026bb981 Build flatjar as well 2014-02-19 06:03:58 +00:00
Jordan Sissel
715e043459 - More cleanup in prepare
- copy all packages/etc into the right place
2014-02-19 02:56:17 +00:00
Jordan Sissel
8f028d1709 Allow relative paths 2014-02-18 15:40:27 -08:00
Jordan Sissel
026acaaebb release run order: tests, docs, packages 2014-02-14 13:59:41 -08:00
Jordan Sissel
0ac3abd3e5 Include more files in the preparation step so we can run tests 2014-02-14 13:06:01 -08:00
Jordan Sissel
3c1dd49671 More startup checks. Faster docs building 2014-02-13 00:49:03 -08:00
Jordan Sissel
75c9564616 Preparing for 1.4.0 beta1
- Add 'release.sh' to build docs + packages
- Bump version
- Update docs generator to be 'contrib'-plugin aware
2014-02-12 23:58:16 -08:00
Jordan Sissel
7a65def519 regen 2013-12-23 15:31:13 -08:00
Jordan Sissel
76792241b0 regen 2013-12-23 15:01:49 -08:00
Jordan Sissel
4b6ed2c2f1 Regen 2013-12-11 12:51:45 -08:00
Jordan Sissel
61d3e48589 Regen gemfile locks 2013-12-09 23:31:26 -08:00
Jordan Sissel
17d784980d Fresh gemfile locks for ruby 1.9.3 and jruby 1.7.8 2013-12-07 17:36:14 -08:00
Jordan Sissel
165fb24196 regen 2013-12-05 18:28:29 -08:00
Jordan Sissel
5ca2fdba25 - add rbx 2013-12-05 00:43:20 -08:00
Jordan Sissel
d2f89ba30d Avoid having 'remote: /some/path' in the gemfile.locks
When using bundler's "gemspec" setting it hardcodes a
local path as the "remote". This causes every 'bundle install' or
similar invocation on any other workstation to change that file simply
because the remote has changed. Not good.

Work around it by evaluating the gemspec ourselves and generating the
gem dependency list from that.

Same effect, better result, I think.
2013-12-05 00:27:41 -08:00
Jordan Sissel
753e533650 Add two more gemfile.locks (ruby 1.9.3 and 2.0.0)
Yes. I know the file is named 1.9.1. I don't have time to explain! GET
IN THE CAR. LETS GO.
2013-12-04 16:00:10 -08:00
Jordan Sissel
eca0afc116 - Add Gemfile.jruby-1.9.lock 2013-12-04 15:20:58 -08:00
Jordan Sissel
a4d41ed64a Try to solve the 'multi ruby' problem in bundler by having each
ruby write to its own Gemfile.<ruby version>.lock file.
2013-12-04 15:20:20 -08:00
Jordan Sissel
bd8caf9874 Use bundler.
'bundle install' when already installed should be faster than the
previous gembag. More importantly, it is also more accurate in terms of
dependencies.

Bonus points that we can do 'clean' which will purge any unknown gems
and keep our gems directory nice and tidy.

The main purpose is to speed up repetitive build invocations. Bundler's
dependency resolver is better than that of the previous gembag.rb, and
its 'clean' feature lets bundler manage the gems listing - even between
builds. This lets not have to 'rm -rf vendor' between builds on jenkins
to ensure quality testing :)

Other changes:
- Hide the Gemfile and Gemfile.lock in the 'tools' directory. This
  should hopefully prevent users from accidentally updating these files
  and thus avoiding merge conflicts later.
- Minor patch to use RbConfig::CONFIG['ruby_version'] instead of
  RUBY_VERSION. Confusing, I know. The former is the 'ruby abi' version,
  it seems, and the latter is the actual ruby implementation version.
  Example, on MRI 1.9.3, the former is 1.9.1 and latter is 1.9.3. On
  JRuby, the former is 1.9 and latter is 1.9.3. COMPUTERS. HELP.
2013-12-02 23:59:19 -08:00