Skip to content

Commit 0599c6c

Browse files
authored
Version bump (#682)
* Version bump * Fix spotbugs warnings * Latest apache cxf seems to have fixed the connection pooling logic and also supports modern java * Bump some of the easier npm dependencies. Leave major react + mseal bumps for later
1 parent 3796272 commit 0599c6c

42 files changed

Lines changed: 1948 additions & 1563 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: always()
1919
strategy:
2020
matrix:
21-
java: [ '17', '21', '23' ]
21+
java: [ '17', '21', '24' ]
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Check out

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@
44

55
**Details**
66

7+
- `nflow-explorer`
8+
- Dependency updates
9+
- Jetty 11.0.25
10+
- Apache CFX 4.1.2
11+
- logback 1.5.18
12+
- jackson 2.19.0
13+
- h2 2.2.224
14+
- mssql-jdbc 12.10.0
15+
- mariadb 3.5.3
16+
- mysql-connector 9.3.0
17+
- ojdbc11 23.8.0.25.04
18+
- HikariCP 6.3.0
19+
- joda-time 2.14.0
20+
- slf4j 2.0.17
21+
- reactor-netty 1.2.6
22+
- reactor-core 3.7.6
23+
- swagger 2.2.32
24+
- asm 9.8
25+
726
## 10.0.1 (2025-04-21)
827

928
**Highlights**

findbugs-exclude.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<Match>
1212
<Bug pattern="IMC_IMMATURE_CLASS_NO_EQUALS" />
1313
</Match>
14+
<Match>
15+
<Bug pattern="OPM_OVERLY_PERMISSIVE_METHOD" /> <!-- This is buggy in spotbugs 5.9 -->
16+
</Match>
1417
<Match>
1518
<Bug pattern="AI_ANNOTATION_ISSUES_NEEDS_NULLABLE"/>
1619
</Match>

maven-version-rules.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@
113113
<ignoreVersion type="regex">.*BETA.*</ignoreVersion>
114114
</ignoreVersions>
115115
</rule>
116+
<rule groupId="io.projectreactor">
117+
<ignoreVersions>
118+
<ignoreVersion type="regex">.*M[0-9]</ignoreVersion>
119+
</ignoreVersions>
120+
</rule>
116121
</rules>
117122
</ruleset>
118123

nflow-engine/src/main/java/io/nflow/engine/config/db/MariadbDatabaseConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public MariadbDatabaseConfiguration() {
4545
*/
4646
@Bean
4747
@Override
48-
@SuppressFBWarnings(value = { "WEM_WEAK_EXCEPTION_MESSAGING", "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" },
49-
justification = "exception message is ok, null-check in try-catch")
48+
@SuppressFBWarnings(value = "WEM_WEAK_EXCEPTION_MESSAGING", justification = "exception message is ok")
5049
public DatabaseInitializer nflowDatabaseInitializer(@NFlow DataSource nflowDataSource, Environment env) {
5150
String scriptPrefix = "mariadb";
5251
try (Connection c = DataSourceUtils.getConnection(nflowDataSource)) {

nflow-engine/src/main/java/io/nflow/engine/config/db/MysqlDatabaseConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ public MysqlDatabaseConfiguration() {
4545
*/
4646
@Bean
4747
@Override
48-
@SuppressFBWarnings(
49-
value = { "WEM_WEAK_EXCEPTION_MESSAGING", "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" },
50-
justification = "exception message is ok, null-check in try-catch")
48+
@SuppressFBWarnings(value = "WEM_WEAK_EXCEPTION_MESSAGING", justification = "exception message is ok")
5149
public DatabaseInitializer nflowDatabaseInitializer(@NFlow DataSource nflowDataSource, Environment env) {
5250
String scriptPrefix = "mysql";
5351
try (Connection c = DataSourceUtils.getConnection(nflowDataSource)) {

nflow-engine/src/main/java/io/nflow/engine/config/db/OracleDatabaseConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ public OracleDatabaseConfiguration() {
4949
*/
5050
@Bean
5151
@Override
52-
@SuppressFBWarnings(value = { "WEM_WEAK_EXCEPTION_MESSAGING", "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" },
53-
justification = "exception message is ok, null-check in try-catch")
52+
@SuppressFBWarnings(value = "WEM_WEAK_EXCEPTION_MESSAGING", justification = "exception message is ok")
5453
public DatabaseInitializer nflowDatabaseInitializer(@NFlow DataSource nflowDataSource, Environment env) {
5554
try (Connection c = DataSourceUtils.getConnection(nflowDataSource)) {
5655
DatabaseMetaData meta = c.getMetaData();

nflow-engine/src/main/java/io/nflow/engine/guice/EnvironmentModule.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313

1414
import com.google.inject.AbstractModule;
1515

16-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
17-
1816
public class EnvironmentModule extends AbstractModule {
1917

2018
private final Properties userProperties;
2119
private final String[] classpathPropertiesFiles;
2220

23-
@SuppressFBWarnings(value = "OPM_OVERLY_PERMISSIVE_METHOD", justification = "Public for Guice")
24-
public EnvironmentModule(Properties userProperties, String... classpathPropertiesFiles) {
21+
protected EnvironmentModule(Properties userProperties, String... classpathPropertiesFiles) {
2522
this.userProperties = userProperties;
2623
this.classpathPropertiesFiles = classpathPropertiesFiles;
2724
}

nflow-engine/src/main/java/io/nflow/engine/internal/dao/ExecutorDao.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
* Use setter injection because constructor injection may not work when nFlow is used in some legacy systems.
4343
*/
4444
@Component
45-
@SuppressFBWarnings(value = "SIC_INNER_SHOULD_BE_STATIC_ANON", justification = "common jdbctemplate practice")
4645
@Singleton
4746
public class ExecutorDao {
4847

@@ -205,9 +204,6 @@ public void markRecovered(int recoveredExecutorId) {
205204
}
206205
}
207206

208-
@SuppressFBWarnings(
209-
value = { "OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE", "SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING" },
210-
justification = "spotbugs does not trust jdbctemplate, sql is constant in practice")
211207
public int deleteExpiredBefore(DateTime expiredBefore) {
212208
try {
213209
return jdbc.update("delete from nflow_executor where recovered is not null and " + sqlVariants.dateLtEqDiff("expires", "?")

nflow-engine/src/main/java/io/nflow/engine/internal/dao/HealthCheckDao.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55

66
import org.springframework.jdbc.core.JdbcTemplate;
77

8-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
98
import io.nflow.engine.config.NFlow;
109

1110
@Named
12-
@SuppressFBWarnings(value = "SIC_INNER_SHOULD_BE_STATIC_ANON", justification = "common jdbctemplate practice")
1311
public class HealthCheckDao {
1412
private final JdbcTemplate jdbc;
1513

@@ -18,7 +16,6 @@ public HealthCheckDao(@NFlow JdbcTemplate jdbcTemplate) {
1816
this.jdbc = jdbcTemplate;
1917
}
2018

21-
@SuppressFBWarnings(value = "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", justification = "jdbc is injected")
2219
public void checkDatabaseConnection() {
2320
jdbc.query("select status, type from nflow_workflow where id = 0", resultSet -> null);
2421
}

0 commit comments

Comments
 (0)