Skip to content

Commit 25c7580

Browse files
chrjohnchrjohn
authored
Merge branch 'master' into jdbc-test
2 parents 47694d3 + bd4632d commit 25c7580

File tree

8 files changed

+36
-29
lines changed

8 files changed

+36
-29
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL

‎.github/workflows/maven.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, macOS-13]
14+
os: [ubuntu-latest, macOS-14]
1515
java: [8, 11, 21]
1616
fail-fast: false
1717
max-parallel: 4
1818
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
1919

2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
- name: Set up JDK
2323
uses: actions/setup-java@v5
2424
with:
25-
distribution: 'temurin'
25+
distribution: 'corretto'
2626
java-version: ${{ matrix.java }}
2727
cache: 'maven'
2828
- name: Test with Maven
@@ -39,17 +39,17 @@ jobs:
3939
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
4040

4141
steps:
42-
- uses: actions/checkout@v5
42+
- uses: actions/checkout@v6
4343
- name: Configure pagefile
44-
uses: al-cheb/configure-pagefile-action@v1.4
44+
uses: al-cheb/configure-pagefile-action@v1.5
4545
with:
4646
minimum-size: 8GB
4747
maximum-size: 16GB
4848
disk-root: "C:"
4949
- name: Set up Windows JDK
5050
uses: actions/setup-java@v5
5151
with:
52-
distribution: 'temurin'
52+
distribution: 'corretto'
5353
java-version: ${{ matrix.java }}
5454
cache: 'maven'
5555
- name: Test with Maven on Windows

‎.github/workflows/nightly-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: github.repository == 'quickfix-j/quickfixj'
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
- name: Set up JDK
1818
uses: actions/setup-java@v5
1919
with:
@@ -22,7 +22,7 @@ jobs:
2222
cache: maven
2323

2424
- name: Build SNAPSHOT
25-
run: ./mvnw clean package -B -V -D"maven.javadoc.skip"="true" -D"java.util.logging.config.file"="${{github.workspace}}/quickfixj-core/src/test/resources/logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
25+
run: ./mvnw clean package -pl '!quickfixj-distribution' -B -V -D"maven.javadoc.skip"="true" -D"java.util.logging.config.file"="${{github.workspace}}/quickfixj-core/src/test/resources/logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
2626

2727
- name: Delete old packages
2828
continue-on-error: true
@@ -61,6 +61,6 @@ jobs:
6161
org.quickfixj.quickfixj-stress-test
6262
6363
- name: Deploy SNAPSHOT
64-
run: ./mvnw deploy -B -V -DskipTests -D"maven.javadoc.skip"="true" -D"java.util.logging.config.file"="${{github.workspace}}/quickfixj-core/src/test/resources/logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
64+
run: ./mvnw deploy -pl '!quickfixj-distribution' -B -V -Dmaven.install.skip=true -DskipTests -D"java.util.logging.config.file"="${{github.workspace}}/quickfixj-core/src/test/resources/logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
6565
env:
6666
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,31 +66,31 @@
6666
<slf4j.version>2.0.17</slf4j.version>
6767
<mockito-core.version>4.11.0</mockito-core.version>
6868
<hamcrest.version>3.0</hamcrest.version>
69-
<junit.jupiter.version>5.13.4</junit.jupiter.version>
69+
<junit.jupiter.version>5.14.1</junit.jupiter.version>
7070
<maven.compiler.source>8</maven.compiler.source>
7171
<maven.compiler.target>8</maven.compiler.target>
7272
<mainClass/>
7373
<maven.version>3.9.11</maven.version> <!-- please also change version in .mvn/wrapper/maven-wrapper.properties -->
7474
<maven-libs-version>${maven.version}</maven-libs-version>
7575
<maven-plugin-api-version>${maven.version}</maven-plugin-api-version>
76-
<maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
76+
<maven-resources-plugin-version>3.4.0</maven-resources-plugin-version>
7777
<maven-compiler-plugin-version>3.14.1</maven-compiler-plugin-version>
78-
<maven-jar-plugin-version>3.4.2</maven-jar-plugin-version>
78+
<maven-jar-plugin-version>3.5.0</maven-jar-plugin-version>
7979
<maven-surefire-plugin-version>3.5.4</maven-surefire-plugin-version>
8080
<maven-pmd-plugin-version>3.28.0</maven-pmd-plugin-version>
81-
<maven-source-plugin-version>3.3.1</maven-source-plugin-version>
81+
<maven-source-plugin-version>3.4.0</maven-source-plugin-version>
8282
<maven-javadoc-plugin-version>3.12.0</maven-javadoc-plugin-version>
8383
<maven-shade-plugin-version>3.6.1</maven-shade-plugin-version>
84-
<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
84+
<maven-assembly-plugin-version>3.8.0</maven-assembly-plugin-version>
8585
<maven-bundle-plugin-version>5.1.9</maven-bundle-plugin-version>
8686
<maven-gpg-plugin-version>3.2.8</maven-gpg-plugin-version>
8787
<maven-deploy-plugin-version>3.1.4</maven-deploy-plugin-version>
8888
<nexus-staging-maven-plugin-version>1.7.0</nexus-staging-maven-plugin-version>
8989
<build-helper-maven-plugin-version>3.6.1</build-helper-maven-plugin-version>
9090
<maven-shared-utils.version>3.4.2</maven-shared-utils.version>
9191
<file-management.version>3.2.0</file-management.version>
92-
<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
93-
<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
92+
<maven-plugin-annotations.version>3.15.2</maven-plugin-annotations.version>
93+
<maven-plugin-testing-harness.version>3.4.0</maven-plugin-testing-harness.version>
9494
<plantuml-maven-plugin-version>1.2</plantuml-maven-plugin-version>
9595
<plantuml-version>8059</plantuml-version>
9696
<xml-maven-plugin-version>1.2.0</xml-maven-plugin-version>
@@ -99,7 +99,7 @@
9999
<docgen.version>1.6.8</docgen.version>
100100
<jaxb.version>4.0.4</jaxb.version>
101101
<apache.mina.version>2.2.4</apache.mina.version>
102-
<commons.io.version>2.20.0</commons.io.version>
102+
<commons.io.version>2.21.0</commons.io.version>
103103
<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
104104
<org.quickfixj.orchestra.tools.version>1.0.3</org.quickfixj.orchestra.tools.version>
105105
<jaxen.version>2.0.0</jaxen.version>
@@ -428,7 +428,7 @@
428428
</plugin>
429429
<plugin>
430430
<artifactId>maven-plugin-plugin</artifactId>
431-
<version>3.15.1</version>
431+
<version>3.15.2</version>
432432
</plugin>
433433
<plugin>
434434
<artifactId>maven-install-plugin</artifactId>

‎quickfixj-base/src/test/java/quickfix/DataDictionaryTest.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.io.ByteArrayInputStream;
2929
import java.net.URL;
3030
import java.net.URLClassLoader;
31+
import java.util.Locale;
3132

3233
import javax.xml.parsers.DocumentBuilderFactory;
3334

@@ -677,11 +678,17 @@ public void shouldLoadDictionaryWhenExternalDTDisEnabled() throws ConfigError {
677678

678679
@Test
679680
public void shouldFailToLoadDictionaryWhenExternalDTDisDisabled() {
681+
Locale originalLocale = Locale.getDefault();
682+
Locale.setDefault(Locale.US);
680683
try {
681-
new DataDictionary("FIX_External_DTD.xml");
682-
fail("should fail to load dictionary with external DTD");
683-
} catch (ConfigError e) {
684-
assertEquals("External DTD: Failed to read external DTD 'mathml.dtd', because 'http' access is not allowed due to restriction set by the accessExternalDTD property.", e.getCause().getCause().getMessage());
684+
try {
685+
new DataDictionary("FIX_External_DTD.xml");
686+
fail("should fail to load dictionary with external DTD");
687+
} catch (ConfigError e) {
688+
assertEquals("External DTD: Failed to read external DTD 'mathml.dtd', because 'http' access is not allowed due to restriction set by the accessExternalDTD property.", e.getCause().getCause().getMessage());
689+
}
690+
} finally {
691+
Locale.setDefault(originalLocale);
685692
}
686693
}
687694

‎quickfixj-codegenerator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</plugin>
7979
<plugin>
8080
<artifactId>maven-plugin-plugin</artifactId>
81-
<version>3.15.1</version>
81+
<version>3.15.2</version>
8282
<configuration>
8383
<goalPrefix>quickfixj-codegenerator</goalPrefix>
8484
</configuration>

‎quickfixj-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>io.netty</groupId>
122122
<artifactId>netty-example</artifactId>
123-
<version>4.2.7.Final</version>
123+
<version>4.2.8.Final</version>
124124
<scope>test</scope>
125125
</dependency>
126126
<dependency>

‎quickfixj-examples/executor/src/main/java/quickfix/examples/executor/Application.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public void onMessage(quickfix.fix41.NewOrderSingle order, SessionID sessionID)
238238
Price price = getPrice(order);
239239

240240
quickfix.fix41.ExecutionReport accept = new quickfix.fix41.ExecutionReport(genOrderID(), genExecID(),
241-
new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.TRADE), new OrdStatus(OrdStatus.NEW), order
241+
new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.NEW), new OrdStatus(OrdStatus.NEW), order
242242
.getSymbol(), order.getSide(), orderQty, new LastShares(0), new LastPx(0), new LeavesQty(0),
243243
new CumQty(0), new AvgPx(0));
244244

@@ -247,7 +247,7 @@ public void onMessage(quickfix.fix41.NewOrderSingle order, SessionID sessionID)
247247

248248
if (isOrderExecutable(order, price)) {
249249
quickfix.fix41.ExecutionReport executionReport = new quickfix.fix41.ExecutionReport(genOrderID(),
250-
genExecID(), new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.TRADE), new OrdStatus(
250+
genExecID(), new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.FILL), new OrdStatus(
251251
OrdStatus.FILLED), order.getSymbol(), order.getSide(), orderQty, new LastShares(orderQty
252252
.getValue()), new LastPx(price.getValue()), new LeavesQty(0), new CumQty(orderQty
253253
.getValue()), new AvgPx(price.getValue()));
@@ -270,15 +270,15 @@ public void onMessage(quickfix.fix42.NewOrderSingle order, SessionID sessionID)
270270
Price price = getPrice(order);
271271

272272
quickfix.fix42.ExecutionReport accept = new quickfix.fix42.ExecutionReport(genOrderID(), genExecID(),
273-
new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.TRADE), new OrdStatus(OrdStatus.NEW), order
273+
new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.NEW), new OrdStatus(OrdStatus.NEW), order
274274
.getSymbol(), order.getSide(), new LeavesQty(0), new CumQty(0), new AvgPx(0));
275275

276276
accept.set(order.getClOrdID());
277277
sendMessage(sessionID, accept);
278278

279279
if (isOrderExecutable(order, price)) {
280280
quickfix.fix42.ExecutionReport executionReport = new quickfix.fix42.ExecutionReport(genOrderID(),
281-
genExecID(), new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.TRADE), new OrdStatus(
281+
genExecID(), new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.FILL), new OrdStatus(
282282
OrdStatus.FILLED), order.getSymbol(), order.getSide(), new LeavesQty(0), new CumQty(
283283
orderQty.getValue()), new AvgPx(price.getValue()));
284284

0 commit comments

Comments
 (0)