merge 1.5.4 #1
Open
merge 1.5.4 #1
Conversation
This file contains 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
Change to shader plugin.
Update to 1.5.3
Back to compile scope
add app plugin to prepare for docker builds
usState.getUs() might return null
Conflicts: CHANGELOG.md exhibitor-core/build.gradle exhibitor-core/src/main/java/com/netflix/exhibitor/core/processes/StandardProcessOperations.java exhibitor-standalone/build.gradle
Add Shadow plugin to create fatJar. Fix archiveBaseName.
…r standalone version. i.e. http://localhost:8080 will now redirect to http://localhost:8080/exhibitor/v1/ui/index.html
Fixed redirect
Add Implementation-Version to Manifest so that it shows in the UI and set exhibitor version to be the same as the exhibitor-standalone dependency version.
Updated pom.xml to add Implementation-Version to manifest
Conflicts: exhibitor-standalone/src/main/java/com/netflix/exhibitor/application/ExhibitorMain.java exhibitor-standalone/src/main/resources/buildscripts/standalone/maven/pom.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
merge with latest exhibitor and make truststore arguments optional