merge master #495
Merged
merge master #495
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
* refact: clean out empty/unused cdf code
* fix: upgrade org.apache.derby:derby from 10.14.2.0 to 10.16.1.1 Snyk has created this PR to upgrade org.apache.derby:derby from 10.14.2.0 to 10.16.1.1. See this package in Maven Repository: https://mvnrepository.com/artifact/org.apache.derby/derby/ See this project in Snyk: https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr * Update pom.xml Try with intermediate version 1.15.2.0, as 10.16.1.1 is not supported for java 11. Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com> Co-authored-by: Even Solbraa <41290109+EvenSol@users.noreply.github.com>
Add unique id showing which call to solve/run that last ran successfully. Also did some refactoring such as autoformatting, reordering of code and moving some code in the class hierarchy.
The NeqSim parameter database in MS Access format.
* formatting * autofix
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.
No description provided.