Merge origin/master and resolve conflicts on release notes

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,44 @@
+# Proposed Enhancement to the Common Domain Model #
+
+> [!NOTE]
+> All _Notes_, _Tips_ and other alerts can be deleted from this page once you are happy with its content.
+
+## Pull Request Summary ##
+
+_Please enter a brief summary of the changes here_
+
+> [!TIP]
+> Keep the summary brief, this does not have to be the full release notes. Any additional
+> description of the contents of the Pull Request can be provided in the _Supporting Documentation_ 
+> section that follows.
+
+## Content ##
+**This Pull Request contains (tick each list item once completed):**
+
+- [ ] A link to an Issue describing the work, background and any associated documentation
+- [ ] Been reviewed by one of the following Working Groups:
+  - [ ] Contribution Review Working Group (CRWG)
+  - [ ] Steering Working Group (SWG)
+  - [ ] Technology Architecture Working Group (TAWG)
+  - [ ] A CDM Domain Working Group maintained by FINOS
+  - [ ] An External Industry Association CDM Working Group e.g. run by ISLA, ISDA, ICMA
+- [ ] Been assessed for compliance with CDM Design Principles (where applicable)
+- [ ] A Release Note that describes the changes, which contains:
+  - [ ] A section explaining the business or technical reasoning for the change
+  - [ ] A section detailing the changes themselves
+  - [ ] A section on any changes that break backwards compatibility
+  - [ ] A link to this Pull Request as a cross reference
+
+> [!IMPORTANT]
+> Where a list item has not been ticked please provide a brief description of why here.
+> The more evidence that you can provide of analysis and review by CDM maintainers and 
+> subject matter experts the better.
+
+## Supporting Documentation ##
+
+_Add any additional details that support the changes here_
+
+> [!TIP]
+> This section is optional, and only needs to be populated if there are additional notes that
+> you feel would help the reviewers of the Pull Request to better understand the scope and
+> functionality of the changes.

.github/workflows/cve-scanning.yml

@@ -3,6 +3,8 @@ name: CVE Scanning for Maven
 on:
   workflow_dispatch:
   push:
+    branches:
+      - master
     paths:
       - 'pom.xml'
       - 'allow-list.xml'
@@ -14,7 +16,7 @@ on:
       - '.github/workflows/cve-scanning.yml'
 
 jobs:
-  build:
+  depcheck:
 
     runs-on: ubuntu-latest
 
@@ -29,4 +31,19 @@ jobs:
     - name: Build with Maven
       run: mvn clean install -DskipTests
     - name: CVE scanning
-      run: mvn org.owasp:dependency-check-maven:check -DfailBuildOnCVSS=7 -DsuppressionFile="allow-list.xml"
+      uses: dependency-check/[email protected]
+      env:
+        JAVA_HOME: /opt/jdk
+      with:
+        project: 'Common Domain Model'
+        path: '.'
+        format: 'HTML'
+        out: 'reports'
+        args: >
+          --suppression allow-list.xml
+          --failOnCVSS 7
+    - name: Upload results
+      uses: actions/upload-artifact@v3
+      with:
+        name: CVE Scan Report
+        path: ${{github.workspace}}/reports

.gitignore

@@ -58,4 +58,7 @@ venv/
 # Docusaurus website
 website/.docusaurus
 website/build
-website/node_modules
+website/node_modules
+
+# CVE scan reports
+/reports/

README.md

@@ -55,6 +55,9 @@ Changes to the CDM may be proposed by CDM Working Groups, individual corporate c
 
 **2.2.1 CDM Steering Working Group Purpose:** The Steering Working Group is responsible for developing the technical and modelling guidelines, setting and revising the project’s strategic roadmap, and for vetting proposed changes. The CDM Steering Working Group may approve or establish additional working groups.
 
+The first Steering Group of each calendar year will include a review of existing governance measures and wording on the agenda for re-ratification.
+
+
 **2.2.2 Appointment of CDM Maintainers:**
 
 * Maintainers can be of one of two types: Organisational Representative (OrgRep) or Private individual. Private individuals are maintainers in their own right, acting on their own volition and not representing another legal entity. OrgReps are appointed by their organisation, acting on behalf and for that organisation. In this case it is the organisation which will be subject to any vote on maintainer membership. Organisations are recommended to appoint at least two representatives for coverage purposes. Those representatives can be changed at any time, without any voting process by other maintainers or community Participants, by the organisation in order to cater for staff changes. 
@@ -66,6 +69,12 @@ A list of Maintainers along with their type will be kept visible within the gove
 
 *Private individuals and Organisations may choose to rescind their maintainership at will but must notify the other maintainers. OrgReps may be replaced by their organisations at any time. Any entity who has chosen to rescind their maintainership, but then at a later time would like to re-join the maintainer team, is subject to the voting process outlined above. Additionally any OrgRep who has been replaced by their organisation, but wishes to remain a maintainer as a Private Individual will also need to go through the voting process
 
+Maintaining entities or representatives can have their maintainer status revoked by unanimous vote of other maintainers. This measure is expected to be used only in extreme circumstances such as in the event of a maintainer being inactive for a significant period of time, or being found to no longer meet the requirements of being a maintainer set out above. This is not intended to be an exhaustive list of circumstances.
+
+Proposals for an entity to be given maintainership status or to have maintainership rescinded should be made at a Steering Group, with final approval or rejection at the following Steering Group to ensure fair notice for all. Proposals should be sent to the Steering Group chair to add to the agenda.
+
+
+
 **2.2.3 CDM Steering Working Group Decision Making:** As outlined in [governance.md](https://github.com/finos/standards-project-blueprint/blob/master/governance-documents/5._Governance.md#2decision-making), The CDM Steering Working Group will operate by consensus-based decision-making. Maintainers are responsible for determining and documenting when consensus has been reached. In the event a clear consensus is not reached, Maintainers may call for a simple majority vote of Participants to determine outcomes.
 
 **2.2.4 CDM Steering Working Group Appointment of the Editor(s):** Editors will review and implement pull requests not expressed in code, test and release new functionalities, resolve bugs and implement approved improvements. 

docs/event-model.md

@@ -841,8 +841,10 @@ enum EventIntentEnum:
    OptionExercise
    OptionalExtension
    OptionalCancellation
+   PortfolioRebalancing
    PrincipalExchange
    Reallocation
+   Repurchase
 ```
 
 ## Lineage

pom.xml

@@ -82,9 +82,9 @@
 
         <repoServerHost>oss.sonatype.org</repoServerHost>
 
-        <rosetta.bundle.version>9.0.0</rosetta.bundle.version>
+        <rosetta.bundle.version>9.2.0</rosetta.bundle.version>
         <rosetta.code-gen.version>${rosetta.bundle.version}</rosetta.code-gen.version>
-        <rosetta.dsl.version>9.0.0</rosetta.dsl.version>
+        <rosetta.dsl.version>9.1.0</rosetta.dsl.version>
 
         <xtext.version>2.27.0</xtext.version>
         <opengamma.strata.version>1.7.0</opengamma.strata.version>

rosetta-source/src/main/resources/schemas/fpml-5-13/confirmation/fpml-asset-5-13.xsd

@@ -4,7 +4,7 @@
 == Financial Products Markup Language is subject to the FpML public license. 
 == A copy of this license is available at http://www.fpml.org/license/license.html
 -->
-<xsd:schema xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns="http://www.fpml.org/FpML-5/confirmation" xmlns:fpml-annotation="http://www.fpml.org/annotation" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.fpml.org/FpML-5/confirmation" ecore:documentRoot="FpML" ecore:nsPrefix="conf" ecore:package="org.fpml.confirmation" version="$Revision: 14153 $" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xsd:schema xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns="http://www.fpml.org/FpML-5/confirmation" xmlns:fpml-annotation="http://www.fpml.org/annotation" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.fpml.org/FpML-5/confirmation" ecore:documentRoot="FpML" ecore:nsPrefix="conf" ecore:package="org.fpml.confirmation" version="$Revision: 14811 $" elementFormDefault="qualified" attributeFormDefault="unqualified">
   <xsd:include schemaLocation="fpml-shared-5-13.xsd" />
   <xsd:complexType name="ActualPrice">
     <xsd:sequence>
@@ -310,6 +310,28 @@
       </xsd:extension>
     </xsd:simpleContent>
   </xsd:complexType>
+  <xsd:complexType name="CommodityClassification">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A type containing all commodity classification codes belonging to a specific commodity classification system.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="code" type="CommodityClassificationLayer" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Specifies a commodity classification code. The layer and classification system the code belongs to are specified in the coding scheme's URI.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CommodityClassificationLayer">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A type used to identify commodities. It can be used with several schemes in order to specify different classification layers or different classification systems or jurisdictions.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="Scheme">
+        <xsd:attribute name="commodityClassificationScheme" type="NonEmptyURI" />
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
   <xsd:complexType name="CommodityDetails">
     <xsd:simpleContent>
       <xsd:extension base="Scheme">
@@ -1504,16 +1526,25 @@
       <xsd:documentation xml:lang="en">A group used to specify the commodity underlyer in the event that no ISDA Commofity Reference Price exists.</xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
-      <xsd:element name="commodityBase" type="CommodityBase">
-        <xsd:annotation>
-          <xsd:documentation xml:lang="en">A coding scheme value to identify the base type of the commodity being traded. Where possible, this should follow the naming convention used in the 2005 ISDA Commodity Definitions. For example, 'Oil'.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="commodityDetails" type="CommodityDetails">
-        <xsd:annotation>
-          <xsd:documentation xml:lang="en">A coding scheme value to identify the commodity being traded more specifically. Where possible, this should follow the naming convention used in the 2005 ISDA Commodity Definitions. For example, 'Brent'.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
+      <xsd:choice>
+        <xsd:sequence>
+          <xsd:element name="commodityBase" type="CommodityBase">
+            <xsd:annotation>
+              <xsd:documentation xml:lang="en">A coding scheme value to identify the base type of the commodity being traded. Where possible, this should follow the naming convention used in the 2005 ISDA Commodity Definitions. For example, 'Oil'.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="commodityDetails" type="CommodityDetails">
+            <xsd:annotation>
+              <xsd:documentation xml:lang="en">A coding scheme value to identify the commodity being traded more specifically. Where possible, this should follow the naming convention used in the 2005 ISDA Commodity Definitions. For example, 'Brent'.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:sequence>
+        <xsd:element name="commodityClassification" type="CommodityClassification" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">Specifies the classification of a commodity in the context of an n-layer classification system such as 2005 ISDA Commodity Definitions Sub Annex A or that in Table 4 of the Annex of the Comission Implementing Regulation (EU)laying down implementing technical standards for the application of Regulation (EU) No 648/2012 of the European Parliament and of the Council with regard to the standards, formats, frequency and methods and arrangements for reporting for EMIR Refit.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+      </xsd:choice>
       <xsd:element name="unit" type="QuantityUnit">
         <xsd:annotation>
           <xsd:documentation xml:lang="en">A coding scheme value to identify the unit of measure (e.g. Therms) in which the undelryer is denominated. Where possible, this should follow the naming convention used in the 2005 ISDA Commodity Definitions.</xsd:documentation>