Skip to content

Commit 786148e

Browse files
chrjohnchrjohn
authored
Merge branch 'master' into philipwhiuk-github-dds
2 parents 71781a9 + 5d4773e commit 786148e

File tree

9 files changed

+55
-40
lines changed

9 files changed

+55
-40
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 1 deletion
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

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
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

‎pom.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,43 +68,43 @@
6868
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6969
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7070
<jdkLevel>1.8</jdkLevel>
71-
<slf4j.version>2.0.12</slf4j.version>
71+
<slf4j.version>2.0.13</slf4j.version>
7272
<mockito-core.version>4.11.0</mockito-core.version>
7373
<hamcrest.version>2.2</hamcrest.version>
7474
<junit.jupiter.version>5.10.2</junit.jupiter.version>
7575
<maven.compiler.source>8</maven.compiler.source>
7676
<maven.compiler.target>8</maven.compiler.target>
7777
<mainClass/>
78-
<maven.version>3.8.7</maven.version>
79-
<maven-libs-version>3.9.6</maven-libs-version>
80-
<maven-plugin-api-version>3.9.6</maven-plugin-api-version>
78+
<maven.version>3.9.8</maven.version> <!-- please also change version in .mvn/wrapper/maven-wrapper.properties -->
79+
<maven-libs-version>${maven.version}</maven-libs-version>
80+
<maven-plugin-api-version>${maven.version}</maven-plugin-api-version>
8181
<maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
82-
<maven-compiler-plugin-version>3.12.1</maven-compiler-plugin-version>
83-
<maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
84-
<maven-surefire-plugin-version>3.2.5</maven-surefire-plugin-version>
85-
<maven-pmd-plugin-version>3.21.2</maven-pmd-plugin-version>
86-
<maven-source-plugin-version>3.3.0</maven-source-plugin-version>
87-
<maven-javadoc-plugin-version>3.6.3</maven-javadoc-plugin-version>
88-
<maven-shade-plugin-version>3.5.1</maven-shade-plugin-version>
89-
<maven-assembly-plugin-version>3.6.0</maven-assembly-plugin-version>
82+
<maven-compiler-plugin-version>3.13.0</maven-compiler-plugin-version>
83+
<maven-jar-plugin-version>3.4.2</maven-jar-plugin-version>
84+
<maven-surefire-plugin-version>3.3.0</maven-surefire-plugin-version>
85+
<maven-pmd-plugin-version>3.23.0</maven-pmd-plugin-version>
86+
<maven-source-plugin-version>3.3.1</maven-source-plugin-version>
87+
<maven-javadoc-plugin-version>3.7.0</maven-javadoc-plugin-version>
88+
<maven-shade-plugin-version>3.6.0</maven-shade-plugin-version>
89+
<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
9090
<maven-bundle-plugin-version>5.1.9</maven-bundle-plugin-version>
91-
<maven-gpg-plugin-version>3.1.0</maven-gpg-plugin-version>
92-
<maven-deploy-plugin-version>3.1.1</maven-deploy-plugin-version>
93-
<nexus-staging-maven-plugin-version>1.6.13</nexus-staging-maven-plugin-version>
94-
<build-helper-maven-plugin-version>3.5.0</build-helper-maven-plugin-version>
91+
<maven-gpg-plugin-version>3.2.4</maven-gpg-plugin-version>
92+
<maven-deploy-plugin-version>3.1.2</maven-deploy-plugin-version>
93+
<nexus-staging-maven-plugin-version>1.7.0</nexus-staging-maven-plugin-version>
94+
<build-helper-maven-plugin-version>3.6.0</build-helper-maven-plugin-version>
9595
<maven-shared-utils.version>3.4.2</maven-shared-utils.version>
9696
<file-management.version>3.0.0</file-management.version>
97-
<maven-plugin-annotations.version>3.11.0</maven-plugin-annotations.version>
97+
<maven-plugin-annotations.version>3.13.1</maven-plugin-annotations.version>
9898
<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
9999
<plantuml-maven-plugin-version>1.2</plantuml-maven-plugin-version>
100100
<plantuml-version>8059</plantuml-version>
101101
<xml-maven-plugin-version>1.1.0</xml-maven-plugin-version>
102102
<fix-orchestra.standard.version>1.5.4</fix-orchestra.standard.version>
103103
<fix-orchestra.repository.version>1.7.3</fix-orchestra.repository.version>
104104
<docgen.version>1.6.8</docgen.version>
105-
<jaxb.version>4.0.1</jaxb.version>
105+
<jaxb.version>4.0.2</jaxb.version>
106106
<apache.mina.version>2.2.3</apache.mina.version>
107-
<commons.io.version>2.15.1</commons.io.version>
107+
<commons.io.version>2.16.1</commons.io.version>
108108
<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
109109
<org.quickfixj.orchestra.tools.version>1.0.2</org.quickfixj.orchestra.tools.version>
110110
<proxool.version>0.9.1</proxool.version>
@@ -224,12 +224,12 @@
224224
<dependency>
225225
<groupId>org.codehaus.plexus</groupId>
226226
<artifactId>plexus-utils</artifactId>
227-
<version>4.0.0</version>
227+
<version>4.0.1</version>
228228
</dependency>
229229
<dependency>
230230
<groupId>org.codehaus.plexus</groupId>
231231
<artifactId>plexus-xml</artifactId>
232-
<version>4.0.3</version>
232+
<version>4.0.4</version>
233233
</dependency>
234234
<dependency>
235235
<groupId>com.sleepycat</groupId>
@@ -463,19 +463,19 @@
463463
</plugin>
464464
<plugin>
465465
<artifactId>maven-invoker-plugin</artifactId>
466-
<version>3.6.0</version>
466+
<version>3.7.0</version>
467467
</plugin>
468468
<plugin>
469469
<artifactId>maven-plugin-plugin</artifactId>
470-
<version>3.11.0</version>
470+
<version>3.13.1</version>
471471
</plugin>
472472
<plugin>
473473
<artifactId>maven-install-plugin</artifactId>
474-
<version>3.1.1</version>
474+
<version>3.1.2</version>
475475
</plugin>
476476
<plugin>
477477
<artifactId>maven-clean-plugin</artifactId>
478-
<version>3.3.2</version>
478+
<version>3.4.0</version>
479479
</plugin>
480480
<plugin>
481481
<groupId>org.quickfixj.orchestra</groupId>
@@ -490,7 +490,7 @@
490490
<plugin>
491491
<groupId>org.apache.maven.plugins</groupId>
492492
<artifactId>maven-enforcer-plugin</artifactId>
493-
<version>3.4.1</version>
493+
<version>3.5.0</version>
494494
</plugin>
495495
</plugins>
496496
</pluginManagement>

‎quickfixj-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
</plugin>
230230
<plugin>
231231
<artifactId>maven-jxr-plugin</artifactId>
232-
<version>3.3.2</version>
232+
<version>3.4.0</version>
233233
</plugin>
234234
</plugins>
235235
</reporting>

‎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.11.0</version>
81+
<version>3.13.1</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
@@ -234,7 +234,7 @@
234234
<plugin>
235235
<groupId>org.apache.maven.plugins</groupId>
236236
<artifactId>maven-jxr-plugin</artifactId>
237-
<version>3.3.2</version>
237+
<version>3.4.0</version>
238238
</plugin>
239239
</plugins>
240240
</reporting>

‎quickfixj-core/src/main/java/quickfix/Session.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2168,7 +2168,7 @@ private void nextLogon(Message logon) throws FieldNotFound, RejectLogon, Incorre
21682168
throw new RejectLogon("Logon attempt not within session time");
21692169
}
21702170

2171-
if (sessionID.isFIXT()) {
2171+
if (sessionID.isFIXT() && dataDictionaryProvider != null) {
21722172
final DataDictionary dictionary = dataDictionaryProvider
21732173
.getSessionDataDictionary(sessionID.getBeginString());
21742174
if (dictionary != null) {

‎quickfixj-core/src/main/java/quickfix/SessionSettings.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -887,12 +887,13 @@ public void removeSection(final SessionID sessionID) throws ConfigError {
887887
}
888888

889889
public void removeSection(final String propertyKey, final String propertyValue) throws ConfigError {
890-
SessionID sessionIdToRemove = sections.entrySet().stream()
890+
List<SessionID> sessionIDs = sections.entrySet().stream()
891891
.filter(entry -> propertyValue.equals(entry.getValue().get(propertyKey)))
892892
.map(Map.Entry::getKey)
893-
.findFirst()
894-
.orElseThrow(() -> new ConfigError("Session not found"));
893+
.collect(Collectors.toList());
895894

896-
sections.remove(sessionIdToRemove);
895+
for (SessionID sessionID : sessionIDs) {
896+
this.removeSection(sessionID);
897+
}
897898
}
898899
}

‎quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/Banzai.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public Banzai(String[] args) throws Exception {
7171

7272
boolean logHeartbeats = Boolean.valueOf(System.getProperty("logHeartbeats", "true"));
7373

74-
OrderTableModel orderTableModel = new OrderTableModel();
75-
ExecutionTableModel executionTableModel = new ExecutionTableModel();
76-
BanzaiApplication application = new BanzaiApplication(orderTableModel, executionTableModel);
74+
OrderTableModel orderTableModel = orderTableModel();
75+
ExecutionTableModel executionTableModel = executionTableModel();
76+
BanzaiApplication application = application(orderTableModel, executionTableModel);
7777
MessageStoreFactory messageStoreFactory = new FileStoreFactory(settings);
7878
LogFactory logFactory = new ScreenLogFactory(true, true, true, logHeartbeats);
7979
MessageFactory messageFactory = new DefaultMessageFactory();
@@ -88,6 +88,18 @@ public Banzai(String[] args) throws Exception {
8888
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
8989
}
9090

91+
protected OrderTableModel orderTableModel() {
92+
return new OrderTableModel();
93+
}
94+
95+
protected ExecutionTableModel executionTableModel() {
96+
return new ExecutionTableModel();
97+
}
98+
99+
protected BanzaiApplication application(OrderTableModel orderTableModel, ExecutionTableModel executionTableModel) {
100+
return new BanzaiApplication(orderTableModel, executionTableModel);
101+
}
102+
91103
public synchronized void logon() {
92104
if (!initiatorStarted) {
93105
try {

0 commit comments

Comments
 (0)