This repository was archived by the owner on Nov 9, 2020. It is now read-only.
Maxmind master to gson branch #1
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add Snyk integration
Add condition to only run `snyk monitor` once on `master`
Ensure Snyk only runs if `$SNYK_TOKEN` exists
Upgrade `com.fasterxml.jackson.core:jackson-databind` artifact
Update jackson dep to 2.9.8 to address upstream security fix
Test more jdk versions on travis
Bump jackson dep version
Drop Snyk badge
Update to latest jackson-databind to address CVEs
Bump jackson-databind version to address CVEs
Bump jackson-databind version to address CVEs
Many of these are just code modernizations as we now require Java 7.
With Java 7 try-with-resource statement.
Add ability to get record associated with lookup
Update README.md and CHANGELOG.md for network changes
Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.1 to 3.8.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.1...maven-compiler-plugin-3.8.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [versions-maven-plugin](https://github.com/mojohaus/versions-maven-plugin) from 2.2 to 2.7. - [Release notes](https://github.com/mojohaus/versions-maven-plugin/releases) - [Changelog](https://github.com/mojohaus/versions-maven-plugin/blob/master/ReleaseNotes.md) - [Commits](mojohaus/versions@versions-maven-plugin-2.2...versions-maven-plugin-2.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 1.1 to 1.6.0. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](mojohaus/exec-maven-plugin@exec-maven-plugin-1.1...exec-maven-plugin-1.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps maven-gpg-plugin from 1.4 to 1.6. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 2.2.1 to 3.1.0. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](apache/maven-source-plugin@maven-source-plugin-2.2.1...maven-source-plugin-3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
…e.maven.plugins-maven-compiler-plugin-3.8.1 Bump maven-compiler-plugin from 3.1 to 3.8.1
…aus.mojo-versions-maven-plugin-2.7 Bump versions-maven-plugin from 2.2 to 2.7
…aus.mojo-exec-maven-plugin-1.6.0 Bump exec-maven-plugin from 1.1 to 1.6.0
…e.maven.plugins-maven-gpg-plugin-1.6 Bump maven-gpg-plugin from 1.4 to 1.6
…e.maven.plugins-maven-source-plugin-3.1.0 Bump maven-source-plugin from 2.2.1 to 3.1.0
Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](apache/maven-source-plugin@maven-source-plugin-3.1.0...maven-source-plugin-3.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
…e.maven.plugins-maven-source-plugin-3.2.0 Bump maven-source-plugin from 3.1.0 to 3.2.0
…gson # Conflicts: # README.md # pom.xml # src/main/java/com/maxmind/db/Decoder.java # src/main/java/com/maxmind/db/NodeCache.java # src/main/java/com/maxmind/db/Reader.java # src/main/java/com/maxmind/db/package-info.java # src/test/java/com/maxmind/db/DecoderTest.java # src/test/java/com/maxmind/db/MultiThreadedTest.java # src/test/java/com/maxmind/db/ReaderTest.java
- Hopefully makes future merges a little easier
Owner
|
Maybe I should do only minimal changes next time. Sorry for that additional work. |
Author
|
Thanks for looking at it!
Nothing to be sorry about—all the improvements you did I would agree with if we didn't have to "orient" ourselves towards another repo :) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
8 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tried to merge the parent repo's master into the gson branch to the best of my abilities. I undid some of the minor formatting changes that were done in gson that make merging more difficult. Most changes of that type are in the last commit, so we could also talk about merging this branch without the last commit.