Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "[pom] log4j: bump to 2.13.2." #311

Merged
merged 2 commits into from
Jul 17, 2020
Merged

Revert "[pom] log4j: bump to 2.13.2." #311

merged 2 commits into from
Jul 17, 2020

Conversation

olivielpeau
Copy link
Member

@olivielpeau olivielpeau commented Jul 17, 2020 •
edited
Loading

Reverts #309

log4j only supports Java 1.8 and up since 2.13. We want to still support 1.7 for now, so we should go back to 2.12.1.

(fwiw, this is mentioned in log4j's main docs page but not in its changelog...)

We do have java 1.7 tests on Travis, not sure why they didn't catch this.

I confirmed this PR makes JMXFetch work again with Java 1.7.

devinsba
devinsba suggested changes Jul 17, 2020
View reviewed changes
pom.xml
@@ -41,7 +41,7 @@
<guava.version>27.1-android</guava.version> <!-- From the docs: If you need support for JDK 1.7 or Android, use the Android flavor. -->
<java-dogstatsd-client.version>2.9.0</java-dogstatsd-client.version>
<jcommander.version>1.35</jcommander.version>
<log4j.version>2.13.2</log4j.version>
<log4j.version>2.12.1</log4j.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A comment on this line would be good so the change doesn't happen again

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, addressed 👍

truthbk
truthbk approved these changes Jul 17, 2020
View reviewed changes
Copy link
Member

@truthbk truthbk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than @devinsba comment, this looks good and sticking on 2.12.1 should not be harmful/dangerous given the set of features we use on JMXFetch.

@olivielpeau olivielpeau merged commit 69ee06f into master Jul 17, 2020
@olivielpeau olivielpeau deleted the revert-309-jaime/log4jbump branch July 17, 2020 14:42
truthbk pushed a commit that referenced this pull request Jul 20, 2020
@olivielpeau @truthbk
Revert "[pom] log4j: bump to 2.13.2." (#311)
3e22553 
This reverts commit 10e0610.

Reason: log4j 2.13 drops Java 7 support
truthbk added a commit that referenced this pull request Aug 13, 2020
@truthbk
Revert "Revert "[pom] log4j: bump to 2.13.2." (#311)"
ba189eb 
This reverts commit 3e22553.
truthbk added a commit that referenced this pull request Aug 29, 2020
@truthbk
[log4j] rolling back log4j2 to restore Java6 support (#315)
3af88ba 
* Revert "Revert "[pom] log4j: bump to 2.13.2." (#311)"

This reverts commit 3e22553.

* Revert "[pom] log4j: bump to 2.13.2. (#309)"

This reverts commit 951b944.

* Revert "[log4j] migrate to log4j2 (#258) (#305)"

This reverts commit 032edaa.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devinsba devinsba devinsba requested changes

@truthbk truthbk truthbk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@olivielpeau @devinsba @truthbk