Merge branch 'master' into jetbrains-junie/issue-377-run-d536a12f-5871-4d75-b834-3eed50e73b57

Author: chrjohn

.devcontainer/devcontainer.json

@@ -1,12 +1,15 @@
 {
-  "name": "Java",
-  "image": "mcr.microsoft.com/devcontainers/java:1-21",
-  "features": {
-    "ghcr.io/devcontainers/features/java:1": {
-      "version": "none",
-      "installMaven": "true",
-      "mavenVersion": "3.9.9",
-      "installGradle": "false"
-    }
-  }
+    "name": "Java",
+    "image": "mcr.microsoft.com/devcontainers/base:debian",
+    "features": {
+        // Install java.
+        // See https://github.com/devcontainers/features/tree/main/src/java#options for details.
+        "ghcr.io/devcontainers/features/java:1": {
+            "version": "8",
+            "installGradle": false,
+            "jdkDistro": "tem"
+        }
+    },
+
+    "onCreateCommand": "./mvnw install -B -V -Dmaven.javadoc.skip=true -DskipTests -Dmaven.compiler.failOnError=false -PskipBundlePlugin,minimal-fix-latest"    
 }

.github/workflows/codeql-analysis.yml

@@ -19,8 +19,6 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master ]
-  schedule:
-    - cron: '39 6 * * 0'
 
 jobs:
   analyze:
@@ -37,11 +35,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,4 +63,4 @@ jobs:
         ./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"
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/maven.yml

@@ -5,26 +5,24 @@ on:
   push:
   pull_request:
     types: [reopened, opened, synchronize]
-  schedule:
-    - cron:  '30 5 * * *'
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-13]
+        os: [ubuntu-latest, macOS-14]
         java: [8, 11, 21]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
+          distribution: 'corretto'
           java-version: ${{ matrix.java }}
           cache: 'maven'
       - name: Test with Maven
@@ -41,17 +39,17 @@ jobs:
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Configure pagefile
-        uses: al-cheb/configure-pagefile-action@v1.4
+        uses: al-cheb/configure-pagefile-action@v1.5
         with:
           minimum-size: 8GB
           maximum-size: 16GB
           disk-root: "C:"
       - name: Set up Windows JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
+          distribution: 'corretto'
           java-version: ${{ matrix.java }}
           cache: 'maven'
       - name: Test with Maven on Windows

.github/workflows/nightly-build.yml

@@ -5,26 +5,24 @@ permissions:
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - master
   schedule:
     - cron: '0 1 * * *'
 
 jobs:
   release-snapshot:
+    if: github.repository == 'quickfix-j/quickfixj'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
           cache: maven
 
       - name: Build SNAPSHOT
-        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"
+        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"
 
       - name: Delete old packages
         continue-on-error: true
@@ -40,7 +38,6 @@ jobs:
             org.quickfixj.quickfixj-codegenerator
             org.quickfixj.quickfixj-core
             org.quickfixj.quickfixj-dictgenerator
-            org.quickfixj.quickfixj-distribution
             org.quickfixj.quickfixj-examples
             org.quickfixj.quickfixj-examples-banzai
             org.quickfixj.quickfixj-examples-executor
@@ -60,8 +57,9 @@ jobs:
             org.quickfixj.quickfixj-orchestration
             org.quickfixj.quickfixj-parent
             org.quickfixj.quickfixj-perf-test
+            org.quickfixj.quickfixj-stress-test
 
       - name: Deploy SNAPSHOT
-        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"
+        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"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.junie/guidelines.md

@@ -0,0 +1,92 @@
+# QuickFIX/J Project Guidelines
+
+## Project Overview
+
+QuickFIX/J is a full-featured messaging engine for the FIX protocol. It is a 100% Java open source implementation of the popular QuickFIX engine. This document provides guidelines for contributing to and working with the QuickFIX/J project.
+
+## Development Environment
+
+### Prerequisites
+
+- Java JDK 8 or higher
+- Maven 3.6.x or higher
+- Git
+
+### Setting Up Development Environment
+
+1. Clone the repository:
+   ```
+   git clone https://github.com/quickfix-j/quickfixj.git
+   cd quickfixj
+   ```
+
+2. Build the project:
+   Junie, please make sure to only use JDK 8 for the build and use the following Java options:
+   ```
+   ./mvnw package -Dmaven.javadoc.skip=true -PskipBundlePlugin,minimal-fix-latest -Xms3g -Xmx6g -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500
+   ```
+
+## Coding Standards
+
+### Java Code Style
+
+- Follow standard Java naming conventions
+- Use 4 spaces for indentation (no tabs)
+- Maximum line length of 120 characters
+- Include JavaDoc for all public classes and methods
+- Use meaningful variable and method names
+
+### Commit Guidelines
+
+- Write clear, concise commit messages
+- Use present tense ("Add feature" not "Added feature")
+- Reference issue numbers when applicable
+- Keep commits focused on a single logical change
+
+## Pull Request Process
+
+1. Create a feature branch from the main branch
+2. Make your changes following the coding standards
+3. Add or update tests as necessary
+4. Ensure all tests pass with `./mvnw test`
+5. Submit a pull request with a clear description of the changes
+
+## Testing Guidelines
+
+- Write unit tests for all new code
+- Ensure existing tests pass before submitting changes
+- Integration tests should be included for significant features
+- Test edge cases and error conditions
+
+## Documentation
+
+- Update documentation for any changed functionality
+- Document public APIs with JavaDoc
+- Keep README and other documentation up to date
+
+## Issue Reporting
+
+When reporting issues, please include:
+
+- A clear description of the problem
+- Steps to reproduce
+- Expected vs. actual behavior
+- Version information (QuickFIX/J version, Java version, OS)
+- Any relevant logs or error messages
+
+## Release Process
+
+- Version numbers follow semantic versioning (MAJOR.MINOR.PATCH)
+- Release notes should document all significant changes
+- Releases are built and deployed using Maven
+
+## Community Guidelines
+
+- Be respectful and inclusive in all communications
+- Help others when possible
+- Follow the code of conduct
+- Give credit where it's due
+
+## License
+
+QuickFIX/J is licensed under the QuickFIX Software License, Version 1.0. All contributions must be compatible with this license.

.mvn/wrapper/maven-wrapper.properties

@@ -16,5 +16,5 @@
 # under the License.
 #
 # NOTE: maven version should also be changed in pom.xml
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

README.md

@@ -66,18 +66,21 @@ $ mvnw clean install -Dmaven.javadoc.skip=true -DskipTests -PskipBundlePlugin,mi
 ```
 
 ## configuration options
-https://rawgit.com/quickfix-j/quickfixj/master/quickfixj-core/src/main/doc/usermanual/usage/configuration.html
+
+https://quickfix-j.github.io/quickfixj/quickfixj-core/src/main/doc/usermanual/usage/configuration.html
 
 ## basics
 
-### example applications
+### related projects
 
-QuickFIX/J includes some example applications in the `quickfixj-examples` module. Moreover, here are some links to example applications:
+QuickFIX/J includes some example applications in the `quickfixj-examples` module. Additionally, here are some links to related projects:
 
 Examples by Geoffrey Gershaw: https://github.com/ggershaw/Examples
 
 Examples from QuickFIX/J Spring Boot Starter: https://github.com/esanchezros/quickfixj-spring-boot-starter-examples
 
+AssertJ assertions for QuickFIX/J: https://github.com/esanchezros/assertj-quickfixj
+
 If you would like to be added to this list, please open a PR with the changes.
 
 

pom.xml

@@ -56,7 +56,8 @@
 		<module>quickfixj-all</module>
 		<module>quickfixj-distribution</module>
 		<module>quickfixj-perf-test</module>
-	</modules>
+        <module>quickfixj-stress-test</module>
+    </modules>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,44 +66,46 @@
 		<slf4j.version>2.0.17</slf4j.version>
 		<mockito-core.version>4.11.0</mockito-core.version>
 		<hamcrest.version>3.0</hamcrest.version>
-		<junit.jupiter.version>5.13.2</junit.jupiter.version>
+		<junit.jupiter.version>5.14.2</junit.jupiter.version>
 		<maven.compiler.source>8</maven.compiler.source>
 		<maven.compiler.target>8</maven.compiler.target>
 		<mainClass/>
-		<maven.version>3.9.10</maven.version> <!-- please also change version in .mvn/wrapper/maven-wrapper.properties -->
+        <maven.version>3.9.12</maven.version> <!-- please also change version in .mvn/wrapper/maven-wrapper.properties -->
 		<maven-libs-version>${maven.version}</maven-libs-version>
 		<maven-plugin-api-version>${maven.version}</maven-plugin-api-version>
-		<maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
-		<maven-compiler-plugin-version>3.14.0</maven-compiler-plugin-version>
-		<maven-jar-plugin-version>3.4.2</maven-jar-plugin-version>
-		<maven-surefire-plugin-version>3.5.3</maven-surefire-plugin-version>
-		<maven-pmd-plugin-version>3.27.0</maven-pmd-plugin-version>
-		<maven-source-plugin-version>3.3.1</maven-source-plugin-version>
-		<maven-javadoc-plugin-version>3.11.2</maven-javadoc-plugin-version>
-		<maven-shade-plugin-version>3.6.0</maven-shade-plugin-version>
-		<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
+		<maven-resources-plugin-version>3.4.0</maven-resources-plugin-version>
+		<maven-compiler-plugin-version>3.14.1</maven-compiler-plugin-version>
+		<maven-jar-plugin-version>3.5.0</maven-jar-plugin-version>
+		<maven-surefire-plugin-version>3.5.4</maven-surefire-plugin-version>
+		<maven-pmd-plugin-version>3.28.0</maven-pmd-plugin-version>
+		<maven-source-plugin-version>3.4.0</maven-source-plugin-version>
+		<maven-javadoc-plugin-version>3.12.0</maven-javadoc-plugin-version>
+		<maven-shade-plugin-version>3.6.1</maven-shade-plugin-version>
+		<maven-assembly-plugin-version>3.8.0</maven-assembly-plugin-version>
 		<maven-bundle-plugin-version>5.1.9</maven-bundle-plugin-version>
-		<maven-gpg-plugin-version>3.2.7</maven-gpg-plugin-version>
+		<maven-gpg-plugin-version>3.2.8</maven-gpg-plugin-version>
 		<maven-deploy-plugin-version>3.1.4</maven-deploy-plugin-version>
 		<nexus-staging-maven-plugin-version>1.7.0</nexus-staging-maven-plugin-version>
 		<build-helper-maven-plugin-version>3.6.1</build-helper-maven-plugin-version>
 		<maven-shared-utils.version>3.4.2</maven-shared-utils.version>
 		<file-management.version>3.2.0</file-management.version>
-		<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
-		<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
+		<maven-plugin-annotations.version>3.15.2</maven-plugin-annotations.version>
+		<maven-plugin-testing-harness.version>3.5.0</maven-plugin-testing-harness.version>
 		<plantuml-maven-plugin-version>1.2</plantuml-maven-plugin-version>
 		<plantuml-version>8059</plantuml-version>
-		<xml-maven-plugin-version>1.1.0</xml-maven-plugin-version>
+		<xml-maven-plugin-version>1.2.1</xml-maven-plugin-version>
 		<fix-orchestra.standard.version>1.5.4</fix-orchestra.standard.version>
 		<fix-orchestra.repository.version>1.7.3</fix-orchestra.repository.version>
 		<docgen.version>1.6.8</docgen.version>
-		<jaxb.version>4.0.2</jaxb.version>
+		<jaxb.version>4.0.4</jaxb.version>
 		<apache.mina.version>2.2.4</apache.mina.version>
-		<commons.io.version>2.19.0</commons.io.version>
+		<commons.io.version>2.21.0</commons.io.version>
 		<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
-		<org.quickfixj.orchestra.tools.version>1.0.2</org.quickfixj.orchestra.tools.version>
+		<org.quickfixj.orchestra.tools.version>1.0.3</org.quickfixj.orchestra.tools.version>
 		<jaxen.version>2.0.0</jaxen.version>
-                <jmh.version>1.37</jmh.version>
+        <jmh.version>1.37</jmh.version>
+        <jcstress.version>0.16</jcstress.version>
+        <hsqldb.version>1.8.0.10</hsqldb.version>
 	</properties>
 
    <dependencyManagement>
@@ -273,7 +276,7 @@
 					<version>${maven-compiler-plugin-version}</version>
 					<inherited>true</inherited>
 					<configuration>
-						<forceJavacCompilerUse>true</forceJavacCompilerUse> <!-- https://bugs.openjdk.java.net/browse/JDK-8216202 -->
+						<forceLegacyJavacApi>true</forceLegacyJavacApi> <!-- https://bugs.openjdk.java.net/browse/JDK-8216202 -->
 						<meminitial>2g</meminitial>
 						<maxmem>4g</maxmem>
 					</configuration>
@@ -425,7 +428,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-plugin-plugin</artifactId>
-					<version>3.15.1</version>
+					<version>3.15.2</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-install-plugin</artifactId>
@@ -448,7 +451,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.6.2</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>

quickfixj-base/src/main/java/quickfix/FieldType.java

@@ -30,7 +30,7 @@ public enum FieldType {
 
     UNKNOWN,
     STRING,
-    CHAR,
+    CHAR(Character.class),
     PRICE(Double.class),
     INT(Integer.class),
     AMT(Double.class),