Skip to content

Commit 2eee644

Browse files
chrjohnchrjohn
authored
Merge branch 'master' into copilot/ensure-message-code-generator-consistency
2 parents 933aff4 + c61418d commit 2eee644

48 files changed

Lines changed: 471 additions & 13562 deletions

File tree

Some content is hidden

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

‎.devcontainer/devcontainer.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎.github/dependabot.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33

44
version: 2
55
updates:
6-
- package-ecosystem: "maven" # See documentation for possible values
7-
directory: "/" # Location of package manifests
6+
- package-ecosystem: "maven"
7+
directory: "/"
88
schedule:
99
interval: "daily"
1010
open-pull-requests-limit: 10
1111
- package-ecosystem: "github-actions"
1212
directory: "/"
1313
schedule:
14-
# Check for updates to GitHub Actions every weekday
1514
interval: "daily"
1615
open-pull-requests-limit: 10

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
names: |
3535
org.quickfixj.quickfixj-all
3636
org.quickfixj.quickfixj-base
37-
org.quickfixj.quickfixj-class-pruner-maven-plugin
3837
org.quickfixj.quickfixj-codegenerator
3938
org.quickfixj.quickfixj-core
4039
org.quickfixj.quickfixj-dictgenerator

‎.junie/guidelines.md‎

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
wrapperVersion=3.3.4
22
distributionType=only-script
3-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip

‎AGENTS.md‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# AGENTS.md
2+
3+
This file provides guidance for automated contributors/agents working in the `quickfix-j/quickfixj` repository.
4+
5+
## 1) Scope
6+
7+
- Keep changes minimal and surgical.
8+
- Avoid unrelated refactors or broad formatting-only edits.
9+
- Prefer module-focused changes and include only files needed for the task.
10+
11+
## 2) Environment
12+
13+
- Use the repository Maven wrapper: `./mvnw` (or `./mvnw.cmd` on Windows), not system Maven.
14+
- Java compatibility target is Java 8 (`maven.compiler.source=8`, `maven.compiler.target=8`).
15+
- CI validates multiple Java versions and OSes (JDK 8/11/21 on Linux, macOS, and Windows).
16+
17+
## 3) Build instructions (fast/default/full)
18+
19+
- Fast local package (no tests):
20+
- `./mvnw clean package -Dmaven.javadoc.skip=true -DskipTests -PskipBundlePlugin,minimal-fix-latest`
21+
- CI-equivalent validation baseline:
22+
- `./mvnw install -Dmaven.javadoc.skip=true -PskipBundlePlugin,minimal-fix-latest`
23+
- If OSGi bundle artifacts are required, omit `-PskipBundlePlugin`.
24+
25+
## 4) Module dependency order for targeted `quickfixj-core` work
26+
27+
From a clean checkout, for targeted `quickfixj-core` tests/builds:
28+
29+
1. Build orchestration/resources first (`quickfixj-orchestration`).
30+
2. Build required message artifacts, at least:
31+
- `quickfixj-messages-fixt11`
32+
- `quickfixj-messages-all`
33+
- `quickfixj-messages-fixlatest`
34+
3. Build/test `quickfixj-core` (typically with `-am` when selecting modules).
35+
36+
This avoids missing generated resources/classes during targeted core runs.
37+
38+
## 5) Testing expectations
39+
40+
- Run module-local tests first for the area you changed.
41+
- Run broader reactor checks when changes cross module boundaries or affect shared build/generation logic.
42+
- For bug fixes/features, add or adjust tests where applicable.
43+
44+
## 6) Code style
45+
46+
- Follow surrounding code style and import ordering in edited files.
47+
- Java formatting reference profile:
48+
- `quickfixj-core/src/main/eclipse/formatter.xml`
49+
- The formatter profile uses 4-space indentation, K&R-style braces, and does not auto-reformat comments.
50+
51+
## 7) Safety and contribution rules
52+
53+
- Never commit secrets, credentials, or private keys.
54+
- Avoid changing generated/build-heavy modules unless required by the task.
55+
- Keep PRs focused and explain why non-default build profiles/options were used.

‎pom.xml‎

Lines changed: 15 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>org.quickfixj</groupId>
55
<artifactId>quickfixj-parent</artifactId>
6-
<version>3.0.1-SNAPSHOT</version>
6+
<version>3.0.2-SNAPSHOT</version>
77
<packaging>pom</packaging>
88

99
<name>QuickFIX/J Parent</name>
@@ -47,7 +47,6 @@
4747
<modules>
4848
<module>quickfixj-codegenerator</module>
4949
<module>quickfixj-dictgenerator</module>
50-
<module>quickfixj-class-pruner-maven-plugin</module>
5150
<module>quickfixj-orchestration</module>
5251
<module>quickfixj-base</module>
5352
<module>quickfixj-messages</module>
@@ -63,16 +62,15 @@
6362
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6463
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6564
<jdkLevel>1.8</jdkLevel>
66-
<slf4j.version>2.0.17</slf4j.version>
65+
<slf4j.version>2.0.18</slf4j.version>
6766
<mockito-core.version>4.11.0</mockito-core.version>
6867
<hamcrest.version>3.0</hamcrest.version>
6968
<junit.jupiter.version>5.14.4</junit.jupiter.version>
7069
<maven.compiler.source>8</maven.compiler.source>
7170
<maven.compiler.target>8</maven.compiler.target>
7271
<mainClass />
7372
<maven.version>3.9.12</maven.version>
74-
<maven-libs-version>${maven.version}</maven-libs-version>
75-
<maven-plugin-api-version>3.9.15</maven-plugin-api-version>
73+
<maven-plugin-api-version>3.9.16</maven-plugin-api-version>
7674
<maven-resources-plugin-version>3.5.0</maven-resources-plugin-version>
7775
<maven-compiler-plugin-version>3.15.0</maven-compiler-plugin-version>
7876
<maven-jar-plugin-version>3.5.0</maven-jar-plugin-version>
@@ -87,25 +85,24 @@
8785
<maven-deploy-plugin-version>3.1.4</maven-deploy-plugin-version>
8886
<nexus-staging-maven-plugin-version>1.7.0</nexus-staging-maven-plugin-version>
8987
<build-helper-maven-plugin-version>3.6.1</build-helper-maven-plugin-version>
90-
<maven-shared-utils.version>3.4.2</maven-shared-utils.version>
91-
<file-management.version>3.2.0</file-management.version>
9288
<maven-plugin-annotations.version>3.15.2</maven-plugin-annotations.version>
93-
<maven-plugin-testing-harness.version>3.5.1</maven-plugin-testing-harness.version>
9489
<plantuml-maven-plugin-version>1.2</plantuml-maven-plugin-version>
9590
<plantuml-version>8059</plantuml-version>
9691
<xml-maven-plugin-version>1.2.1</xml-maven-plugin-version>
9792
<fix-orchestra.standard.version>1.5.4</fix-orchestra.standard.version>
9893
<fix-orchestra.repository.version>1.7.3</fix-orchestra.repository.version>
9994
<docgen.version>1.6.8</docgen.version>
10095
<jaxb.version>4.0.5</jaxb.version>
101-
<apache.mina.version>2.2.4</apache.mina.version>
96+
<apache.mina.version>2.2.7</apache.mina.version>
10297
<commons.io.version>2.22.0</commons.io.version>
10398
<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
10499
<org.quickfixj.orchestra.tools.version>1.0.3</org.quickfixj.orchestra.tools.version>
105-
<jaxen.version>2.0.1</jaxen.version>
106-
<jmh.version>1.37</jmh.version>
107-
<jcstress.version>0.16</jcstress.version>
108-
<hsqldb.version>1.8.0.10</hsqldb.version>
100+
<jaxen.version>2.0.3</jaxen.version>
101+
<jmh.version>1.37</jmh.version>
102+
<jcstress.version>0.16</jcstress.version>
103+
<hsqldb.version>1.8.0.10</hsqldb.version>
104+
<netty.version>4.2.13.Final</netty.version>
105+
<class-pruner-plugin.version>3.0.1</class-pruner-plugin.version>
109106
</properties>
110107

111108
<dependencyManagement>
@@ -176,58 +173,17 @@
176173
<artifactId>maven-plugin-api</artifactId>
177174
<version>${maven-plugin-api-version}</version>
178175
</dependency>
179-
<dependency>
180-
<groupId>org.apache.maven.shared</groupId>
181-
<artifactId>maven-shared-utils</artifactId>
182-
<version>${maven-shared-utils.version}</version>
183-
</dependency>
184-
<dependency>
185-
<groupId>org.apache.maven.shared</groupId>
186-
<artifactId>file-management</artifactId>
187-
<version>${file-management.version}</version>
188-
</dependency>
189-
<dependency>
190-
<groupId>org.apache.maven</groupId>
191-
<artifactId>maven-core</artifactId>
192-
<version>${maven-libs-version}</version>
193-
</dependency>
194-
<dependency>
195-
<groupId>org.apache.maven</groupId>
196-
<artifactId>maven-artifact</artifactId>
197-
<version>${maven-libs-version}</version>
198-
<scope>provided</scope>
199-
</dependency>
200-
<dependency>
201-
<groupId>org.apache.maven</groupId>
202-
<artifactId>maven-compat</artifactId>
203-
<version>${maven-libs-version}</version>
204-
</dependency>
205176
<dependency>
206177
<groupId>org.apache.maven.plugin-tools</groupId>
207178
<artifactId>maven-plugin-annotations</artifactId>
208179
<version>${maven-plugin-annotations.version}</version>
209180
</dependency>
210-
<dependency>
211-
<groupId>org.apache.maven.plugin-testing</groupId>
212-
<artifactId>maven-plugin-testing-harness</artifactId>
213-
<version>${maven-plugin-testing-harness.version}</version>
214-
</dependency>
215181
<dependency>
216182
<groupId>org.apache.maven</groupId>
217183
<artifactId>maven-project</artifactId>
218184
<scope>provided</scope>
219185
<version>2.2.1</version>
220186
</dependency>
221-
<dependency>
222-
<groupId>org.codehaus.plexus</groupId>
223-
<artifactId>plexus-utils</artifactId>
224-
<version>4.0.3</version>
225-
</dependency>
226-
<dependency>
227-
<groupId>org.codehaus.plexus</groupId>
228-
<artifactId>plexus-xml</artifactId>
229-
<version>4.0.4</version>
230-
</dependency>
231187
<dependency>
232188
<groupId>com.sleepycat</groupId>
233189
<artifactId>je</artifactId>
@@ -422,10 +378,6 @@
422378
</dependency>
423379
</dependencies>
424380
</plugin>
425-
<plugin>
426-
<artifactId>maven-invoker-plugin</artifactId>
427-
<version>3.10.0</version>
428-
</plugin>
429381
<plugin>
430382
<artifactId>maven-plugin-plugin</artifactId>
431383
<version>3.15.2</version>
@@ -448,6 +400,11 @@
448400
<artifactId>quickfixj-from-fix-orchestra-dictionary-generator-maven-plugin</artifactId>
449401
<version>${org.quickfixj.orchestra.tools.version}</version>
450402
</plugin>
403+
<plugin>
404+
<groupId>org.quickfixj</groupId>
405+
<artifactId>quickfixj-class-pruner-maven-plugin</artifactId>
406+
<version>${class-pruner-plugin.version}</version>
407+
</plugin>
451408
<plugin>
452409
<groupId>org.apache.maven.plugins</groupId>
453410
<artifactId>maven-enforcer-plugin</artifactId>

‎quickfixj-all/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.quickfixj</groupId>
66
<artifactId>quickfixj-parent</artifactId>
7-
<version>3.0.1-SNAPSHOT</version>
7+
<version>3.0.2-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>quickfixj-all</artifactId>

‎quickfixj-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.quickfixj</groupId>
55
<artifactId>quickfixj-parent</artifactId>
6-
<version>3.0.1-SNAPSHOT</version>
6+
<version>3.0.2-SNAPSHOT</version>
77
</parent>
88

99
<artifactId>quickfixj-base</artifactId>

0 commit comments

Comments
 (0)