diff --git a/.github/workflows/release_with_jars.yml b/.github/workflows/release_with_jars.yml index a31bdd8406..7b4fff81c7 100644 --- a/.github/workflows/release_with_jars.yml +++ b/.github/workflows/release_with_jars.yml @@ -90,7 +90,32 @@ jobs: with: name: jarfiles path: staging - + + compile_java_21: + name: Build Neqsim ${{ needs.get_versions.outputs.version }} with java 21 + needs: get_versions + + if: ${{ needs.get_versions.outputs.version_8 == needs.get_versions.outputs.version }} + runs-on: ubuntu-latest + + steps: + - name: Check out neqsim java project + uses: actions/checkout@v3 + - name: Set up JDK 21 environment + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '21' + cache: 'maven' + - name: Build java 21 version with Maven + run: mvn -B package --file pomJava21.xml + - name: Copy jar file to staging + run: mkdir staging && cp target/neqsim*Java21.jar staging + - uses: actions/upload-artifact@v2 + with: + name: jarfiles + path: staging + create_release: name: Create release v${{ needs.get_versions.outputs.version_8 }} runs-on: ubuntu-latest diff --git a/.github/workflows/verify_build.yml b/.github/workflows/verify_build.yml index 6d2a96b89d..a082c92012 100644 --- a/.github/workflows/verify_build.yml +++ b/.github/workflows/verify_build.yml @@ -11,7 +11,7 @@ on: - master jobs: - test_javadoc: + test_java_11: name: Assert tests and javadoc with java 11 runs-on: ubuntu-latest steps: @@ -36,9 +36,9 @@ jobs: tags: coverage test_java_8: - name: Assert tests and javadoc with java 8 + name: Assert tests with java 8 runs-on: ubuntu-latest - needs: test_javadoc + needs: test_java_11 steps: - uses: actions/checkout@v3 @@ -51,3 +51,19 @@ jobs: - name: Run tests run: mvn -B test --file pomJava8.xml -ntp + + test_java_21: + name: Assert tests with java 21 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 21 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '21' + cache: 'maven' + - name: Generate javadoc + run: mvn javadoc:javadoc + - name: Run tests + run: mvn -B test --file pomJava21.xml -ntp diff --git a/pom.xml b/pom.xml index 2144e1f99b..2a24fe486d 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ org.junit.jupiter junit-jupiter - 5.9.3 + 5.10.1 test @@ -102,7 +102,7 @@ com.google.code.gson gson - 2.9.0 + 2.10.1 test @@ -143,7 +143,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.3.0 + 1.5.0 true @@ -167,7 +167,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.0 + 3.5.1 package @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.12.0 11 ${project.build.sourceEncoding} @@ -195,7 +195,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.6.3 private true @@ -211,7 +211,7 @@ maven-surefire-plugin - 3.0.0-M7 + 3.2.3 maven-failsafe-plugin @@ -220,7 +220,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.11 neqsim/physicalProperties/util/parameterFitting/**/* diff --git a/pomJava21.xml b/pomJava21.xml new file mode 100644 index 0000000000..2bfd6e902c --- /dev/null +++ b/pomJava21.xml @@ -0,0 +1,275 @@ + + + + 4.0.0 + com.equinor + neqsim + jar + ${revision}${sha1}${changelist} + + + 2.5.14 + UTF-8 + UTF-8 + + + + + + + central + https://repo1.maven.org/maven2/ + + + + + + + com.h2database + h2 + 2.2.224 + + + com.thoughtworks.xstream + xstream + 1.4.20 + + + org.apache.logging.log4j + log4j-api + 2.22.0 + + + org.apache.logging.log4j + log4j-core + 2.22.0 + + + org.junit.jupiter + junit-jupiter + 5.10.1 + test + + + colt + colt + 1.2.0 + provided + + + commons-lang + commons-lang + 2.6 + + + org.apache.commons + commons-math3 + 3.6.1 + + + org.ejml + ejml-all + 0.43.1 + + + gov.nist.math + jama + 1.0.3 + + + org.jfree + jcommon + 1.0.24 + + + org.jfree + jfreechart + 1.5.4 + + + com.googlecode.matrix-toolkits-java + mtj + 1.0.4 + + + org.ojalgo + ojalgo + 53.1.1 + provided + + + com.google.code.gson + gson + 2.10.1 + test + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.1.0 + + + enforce-maven + + enforce + + + + + 3.3.9 + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + neqsim.thermo.util.benchmark.TPflash_benchmark + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.5.0 + + true + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.1 + + + package + + shade + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.12.0 + + 21 + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + private + true + + + + attach-javadocs + + jar + + + + + + maven-surefire-plugin + 3.2.3 + + + maven-failsafe-plugin + 3.2.3 + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + neqsim/physicalProperties/util/parameterFitting/**/* + neqsim/statistics/util/parameterFitting/**/* + neqsim/PVTsimulation/util/parameterfitting/**/* + + + + + + prepare-agent + + + + report + prepare-package + + report + + + + generate-report-after-test + test + + report + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + + + github + GitHub Equinor Apache Maven Packages + https://maven.pkg.github.com/Equinor/neqsim + + + diff --git a/pomJava8.xml b/pomJava8.xml index dc3831cd13..fc22d72c74 100644 --- a/pomJava8.xml +++ b/pomJava8.xml @@ -1,248 +1,249 @@ - 4.0.0 - com.equinor.neqsim - neqsim - jar - ${revision}${sha1}${changelist}-Java8 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + com.equinor.neqsim + neqsim + jar + ${revision}${sha1}${changelist}-Java8 - - 2.5.14 - UTF-8 - UTF-8 - - - + + 2.5.14 + UTF-8 + UTF-8 + + + - - - central - https://repo1.maven.org/maven2/ - - + + + central + https://repo1.maven.org/maven2/ + + - - - org.apache.logging.log4j - log4j-api - 2.20.0 - - - org.apache.logging.log4j - log4j-core - 2.20.0 - - - com.thoughtworks.xstream - xstream - 1.4.20 - - - org.junit.jupiter - junit-jupiter - 5.9.3 - test - - - colt - colt - 1.2.0 - provided - - - commons-lang - commons-lang - 2.6 - - - org.apache.commons - commons-math3 - 3.6.1 - - - - com.h2database - h2 - 2.1.214 - - - org.ejml - ejml-all - 0.41 - - - gov.nist.math - jama - 1.0.3 - - - org.jfree - jcommon - 1.0.24 - - - org.jfree - jfreechart - 1.5.3 - - - com.googlecode.matrix-toolkits-java - mtj - 1.0.4 - - - org.ojalgo - ojalgo - 48.4.2 - provided - - - com.google.code.gson - gson - 2.9.0 - test - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.1.0 - - - enforce-maven - - enforce - - - - - 3.3.9 - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - - neqsim.thermo.util.benchmark.TPflash_benchmark - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.3.0 - - true - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.4.0 - - - package - - shade - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.1 - - private - true - - - - maven-surefire-plugin - 3.0.0-M7 - - - maven-failsafe-plugin - 3.0.0-M7 - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - neqsim/physicalProperties/util/parameterFitting/**/* - neqsim/statistics/util/parameterFitting/**/* - neqsim/PVTsimulation/util/parameterfitting/**/* - - - - - - prepare-agent - - - - report - prepare-package - - report - - - - generate-report-after-test - test - - report - - - - - - - - - github - GitHub Equinor Apache Maven Packages - https://maven.pkg.github.com/Equinor/neqsim - - + + + org.apache.logging.log4j + log4j-api + 2.20.0 + + + org.apache.logging.log4j + log4j-core + 2.20.0 + + + com.thoughtworks.xstream + xstream + 1.4.20 + + + org.junit.jupiter + junit-jupiter + 5.9.3 + test + + + colt + colt + 1.2.0 + provided + + + commons-lang + commons-lang + 2.6 + + + org.apache.commons + commons-math3 + 3.6.1 + + + + com.h2database + h2 + 2.1.214 + + + org.ejml + ejml-all + 0.41 + + + gov.nist.math + jama + 1.0.3 + + + org.jfree + jcommon + 1.0.24 + + + org.jfree + jfreechart + 1.5.3 + + + com.googlecode.matrix-toolkits-java + mtj + 1.0.4 + + + org.ojalgo + ojalgo + 48.4.2 + provided + + + com.google.code.gson + gson + 2.10.1 + test + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.1.0 + + + enforce-maven + + enforce + + + + + 3.3.9 + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + neqsim.thermo.util.benchmark.TPflash_benchmark + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.5.0 + + true + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.1 + + + package + + shade + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.12.0 + + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + private + true + + + + maven-surefire-plugin + 3.0.0-M7 + + + maven-failsafe-plugin + 3.0.0-M7 + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + neqsim/physicalProperties/util/parameterFitting/**/* + neqsim/statistics/util/parameterFitting/**/* + neqsim/PVTsimulation/util/parameterfitting/**/* + + + + + + prepare-agent + + + + report + prepare-package + + report + + + + generate-report-after-test + test + + report + + + + + + + + + github + GitHub Equinor Apache Maven Packages + https://maven.pkg.github.com/Equinor/neqsim + +