Skip to content

Commit

Permalink
merge master (#495)
Browse files Browse the repository at this point in the history
* refact: clean out empty/unused cdf code (#487)

* refact: clean out empty/unused cdf code

* refact: auto format and auto fix snyk (#488)

* [Snyk] Upgrade org.apache.derby:derby from 10.14.2.0 to 10.16.1.1 (#457)

* 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>

* feat: add calcidentifier to simulation objects (#486)

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.

* refact: autoformat and autofix (#489)

* NeqSimMSAccessDatabase

The NeqSim parameter database in MS Access format.

* format (#491)

* format

* checkstyle fixes (#492)

* Formatter (#493)

* formatting
* autofix

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>
Co-authored-by: Snyk bot <snyk-bot@snyk.io>
  • Loading branch information
3 people committed Jul 22, 2022
1 parent 5998307 commit 18255c1
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 18255c1

Please sign in to comment.