Skip to content

Commit a80cf37

Browse files
authored
Merge branch 'master' into socket-connect-timeout
2 parents 4aeef96 + 89acf0c commit a80cf37

File tree

83 files changed

+2389
-979
lines changed

Some content is hidden

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

83 files changed

+2389
-979
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ updates:
77
directory: "/" # Location of package manifests
88
schedule:
99
interval: "daily"
10+
open-pull-requests-limit: 10
1011
- package-ecosystem: "github-actions"
1112
directory: "/"
1213
schedule:
1314
# Check for updates to GitHub Actions every weekday
1415
interval: "daily"
16+
open-pull-requests-limit: 10

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
analyze:
2727
name: Analyze
2828
runs-on: ubuntu-latest
29-
env:
30-
MAVEN_OPTS: "-Xms3g -Xmx6g -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500"
3129

3230
strategy:
3331
fail-fast: false
@@ -43,7 +41,7 @@ jobs:
4341

4442
# Initializes the CodeQL tools for scanning.
4543
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v2
44+
uses: github/codeql-action/init@v3
4745
with:
4846
languages: ${{ matrix.language }}
4947
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +62,7 @@ jobs:
6462
# and modify them (or add more) to build your code if your project
6563
# uses a compiled language
6664
- run: |
67-
mvn clean package -B -V -e -Pminimal-fix-latest -Dmaven.javadoc.skip=true -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Dspotbugs.skip -Denforcer.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true -Dspotless.check.skip=true -D"java.util.logging.config.file"="logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
65+
./mvnw clean package -B -V -e -Pminimal-fix-latest -Dmaven.javadoc.skip=true -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Dspotbugs.skip -Denforcer.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true -Dspotless.check.skip=true -D"java.util.logging.config.file"="logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
6866
6967
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v2
68+
uses: github/codeql-action/analyze@v3

.github/workflows/maven.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414
strategy:
1515
matrix:
16-
os: [ubuntu-latest, macOS-latest]
16+
os: [ubuntu-latest, macOS-13]
1717
java: [8, 11, 17]
1818
fail-fast: false
1919
max-parallel: 4
@@ -28,9 +28,7 @@ jobs:
2828
java-version: ${{ matrix.java }}
2929
cache: 'maven'
3030
- name: Test with Maven
31-
env:
32-
MAVEN_OPTS: "-Xms3g -Xmx5g -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500"
33-
run: mvn install -B -V -Pminimal-fix-latest -D"java.util.logging.config.file"="logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
31+
run: ./mvnw install -B -V -D"maven.javadoc.skip"="true" -P"skipBundlePlugin,minimal-fix-latest" -D"java.util.logging.config.file"="./quickfixj-core/src/test/resources/logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
3432

3533
test-windows:
3634
runs-on: ${{ matrix.os }}
@@ -45,17 +43,16 @@ jobs:
4543
steps:
4644
- uses: actions/checkout@v4
4745
- name: Configure pagefile
48-
uses: al-cheb/configure-pagefile-action@v1.3
46+
uses: al-cheb/configure-pagefile-action@v1.4
4947
with:
5048
minimum-size: 8GB
5149
maximum-size: 16GB
50+
disk-root: "C:"
5251
- name: Set up Windows JDK
5352
uses: actions/setup-java@v4
5453
with:
5554
distribution: 'temurin'
5655
java-version: ${{ matrix.java }}
5756
cache: 'maven'
5857
- name: Test with Maven on Windows
59-
env:
60-
MAVEN_OPTS: "-Xms3g -Xmx5g -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500"
61-
run: mvn install -B -V -D"maven.javadoc.skip"="true" -P"skipBundlePlugin,minimal-fix-latest" -D"java.util.logging.config.file"="logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
58+
run: ./mvnw.cmd install -B -V -D"maven.javadoc.skip"="true" -P"skipBundlePlugin,minimal-fix-latest" -D"java.util.logging.config.file"="./quickfixj-core/src/test/resources/logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ target/
1212
# ignore NetBeans configuration
1313
nb-configuration.xml
1414
*.bak
15-
.mvn/
16-
mvn*

.mvn/jvm.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Xms3g -Xmx6g -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
#
18+
# NOTE: maven version should also be changed in pom.xml
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
20+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ QuickFIX/J
77
This is the official QuickFIX/J project repository.
88

99
## intro
10-
QuickFIX/J is a full featured messaging engine for the FIX protocol (FIX versions 4.0 - 5.0SP2/FIXT1.1).
10+
QuickFIX/J is a full featured messaging engine for the FIX protocol (FIX versions 4.0 - 5.0SP2/FIXT1.1 and FIXLatest).
1111
It is a 100% Java open source implementation of the popular C++ QuickFIX engine.
1212

1313
The Financial Information eXchange (FIX) protocol is a messaging standard developed
@@ -42,27 +42,27 @@ Pull requests are always welcome! Best is if you added a unit test to show that
4242

4343
Fastest: clone the repo and issue the following command.
4444
```
45-
$ mvn clean package -Dmaven.javadoc.skip=true -DskipTests -PskipBundlePlugin,minimal-fix-latest -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500
45+
$ mvnw clean package -Dmaven.javadoc.skip=true -DskipTests -PskipBundlePlugin,minimal-fix-latest
4646
```
4747

4848
Slower: if you only want to skip the acceptance test suite:
4949
```
50-
$ mvn clean package -Dmaven.javadoc.skip=true -DskipAT=true -PskipBundlePlugin,minimal-fix-latest -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500
50+
$ mvnw clean package -Dmaven.javadoc.skip=true -DskipAT=true -PskipBundlePlugin,minimal-fix-latest
5151
```
5252

5353
Slow: if you want to run all tests:
5454
```
55-
$ mvn clean package -Dmaven.javadoc.skip=true -PskipBundlePlugin,minimal-fix-latest -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500
55+
$ mvnw clean package -Dmaven.javadoc.skip=true -PskipBundlePlugin,minimal-fix-latest
5656
```
5757
NB: If you want to use the resulting JARs in an OSGi environment you'll have to omit the `-PskipBundlePlugin` option.
5858

5959
## importing the project into the IDE
6060

6161
When the project is first created, it will not have the generated message classes and compile errors will occur! Best is to compile once on the command line before importing the project into the IDE.
6262

63-
If the IDE reports some errors after the compilation with `mvn clean package`, try to use `mvn clean install`, like:
63+
If the IDE reports some errors after the compilation with `mvnw clean package`, try to use `mvnw clean install`, like:
6464
```
65-
$ mvn clean install -Dmaven.javadoc.skip=true -DskipTests -PskipBundlePlugin,minimal-fix-latest -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500
65+
$ mvnw clean install -Dmaven.javadoc.skip=true -DskipTests -PskipBundlePlugin,minimal-fix-latest
6666
```
6767

6868
## configuration options

0 commit comments

Comments
 (0)