Skip to content

Commit 38adae5

Browse files
EvenSolEvenSol
authored
Add selectable step-response tuning rules with SIMC option (#1678)
* Add selectable step-response tuning rules with SIMC option * Restore static add-opens flags for Java 11+ builds * Inline add-opens flags directly in Java 21 pom * Use Surefire argLine placeholder * Ensure surefire argLine resolves on all JDKs * Extend aqueous density fallback to alcohols
1 parent 5a57411 commit 38adae5

File tree

8 files changed

+387
-104
lines changed

8 files changed

+387
-104
lines changed

‎pom.xml‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
<url>https://github.com/equinor/neqsim</url>
1919
</scm>
2020

21-
<properties>
22-
<revision>3.1.0</revision>
23-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<checkstyle.config.location>checkstyle_neqsim.xml</checkstyle.config.location>
26-
<skipFlattening>false</skipFlattening>
27-
</properties>
21+
<properties>
22+
<revision>3.1.0</revision>
23+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25+
<checkstyle.config.location>checkstyle_neqsim.xml</checkstyle.config.location>
26+
<skipFlattening>false</skipFlattening>
27+
<argLine></argLine>
28+
</properties>
2829
<licenses>
2930
<license>
3031
<name>The Apache Software License, Version 2.0</name>
@@ -133,9 +134,9 @@
133134
<version>2.20.1</version>
134135
</dependency>
135136
</dependencies>
136-
<profiles>
137-
<profile>
138-
<id>release</id>
137+
<profiles>
138+
<profile>
139+
<id>release</id>
139140
<properties>
140141
<skipFlattening>true</skipFlattening>
141142
</properties>
@@ -311,22 +312,22 @@
311312
</execution>
312313
</executions>
313314
</plugin>
314-
<plugin>
315-
<artifactId>maven-surefire-plugin</artifactId>
316-
<version>3.5.4</version>
317-
<configuration>
318-
<!-- Preserve any Jacoco agent injection (${argLine}) and add required module opens for XStream reflection when running tests on JDK >= 17 -->
319-
<argLine>${argLine} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
320-
</configuration>
321-
</plugin>
322-
<plugin>
323-
<artifactId>maven-failsafe-plugin</artifactId>
324-
<version>3.5.4</version>
325-
<configuration>
326-
<!-- Preserve any Jacoco agent injection (${argLine}) and add required module opens for XStream reflection when running tests on JDK >= 17 -->
327-
<argLine>${argLine} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
328-
</configuration>
329-
</plugin>
315+
<plugin>
316+
<artifactId>maven-surefire-plugin</artifactId>
317+
<version>3.5.4</version>
318+
<configuration>
319+
<!-- Preserve any Jacoco agent injection (${argLine}) and add required module opens for XStream reflection when running tests on JDK >= 11 -->
320+
<argLine>${argLine} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
321+
</configuration>
322+
</plugin>
323+
<plugin>
324+
<artifactId>maven-failsafe-plugin</artifactId>
325+
<version>3.5.4</version>
326+
<configuration>
327+
<!-- Preserve any Jacoco agent injection (${argLine}) and add required module opens for XStream reflection when running tests on JDK >= 11 -->
328+
<argLine>${argLine} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
329+
</configuration>
330+
</plugin>
330331
<plugin>
331332
<groupId>org.apache.maven.plugins</groupId>
332333
<artifactId>maven-source-plugin</artifactId>

‎pomJava21.xml‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@
1818
<url>https://github.com/equinor/neqsim</url>
1919
</scm>
2020

21-
<properties>
22-
<revision>3.1.0</revision>
23-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<sha1 />
26-
<changelist />
27-
<checkstyle.config.location>checkstyle_neqsim.xml</checkstyle.config.location>
28-
<skipFlattening>false</skipFlattening>
29-
</properties>
21+
<properties>
22+
<revision>3.1.0</revision>
23+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25+
<sha1 />
26+
<changelist />
27+
<checkstyle.config.location>checkstyle_neqsim.xml</checkstyle.config.location>
28+
<skipFlattening>false</skipFlattening>
29+
<argLine></argLine>
30+
</properties>
3031
<licenses>
3132
<license>
3233
<name>The Apache Software License, Version 2.0</name>
@@ -135,11 +136,11 @@
135136
<version>2.20.1</version>
136137
</dependency>
137138
</dependencies>
138-
<profiles>
139-
<profile>
140-
<id>release</id>
141-
<properties>
142-
<skipFlattening>true</skipFlattening>
139+
<profiles>
140+
<profile>
141+
<id>release</id>
142+
<properties>
143+
<skipFlattening>true</skipFlattening>
143144
</properties>
144145
<build>
145146
<plugins>
@@ -313,22 +314,22 @@
313314
</execution>
314315
</executions>
315316
</plugin>
316-
<plugin>
317-
<artifactId>maven-surefire-plugin</artifactId>
318-
<configuration>
319-
<!-- Add required module opens for XStream reflection when running tests on JDK >= 17 -->
320-
<argLine>--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
321-
</configuration>
322-
<version>3.5.4</version>
323-
</plugin>
324-
<plugin>
325-
<artifactId>maven-failsafe-plugin</artifactId>
326-
<version>3.5.4</version>
327-
<configuration>
328-
<!-- Add required module opens for XStream reflection when running tests on JDK >= 17 -->
329-
<argLine>$--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
330-
</configuration>
331-
</plugin>
317+
<plugin>
318+
<artifactId>maven-surefire-plugin</artifactId>
319+
<configuration>
320+
<!-- Preserve any Jacoco agent injection (${argLine}) and add required module opens for XStream reflection when running tests on JDK >= 17 -->
321+
<argLine>${argLine} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
322+
</configuration>
323+
<version>3.5.4</version>
324+
</plugin>
325+
<plugin>
326+
<artifactId>maven-failsafe-plugin</artifactId>
327+
<version>3.5.4</version>
328+
<configuration>
329+
<!-- Preserve any Jacoco agent injection (${argLine}) and add required module opens for XStream reflection when running integration tests on JDK >= 17 -->
330+
<argLine>${argLine} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
331+
</configuration>
332+
</plugin>
332333
<plugin>
333334
<groupId>org.apache.maven.plugins</groupId>
334335
<artifactId>maven-source-plugin</artifactId>

‎pomJava8.xml‎

Lines changed: 39 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@
1818
<url>https://github.com/equinor/neqsim</url>
1919
</scm>
2020

21-
<properties>
22-
<revision>3.1.0</revision>
23-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<sha1 />
26-
<changelist />
27-
<checkstyle.config.location>checkstyle_neqsim.xml</checkstyle.config.location>
28-
<skipFlattening>false</skipFlattening>
29-
</properties>
21+
<properties>
22+
<revision>3.1.0</revision>
23+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25+
<sha1 />
26+
<changelist />
27+
<checkstyle.config.location>checkstyle_neqsim.xml</checkstyle.config.location>
28+
<skipFlattening>false</skipFlattening>
29+
<argLine></argLine>
30+
<jvm.module.opens.argLine></jvm.module.opens.argLine>
31+
</properties>
3032
<licenses>
3133
<license>
3234
<name>The Apache Software License, Version 2.0</name>
@@ -135,9 +137,18 @@
135137
<version>2.20.1</version>
136138
</dependency>
137139
</dependencies>
138-
<profiles>
139-
<profile>
140-
<id>release</id>
140+
<profiles>
141+
<profile>
142+
<id>add-jvm-module-opens</id>
143+
<activation>
144+
<jdk>[9,)</jdk>
145+
</activation>
146+
<properties>
147+
<jvm.module.opens.argLine> --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</jvm.module.opens.argLine>
148+
</properties>
149+
</profile>
150+
<profile>
151+
<id>release</id>
141152
<properties>
142153
<skipFlattening>true</skipFlattening>
143154
</properties>
@@ -307,18 +318,22 @@
307318
</execution>
308319
</executions>
309320
</plugin>
310-
<plugin>
311-
<artifactId>maven-surefire-plugin</artifactId>
312-
<version>3.5.4</version>
313-
<configuration>
314-
</configuration>
315-
</plugin>
316-
<plugin>
317-
<artifactId>maven-failsafe-plugin</artifactId>
318-
<version>3.5.4</version>
319-
<configuration>
320-
</configuration>
321-
</plugin>
321+
<plugin>
322+
<artifactId>maven-surefire-plugin</artifactId>
323+
<version>3.5.4</version>
324+
<configuration>
325+
<!-- Add required module opens for XStream reflection when running tests on JDK >= 17 -->
326+
<argLine>${argLine}${jvm.module.opens.argLine}</argLine>
327+
</configuration>
328+
</plugin>
329+
<plugin>
330+
<artifactId>maven-failsafe-plugin</artifactId>
331+
<version>3.5.4</version>
332+
<configuration>
333+
<!-- Add required module opens for XStream reflection when running tests on JDK >= 17 -->
334+
<argLine>${argLine}${jvm.module.opens.argLine}</argLine>
335+
</configuration>
336+
</plugin>
322337
<plugin>
323338
<groupId>org.apache.maven.plugins</groupId>
324339
<artifactId>maven-source-plugin</artifactId>

0 commit comments

Comments
 (0)