Bump gems to 6.0.0 #8558

andrewvc · 2017-10-31T19:52:40Z

Version bump to 6.0.0 GA

jakelandis · 2017-10-31T20:48:49Z

I checked out your branch and still found some rc references

logstash $ grep -R rc2 . | grep -v .git | grep -v .yml | grep -v .idea
./docs/index-shared1.asciidoc::logstash_version:      6.0.0-rc2
./docs/index-shared1.asciidoc::elasticsearch_version: 6.0.0-rc2
./docs/index-shared1.asciidoc::kibana_version:        6.0.0-rc2
./docs/static/releasenotes.asciidoc:* <<logstash-6-0-0-rc2,Logstash 6.0.0-rc2>>
./docs/static/releasenotes.asciidoc:[[logstash-6-0-0-rc2]]
./docs/static/releasenotes.asciidoc:=== Logstash 6.0.0-rc2 Release Notes
./Gemfile.jruby-2.3.lock.release:    logstash-core (6.0.0.rc2-java)
./Gemfile.jruby-2.3.lock.release:      logstash-core (= 6.0.0.rc2)
./README.md:| [tar](https://snapshots.elastic.co/downloads/logstash/logstash-6.0.0-rc2-SNAPSHOT.tar.gz) |
./README.md:| [zip](https://snapshots.elastic.co/downloads/logstash/logstash-6.0.0-rc2-SNAPSHOT.zip) |
./README.md:| [deb](https://snapshots.elastic.co/downloads/logstash/logstash-6.0.0-rc2-SNAPSHOT.deb) |
./README.md:| [rpm](https://snapshots.elastic.co/downloads/logstash/logstash-6.0.0-rc2-SNAPSHOT.rpm) |

jakelandis · 2017-10-31T20:49:07Z

sorry didn't mean to close

andrewvc · 2017-11-01T01:34:05Z

The other versions are usually bumped in a separate PR relatively close to release.

I'm not sure why we do things this way, maybe worth discussing tomorrow?

jakelandis · 2017-11-01T02:16:47Z

In that case, LGTM.

andrewvc · 2017-11-01T02:45:18Z

@jakelandis I did forget to bump the gem versions along with this. I sent in a new commit with those changes. Are you LGTM on those?

jakelandis · 2017-11-01T14:14:02Z

Gemfile.jruby-2.3.lock.release

@@ -529,21 +528,21 @@ GEM
      rack
    rack-test (0.7.0)
      rack (>= 1.0, < 3)
-    rake (12.1.0)
+    rake (12.2.1)


This one makes me nervous. #8220 and #8214 are tangentially related to the rake version (i.e. smoke - no fire). In the spirit of pinning well known working dependency graph, I would suggest to keep this pinned 12.1.0 until 6.1.

I'm +1 on this. In fact, I'm thinking that I'm actually +1 on not bumping any gems between RC2 and 6.0.0. This would be a change to our release process, but I think it makes sense. WDYT?

My thoughts...
I see RC->Release == patch release, at least the same rules should apply.

IMO patch release rules:

Plugins: New plugin patch version's and (case-by-case) minor plugin updates are good. They can always downgrade those if there is the bug. The exception here is if a patch/minor upgrade pinned a new transitive version.

For non-plugins gems, I would think to not bump them unless they are intentionally getting upgraded. For example in this change set there the Jackson version bump is intentional and should be in 6.0.0, as it fixes a regression #8439

I think the tricky thing is there is no bundle update --only-logstash-plugins-and-other-things-that-matter.

Thinking about it, I don't think this PR is the right place to have this discussion (even though I started it!), and we should debate this policy going forward, but not right now.

WDYT? @jordansissel can you chime in here?

jakelandis · 2017-11-01T14:23:25Z

Gemfile.jruby-2.3.lock.release

@@ -49,7 +49,7 @@ GEM
    aws-sdk-v1 (1.67.0)
      json (~> 1.4)
      nokogiri (~> 1)
-    backports (3.8.0)
+    backports (3.10.3)


3.8.0 was from April of this year and is represents a multi-month jump to 3.10.3. I remember this exact question for different review.

@robbavey - Do you to remember discussions around backports version jump ? (or was it someone else?)

@jakelandis I do recall it - the same thing happened when we bumped to 5.6.4 (https://github.com/elastic/logstash/pull/8470/files). I remember we had a conversation about it - which I thought was here, but doesn't look like it.

The backports gem version history (https://rubygems.org/gems/backports/versions) shows it to have been completely unchanged from April up until October, when there was a flurry of versions committed over a period of 10 days.

jakelandis

A couple questions about rake and backport version bumps.

jsvd · 2017-11-03T11:12:53Z

Can we perhaps just have a PR that bumps the version from rc2 to GA without touching dependencies? I don't see a reason why the artifact won't build. Also this would help us understand what new code (if any) is shipping after the ga rename.

jasontedor · 2017-11-03T11:14:38Z

I would like to suggest that in general these version bumps should be straightforward and happen quickly (as they hold up other places in the stack). I think that mixing in dependency changes with them should not be done as it's clear it leads to debate that contributes to these version bumps not happening quickly.

jasontedor · 2017-11-03T11:15:22Z

As for a PR that only bumps the version, I had opened #8579.

jsvd · 2017-11-03T11:42:04Z

To unblock the rest of the stack, I've merged d58206d, so the discussion on this PR can focus on the dependencies instead of the version bump.

andrewvc · 2017-11-03T13:25:59Z

Thanks @jsvd for the merge, apologies for the holdup @jasontedor .

I've edited our documented version bump policy to split this work into two parts going forward to prevent this issue in the future.

andrewvc · 2017-11-05T20:56:42Z

Gemfile.jruby-2.3.lock.release

      logstash-core-plugin-api (>= 1.60, <= 2.99)
    logstash-filter-date (3.1.8)
      logstash-core-plugin-api (>= 1.60, <= 2.99)
    logstash-filter-de_dot (1.0.2)
      logstash-core-plugin-api (>= 1.60, <= 2.99)
-    logstash-filter-dissect (1.0.12)
+    logstash-filter-dissect (1.1.1)


All good fixes: https://github.com/logstash-plugins/logstash-filter-dissect/blob/master/CHANGELOG.md

andrewvc · 2017-11-05T20:57:39Z

Gemfile.jruby-2.3.lock.release

      jar-dependencies
      logstash-core-plugin-api (>= 2.1.1, <= 2.99)
    logstash-filter-dns (3.0.6)
      logstash-core-plugin-api (>= 1.60, <= 2.99)
      lru_redux (~> 1.1.0)
    logstash-filter-drop (3.0.4)
      logstash-core-plugin-api (>= 1.60, <= 2.99)
-    logstash-filter-elasticsearch (3.1.6)
+    logstash-filter-elasticsearch (3.2.0)


Innocuous: https://github.com/logstash-plugins/logstash-filter-elasticsearch/blob/master/CHANGELOG.md

andrewvc · 2017-11-05T20:58:15Z

Gemfile.jruby-2.3.lock.release

@@ -271,7 +271,7 @@ GEM
    logstash-input-dead_letter_queue (1.1.1)
      logstash-codec-plain
      logstash-core-plugin-api (>= 1.60, <= 2.99)
-    logstash-input-elasticsearch (4.0.6)
+    logstash-input-elasticsearch (4.1.0)


I'm OK with the change to add metadata into here

https://github.com/logstash-plugins/logstash-input-elasticsearch/blob/master/CHANGELOG.md

andrewvc · 2017-11-05T20:59:01Z

Gemfile.jruby-2.3.lock.release

@@ -322,7 +322,7 @@ GEM
      mail (~> 2.6.3)
      mime-types (= 2.6.2)
      stud (~> 0.0.22)
-    logstash-input-jdbc (4.2.4)
+    logstash-input-jdbc (4.3.0)


This fixes behavior from here: logstash-plugins/logstash-input-jdbc#147

andrewvc · 2017-11-05T20:59:48Z

@jakelandis I've rebased this and pinned rake and backports for this release.

LMK if it is now LGTM

jakelandis · 2017-11-06T15:43:19Z

Gemfile.lock

@@ -0,0 +1,762 @@
+PATH


Is this intentional to commit the .lock file ?

No, that is a mistake

jakelandis · 2017-11-06T15:44:54Z

Gemfile.lock

+PATH
+  remote: ./logstash-core
+  specs:
+    logstash-core (7.0.0.alpha1-java)


If intentional, probably don't want 7.x here (and below)

jakelandis · 2017-11-06T15:47:40Z

Gemfile.jruby-2.3.lock.release

@@ -186,7 +186,7 @@ GEM
      rspec (~> 3.0)
      rspec-wait
      stud (>= 0.0.20)
-    logstash-filter-aggregate (2.6.3)
+    logstash-filter-aggregate (2.7.0)


Seems like a good and safe change: https://github.com/logstash-plugins/logstash-filter-aggregate/blob/master/CHANGELOG.md#270

andrewvc · 2017-11-06T15:50:49Z

@jakelandis thinking about it, since we now have build candidates for 6.0.0-GA this PR may just be too late.

WDYT @jordansissel ?

I'm thinking I retarget the pinning of backports/rake to 6.x.

jakelandis · 2017-11-06T15:53:32Z

Minus the rouge .lock file - LGTM

jakelandis · 2017-11-06T20:10:48Z

LGTM

elasticsearch-bot · 2017-11-06T20:25:26Z

Andrew Cholakian merged this into the following branches!

Branch	Commits
6.0	`9bf6a6b`

Fixes #8558

andrewvc added the v6.0.0 label Oct 31, 2017

elasticsearch-bot self-assigned this Oct 31, 2017

jakelandis closed this Oct 31, 2017

jakelandis reopened this Oct 31, 2017

jakelandis self-requested a review October 31, 2017 20:49

jakelandis unassigned elasticsearch-bot Oct 31, 2017

andrewvc force-pushed the bump-to-6.0.0 branch from 3e4ed00 to 008c7b1 Compare November 1, 2017 01:33

jakelandis reviewed Nov 1, 2017

View reviewed changes

jakelandis requested changes Nov 1, 2017

View reviewed changes

jsvd mentioned this pull request Nov 3, 2017

Bump version to 6.0.0 #8579

Closed

andrewvc force-pushed the bump-to-6.0.0 branch from 008c7b1 to 6ee5789 Compare November 5, 2017 20:55

andrewvc commented Nov 5, 2017

View reviewed changes

andrewvc changed the title ~~Bump to 6.0.0~~ Bump gems to 6.0.0 Nov 5, 2017

andrewvc force-pushed the bump-to-6.0.0 branch from 6ee5789 to 8639398 Compare November 5, 2017 21:00

jakelandis reviewed Nov 6, 2017

View reviewed changes

Bump gems for 6.0.0

f6e1633

andrewvc force-pushed the bump-to-6.0.0 branch from 8639398 to f6e1633 Compare November 6, 2017 20:09

jakelandis approved these changes Nov 6, 2017

View reviewed changes

elasticsearch-bot pushed a commit that referenced this pull request Nov 6, 2017

Bump gems for 6.0.0

9bf6a6b

Fixes #8558

andrewvc closed this Nov 6, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump gems to 6.0.0 #8558

Bump gems to 6.0.0 #8558

andrewvc commented Oct 31, 2017 •

edited

Loading

jakelandis commented Oct 31, 2017

jakelandis commented Oct 31, 2017

andrewvc commented Nov 1, 2017

jakelandis commented Nov 1, 2017

andrewvc commented Nov 1, 2017

jakelandis Nov 1, 2017

andrewvc Nov 1, 2017

jakelandis Nov 1, 2017

andrewvc Nov 2, 2017

jakelandis Nov 1, 2017 •

edited

Loading

robbavey Nov 1, 2017

jakelandis left a comment

jsvd commented Nov 3, 2017

jasontedor commented Nov 3, 2017 •

edited

Loading

jasontedor commented Nov 3, 2017

jsvd commented Nov 3, 2017

andrewvc commented Nov 3, 2017

andrewvc Nov 5, 2017

andrewvc Nov 5, 2017

andrewvc Nov 5, 2017

andrewvc Nov 5, 2017

andrewvc commented Nov 5, 2017

jakelandis Nov 6, 2017

andrewvc Nov 6, 2017

jakelandis Nov 6, 2017

jakelandis Nov 6, 2017

andrewvc commented Nov 6, 2017

jakelandis commented Nov 6, 2017

jakelandis commented Nov 6, 2017

elasticsearch-bot commented Nov 6, 2017

Bump gems to 6.0.0 #8558

Bump gems to 6.0.0 #8558

Conversation

andrewvc commented Oct 31, 2017 • edited Loading

jakelandis commented Oct 31, 2017

jakelandis commented Oct 31, 2017

andrewvc commented Nov 1, 2017

jakelandis commented Nov 1, 2017

andrewvc commented Nov 1, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakelandis Nov 1, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakelandis left a comment

Choose a reason for hiding this comment

jsvd commented Nov 3, 2017

jasontedor commented Nov 3, 2017 • edited Loading

jasontedor commented Nov 3, 2017

jsvd commented Nov 3, 2017

andrewvc commented Nov 3, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrewvc commented Nov 5, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrewvc commented Nov 6, 2017

jakelandis commented Nov 6, 2017

jakelandis commented Nov 6, 2017

elasticsearch-bot commented Nov 6, 2017

andrewvc commented Oct 31, 2017 •

edited

Loading

jakelandis Nov 1, 2017 •

edited

Loading

jasontedor commented Nov 3, 2017 •

edited

Loading