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

merge master #495

Merged
merged 9 commits into from
Jul 22, 2022
Merged

merge master #495

merged 9 commits into from
Jul 22, 2022

Commits on Jul 21, 2022

  1. refact: clean out empty/unused cdf code (#487) 

    * refact: clean out empty/unused cdf code
    @asmfstatoil
    asmfstatoil committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    db5385c View commit details
    Browse the repository at this point in the history

  2. refact: auto format and auto fix snyk (#488)

    @asmfstatoil
    asmfstatoil committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    55adc69 View commit details
    Browse the repository at this point in the history

  3. [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>
    @snyk-bot @asmfstatoil @EvenSol
    3 people committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    a4cf326 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. 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.
    @asmfstatoil
    asmfstatoil committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    20c2b25 View commit details
    Browse the repository at this point in the history

  2. refact: autoformat and autofix (#489)

    @asmfstatoil
    asmfstatoil committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    45e96af View commit details
    Browse the repository at this point in the history

  3. NeqSimMSAccessDatabase 

    The NeqSim parameter database in MS Access format.
    @EvenSol
    EvenSol committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    b7d9b70 View commit details
    Browse the repository at this point in the history

  4. format (#491) 

    * format
    @asmfstatoil
    asmfstatoil committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    a64c287 View commit details
    Browse the repository at this point in the history

  5. checkstyle fixes (#492)

    @asmfstatoil
    asmfstatoil committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    da5ce07 View commit details
    Browse the repository at this point in the history

  6. Formatter (#493) 

    * formatting
* autofix
    @asmfstatoil
    asmfstatoil committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    b9d5f22 View commit details
    Browse the repository at this point in the history