Merge branch 'master' into dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.4.0

Author: chrjohn

pom.xml

@@ -72,15 +72,15 @@
   <maven.version>3.9.11</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-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.7.1</maven-assembly-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.8</maven-gpg-plugin-version>
 		<maven-deploy-plugin-version>3.1.4</maven-deploy-plugin-version>

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

@@ -238,7 +238,7 @@ public void onMessage(quickfix.fix41.NewOrderSingle order, SessionID sessionID)
         Price price = getPrice(order);
 
         quickfix.fix41.ExecutionReport accept = new quickfix.fix41.ExecutionReport(genOrderID(), genExecID(),
-                new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.TRADE), new OrdStatus(OrdStatus.NEW), order
+                new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.NEW), new OrdStatus(OrdStatus.NEW), order
                         .getSymbol(), order.getSide(), orderQty, new LastShares(0), new LastPx(0), new LeavesQty(0),
                 new CumQty(0), new AvgPx(0));
 
@@ -247,7 +247,7 @@ public void onMessage(quickfix.fix41.NewOrderSingle order, SessionID sessionID)
 
         if (isOrderExecutable(order, price)) {
             quickfix.fix41.ExecutionReport executionReport = new quickfix.fix41.ExecutionReport(genOrderID(),
-                    genExecID(), new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.TRADE), new OrdStatus(
+                    genExecID(), new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.FILL), new OrdStatus(
                             OrdStatus.FILLED), order.getSymbol(), order.getSide(), orderQty, new LastShares(orderQty
                             .getValue()), new LastPx(price.getValue()), new LeavesQty(0), new CumQty(orderQty
                             .getValue()), new AvgPx(price.getValue()));
@@ -270,15 +270,15 @@ public void onMessage(quickfix.fix42.NewOrderSingle order, SessionID sessionID)
         Price price = getPrice(order);
 
         quickfix.fix42.ExecutionReport accept = new quickfix.fix42.ExecutionReport(genOrderID(), genExecID(),
-                new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.TRADE), new OrdStatus(OrdStatus.NEW), order
+                new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.NEW), new OrdStatus(OrdStatus.NEW), order
                         .getSymbol(), order.getSide(), new LeavesQty(0), new CumQty(0), new AvgPx(0));
 
         accept.set(order.getClOrdID());
         sendMessage(sessionID, accept);
 
         if (isOrderExecutable(order, price)) {
             quickfix.fix42.ExecutionReport executionReport = new quickfix.fix42.ExecutionReport(genOrderID(),
-                    genExecID(), new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.TRADE), new OrdStatus(
+                    genExecID(), new ExecTransType(ExecTransType.NEW), new ExecType(ExecType.FILL), new OrdStatus(
                             OrdStatus.FILLED), order.getSymbol(), order.getSide(), new LeavesQty(0), new CumQty(
                             orderQty.getValue()), new AvgPx(price.getValue()));