Merge branch 'master' into testnewfunc

equinor · Jan 4, 2024 · c3e7a73 · c3e7a73
2 parents e4c56a8 + d414887
commit c3e7a73
Show file tree

Hide file tree

Showing 51 changed files with 2,179 additions and 686 deletions.
diff --git a/.github/workflows/release_with_jars.yml b/.github/workflows/release_with_jars.yml
@@ -90,7 +90,34 @@ 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: Rename files
+        run: cd target && find . -type f -name "neqsim-*.jar" -exec sh -c 'mv -f $0 ${0%.jar}-Java21.jar' {} \; && cd ..
+      - 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
@@ -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
@@ -10,7 +10,7 @@
 	<version>${revision}${sha1}${changelist}</version>
 
 	<properties>
-		<revision>2.5.12</revision>
+		<revision>2.5.15</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<sha1/>
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.9.3</version>
+			<version>5.10.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.9.0</version>
+			<version>2.10.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -143,7 +143,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
-				<version>1.3.0</version>
+				<version>1.5.0</version>
 				<configuration>
 					<updatePomFile>true</updatePomFile>
 				</configuration>
@@ -167,7 +167,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.5.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -180,7 +180,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.12.0</version>
 				<configuration>
 					<release>11</release> <!-- Upgrade jdk version to 11 if you are having issues compiling -->
 					<encoding>${project.build.sourceEncoding}</encoding>
@@ -195,7 +195,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.4.1</version>
+				<version>3.6.3</version>
 				<configuration>
 					<show>private</show>
 					<nohelp>true</nohelp>
@@ -211,7 +211,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M7</version>
+				<version>3.2.3</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-failsafe-plugin</artifactId>
@@ -220,7 +220,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.8</version>
+				<version>0.8.11</version>
 				<configuration>
 					<excludes>
 						<exclude>neqsim/physicalProperties/util/parameterFitting/**/*</exclude>