From 4f498e7af40fe9136c5ccaea7931d3be73640d9f Mon Sep 17 00:00:00 2001
From: Philip Helger <philip@helger.com>
Date: Mon, 23 Dec 2024 11:57:04 +0100
Subject: [PATCH] Moved to submodule

---
 .github/workflows/maven.yml                   |  47 +++
 .gitignore                                    |   1 +
 en16931-ubl2cii/pom.xml                       |  87 ++++
 {src => en16931-ubl2cii/src}/etc/javadoc.css  |   0
 .../src}/etc/license-template.txt             |   0
 .../ubl2cii/UBL21ToCII16BConverter.java       |   0
 .../ubl2cii/UBLCIIConversionHelper.java       |   0
 .../en16931/ubl2cii/UBLToCIIVersion.java      |   0
 .../ubl12_May112022090834PM_rxPzeZJ8_UBL.xml  |   0
 .../main/resources/ubl2cii-version.properties |   0
 .../en16931/ubl2cii/UBLToCIIVersionTest.java  |   0
 .../ubl12_May112022040446PM_POecZzF1_CII.xml  | 392 ------------------
 pom.xml                                       |  92 ++--
 13 files changed, 162 insertions(+), 457 deletions(-)
 create mode 100644 .github/workflows/maven.yml
 create mode 100644 en16931-ubl2cii/pom.xml
 rename {src => en16931-ubl2cii/src}/etc/javadoc.css (100%)
 rename {src => en16931-ubl2cii/src}/etc/license-template.txt (100%)
 rename {src => en16931-ubl2cii/src}/main/java/com/helger/en16931/ubl2cii/UBL21ToCII16BConverter.java (100%)
 rename {src => en16931-ubl2cii/src}/main/java/com/helger/en16931/ubl2cii/UBLCIIConversionHelper.java (100%)
 rename {src => en16931-ubl2cii/src}/main/java/com/helger/en16931/ubl2cii/UBLToCIIVersion.java (100%)
 rename {src => en16931-ubl2cii/src}/main/resources/external/ubl/ubl12_May112022090834PM_rxPzeZJ8_UBL.xml (100%)
 rename {src => en16931-ubl2cii/src}/main/resources/ubl2cii-version.properties (100%)
 rename {src => en16931-ubl2cii/src}/test/java/com/helger/en16931/ubl2cii/UBLToCIIVersionTest.java (100%)
 delete mode 100644 generated/ubl21/ubl12_May112022040446PM_POecZzF1_CII.xml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..3dd6bd3
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,47 @@
+# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path
+
+name: Maven deploy Snapshots
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '11', '17', '21' ]
+    name: Java ${{ matrix.Java }} build
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK ${{ matrix.Java }}
+      uses: actions/setup-java@v4
+      with:
+        java-version: ${{ matrix.Java }}
+        distribution: 'adopt'
+        server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_PASSWORD
+
+    - name: Cache local Maven repository
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: Publish to the Maven Central Repository
+      run: mvn --batch-mode --update-snapshots deploy
+      if: matrix.Java == 11
+      env:
+        MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+
+    - name: Maven Build
+      run: mvn --batch-mode --update-snapshots install
+      if: matrix.Java != 11
diff --git a/.gitignore b/.gitignore
index 0ccab88..790b6db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 zz
 
 .settings/
+generated/
 target/
diff --git a/en16931-ubl2cii/pom.xml b/en16931-ubl2cii/pom.xml
new file mode 100644
index 0000000..6b09d73
--- /dev/null
+++ b/en16931-ubl2cii/pom.xml
@@ -0,0 +1,87 @@
+<!--
+
+    Copyright (C) 2024 Philip Helger
+    http://www.helger.com
+    philip[at]helger[dot]com
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>com.helger</groupId>
+    <artifactId>en16931-ubl2cii-parent-pom</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>en16931-ubl2cii</artifactId>
+  <packaging>jar</packaging>
+  <name>en16931-ubl2cii</name>
+  <inceptionYear>2024</inceptionYear>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.helger.ubl</groupId>
+      <artifactId>ph-ubl21</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.helger.cii</groupId>
+      <artifactId>ph-cii-d16b</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.helger.phive.rules</groupId>
+      <artifactId>phive-rules-en16931</artifactId>
+      <version>${phive-rules.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <!-- Don't specify the targetPath because this leads to a broken JAR file 
+        in combination with the bundle plugin (absolute file paths in ZIP file) -->
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>**/*.properties</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/src/etc/javadoc.css b/en16931-ubl2cii/src/etc/javadoc.css
similarity index 100%
rename from src/etc/javadoc.css
rename to en16931-ubl2cii/src/etc/javadoc.css
diff --git a/src/etc/license-template.txt b/en16931-ubl2cii/src/etc/license-template.txt
similarity index 100%
rename from src/etc/license-template.txt
rename to en16931-ubl2cii/src/etc/license-template.txt
diff --git a/src/main/java/com/helger/en16931/ubl2cii/UBL21ToCII16BConverter.java b/en16931-ubl2cii/src/main/java/com/helger/en16931/ubl2cii/UBL21ToCII16BConverter.java
similarity index 100%
rename from src/main/java/com/helger/en16931/ubl2cii/UBL21ToCII16BConverter.java
rename to en16931-ubl2cii/src/main/java/com/helger/en16931/ubl2cii/UBL21ToCII16BConverter.java
diff --git a/src/main/java/com/helger/en16931/ubl2cii/UBLCIIConversionHelper.java b/en16931-ubl2cii/src/main/java/com/helger/en16931/ubl2cii/UBLCIIConversionHelper.java
similarity index 100%
rename from src/main/java/com/helger/en16931/ubl2cii/UBLCIIConversionHelper.java
rename to en16931-ubl2cii/src/main/java/com/helger/en16931/ubl2cii/UBLCIIConversionHelper.java
diff --git a/src/main/java/com/helger/en16931/ubl2cii/UBLToCIIVersion.java b/en16931-ubl2cii/src/main/java/com/helger/en16931/ubl2cii/UBLToCIIVersion.java
similarity index 100%
rename from src/main/java/com/helger/en16931/ubl2cii/UBLToCIIVersion.java
rename to en16931-ubl2cii/src/main/java/com/helger/en16931/ubl2cii/UBLToCIIVersion.java
diff --git a/src/main/resources/external/ubl/ubl12_May112022090834PM_rxPzeZJ8_UBL.xml b/en16931-ubl2cii/src/main/resources/external/ubl/ubl12_May112022090834PM_rxPzeZJ8_UBL.xml
similarity index 100%
rename from src/main/resources/external/ubl/ubl12_May112022090834PM_rxPzeZJ8_UBL.xml
rename to en16931-ubl2cii/src/main/resources/external/ubl/ubl12_May112022090834PM_rxPzeZJ8_UBL.xml
diff --git a/src/main/resources/ubl2cii-version.properties b/en16931-ubl2cii/src/main/resources/ubl2cii-version.properties
similarity index 100%
rename from src/main/resources/ubl2cii-version.properties
rename to en16931-ubl2cii/src/main/resources/ubl2cii-version.properties
diff --git a/src/test/java/com/helger/en16931/ubl2cii/UBLToCIIVersionTest.java b/en16931-ubl2cii/src/test/java/com/helger/en16931/ubl2cii/UBLToCIIVersionTest.java
similarity index 100%
rename from src/test/java/com/helger/en16931/ubl2cii/UBLToCIIVersionTest.java
rename to en16931-ubl2cii/src/test/java/com/helger/en16931/ubl2cii/UBLToCIIVersionTest.java
diff --git a/generated/ubl21/ubl12_May112022040446PM_POecZzF1_CII.xml b/generated/ubl21/ubl12_May112022040446PM_POecZzF1_CII.xml
deleted file mode 100644
index b92e20a..0000000
--- a/generated/ubl21/ubl12_May112022040446PM_POecZzF1_CII.xml
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2024 Philip Helger
-    http://www.helger.com
-    philip[at]helger[dot]com
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-            http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<rsm:CrossIndustryInvoice xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">
-    <rsm:ExchangedDocumentContext />
-    <rsm:ExchangedDocument>
-        <ram:ID>TOSL108</ram:ID>
-        <ram:TypeCode>380</ram:TypeCode>
-        <ram:IssueDateTime>
-            <udt:DateTimeString format="102">20091215</udt:DateTimeString>
-        </ram:IssueDateTime>
-        <ram:IncludedNote>
-            <ram:Content>Ordered in our booth at the convention.</ram:Content>
-        </ram:IncludedNote>
-    </rsm:ExchangedDocument>
-    <rsm:SupplyChainTradeTransaction>
-        <ram:IncludedSupplyChainTradeLineItem>
-            <ram:AssociatedDocumentLineDocument>
-                <ram:LineID>1</ram:LineID>
-                <ram:IncludedNote>
-                    <ram:Content>Scratch on box</ram:Content>
-                </ram:IncludedNote>
-            </ram:AssociatedDocumentLineDocument>
-            <ram:SpecifiedTradeProduct>
-                <ram:GlobalID schemeID="GTIN">1234567890124</ram:GlobalID>
-                <ram:SellerAssignedID>JB007</ram:SellerAssignedID>
-                <ram:Name>Labtop computer</ram:Name>
-                <ram:Description>Processor: Intel Core 2 Duo SU9400 LV (1.4GHz). RAM:
-				3MB. Screen 1440x900</ram:Description>
-                <ram:ApplicableProductCharacteristic>
-                    <ram:Description>Color</ram:Description>
-                    <ram:Value>black</ram:Value>
-                </ram:ApplicableProductCharacteristic>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="UNSPSC">12344321</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="CPV">65434568</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-            </ram:SpecifiedTradeProduct>
-            <ram:SpecifiedLineTradeAgreement>
-                <ram:BuyerOrderReferencedDocument>
-                    <ram:LineID>1</ram:LineID>
-                </ram:BuyerOrderReferencedDocument>
-                <ram:NetPriceProductTradePrice>
-                    <ram:ChargeAmount currencyID="EUR">1273</ram:ChargeAmount>
-                </ram:NetPriceProductTradePrice>
-            </ram:SpecifiedLineTradeAgreement>
-            <ram:SpecifiedLineTradeDelivery>
-                <ram:BilledQuantity unitCode="C62">1</ram:BilledQuantity>
-            </ram:SpecifiedLineTradeDelivery>
-            <ram:SpecifiedLineTradeSettlement>
-                <ram:ApplicableTradeTax>
-                    <ram:TypeCode>VAT</ram:TypeCode>
-                    <ram:CategoryCode>S</ram:CategoryCode>
-                    <ram:RateApplicablePercent>20</ram:RateApplicablePercent>
-                </ram:ApplicableTradeTax>
-                <ram:SpecifiedTradeSettlementLineMonetarySummation>
-                    <ram:LineTotalAmount currencyID="EUR">1273</ram:LineTotalAmount>
-                </ram:SpecifiedTradeSettlementLineMonetarySummation>
-                <ram:ReceivableSpecifiedTradeAccountingAccount>
-                    <ram:ID>BookingCode001</ram:ID>
-                </ram:ReceivableSpecifiedTradeAccountingAccount>
-            </ram:SpecifiedLineTradeSettlement>
-        </ram:IncludedSupplyChainTradeLineItem>
-        <ram:IncludedSupplyChainTradeLineItem>
-            <ram:AssociatedDocumentLineDocument>
-                <ram:LineID>2</ram:LineID>
-                <ram:IncludedNote>
-                    <ram:Content>Cover is slightly damaged.</ram:Content>
-                </ram:IncludedNote>
-            </ram:AssociatedDocumentLineDocument>
-            <ram:SpecifiedTradeProduct>
-                <ram:GlobalID schemeID="GTIN">1234567890125</ram:GlobalID>
-                <ram:SellerAssignedID>JB008</ram:SellerAssignedID>
-                <ram:Name>Returned "Advanced computing" book</ram:Name>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="UNSPSC">32344324</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="CPV">65434567</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-            </ram:SpecifiedTradeProduct>
-            <ram:SpecifiedLineTradeAgreement>
-                <ram:BuyerOrderReferencedDocument>
-                    <ram:LineID>5</ram:LineID>
-                </ram:BuyerOrderReferencedDocument>
-                <ram:NetPriceProductTradePrice>
-                    <ram:ChargeAmount currencyID="EUR">3.96</ram:ChargeAmount>
-                </ram:NetPriceProductTradePrice>
-            </ram:SpecifiedLineTradeAgreement>
-            <ram:SpecifiedLineTradeDelivery>
-                <ram:BilledQuantity unitCode="C62">-1</ram:BilledQuantity>
-            </ram:SpecifiedLineTradeDelivery>
-            <ram:SpecifiedLineTradeSettlement>
-                <ram:ApplicableTradeTax>
-                    <ram:TypeCode>VAT</ram:TypeCode>
-                    <ram:CategoryCode>AA</ram:CategoryCode>
-                    <ram:RateApplicablePercent>10</ram:RateApplicablePercent>
-                </ram:ApplicableTradeTax>
-                <ram:SpecifiedTradeSettlementLineMonetarySummation>
-                    <ram:LineTotalAmount currencyID="EUR">-3.96</ram:LineTotalAmount>
-                </ram:SpecifiedTradeSettlementLineMonetarySummation>
-            </ram:SpecifiedLineTradeSettlement>
-        </ram:IncludedSupplyChainTradeLineItem>
-        <ram:IncludedSupplyChainTradeLineItem>
-            <ram:AssociatedDocumentLineDocument>
-                <ram:LineID>3</ram:LineID>
-            </ram:AssociatedDocumentLineDocument>
-            <ram:SpecifiedTradeProduct>
-                <ram:GlobalID schemeID="GTIN">1234567890126</ram:GlobalID>
-                <ram:SellerAssignedID>JB009</ram:SellerAssignedID>
-                <ram:Name>"Computing for dummies" book</ram:Name>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="UNSPSC">32344324</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="CPV">65434566</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-            </ram:SpecifiedTradeProduct>
-            <ram:SpecifiedLineTradeAgreement>
-                <ram:BuyerOrderReferencedDocument>
-                    <ram:LineID>3</ram:LineID>
-                </ram:BuyerOrderReferencedDocument>
-                <ram:NetPriceProductTradePrice>
-                    <ram:ChargeAmount currencyID="EUR">2.48</ram:ChargeAmount>
-                </ram:NetPriceProductTradePrice>
-            </ram:SpecifiedLineTradeAgreement>
-            <ram:SpecifiedLineTradeDelivery>
-                <ram:BilledQuantity unitCode="C62">2</ram:BilledQuantity>
-            </ram:SpecifiedLineTradeDelivery>
-            <ram:SpecifiedLineTradeSettlement>
-                <ram:ApplicableTradeTax>
-                    <ram:TypeCode>VAT</ram:TypeCode>
-                    <ram:CategoryCode>AA</ram:CategoryCode>
-                    <ram:RateApplicablePercent>10</ram:RateApplicablePercent>
-                </ram:ApplicableTradeTax>
-                <ram:SpecifiedTradeSettlementLineMonetarySummation>
-                    <ram:LineTotalAmount currencyID="EUR">4.96</ram:LineTotalAmount>
-                </ram:SpecifiedTradeSettlementLineMonetarySummation>
-            </ram:SpecifiedLineTradeSettlement>
-        </ram:IncludedSupplyChainTradeLineItem>
-        <ram:IncludedSupplyChainTradeLineItem>
-            <ram:AssociatedDocumentLineDocument>
-                <ram:LineID>4</ram:LineID>
-            </ram:AssociatedDocumentLineDocument>
-            <ram:SpecifiedTradeProduct>
-                <ram:GlobalID schemeID="GTIN">1234567890127</ram:GlobalID>
-                <ram:SellerAssignedID>JB010</ram:SellerAssignedID>
-                <ram:Name>Returned IBM 5150 desktop</ram:Name>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="UNSPSC">12344322</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="CPV">65434565</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-            </ram:SpecifiedTradeProduct>
-            <ram:SpecifiedLineTradeAgreement>
-                <ram:BuyerOrderReferencedDocument>
-                    <ram:LineID>2</ram:LineID>
-                </ram:BuyerOrderReferencedDocument>
-                <ram:NetPriceProductTradePrice>
-                    <ram:ChargeAmount currencyID="EUR">25</ram:ChargeAmount>
-                </ram:NetPriceProductTradePrice>
-            </ram:SpecifiedLineTradeAgreement>
-            <ram:SpecifiedLineTradeDelivery>
-                <ram:BilledQuantity unitCode="C62">-1</ram:BilledQuantity>
-            </ram:SpecifiedLineTradeDelivery>
-            <ram:SpecifiedLineTradeSettlement>
-                <ram:ApplicableTradeTax>
-                    <ram:TypeCode>VAT</ram:TypeCode>
-                    <ram:CategoryCode>E</ram:CategoryCode>
-                    <ram:RateApplicablePercent>0</ram:RateApplicablePercent>
-                </ram:ApplicableTradeTax>
-                <ram:SpecifiedTradeSettlementLineMonetarySummation>
-                    <ram:LineTotalAmount currencyID="EUR">-25</ram:LineTotalAmount>
-                </ram:SpecifiedTradeSettlementLineMonetarySummation>
-            </ram:SpecifiedLineTradeSettlement>
-        </ram:IncludedSupplyChainTradeLineItem>
-        <ram:IncludedSupplyChainTradeLineItem>
-            <ram:AssociatedDocumentLineDocument>
-                <ram:LineID>5</ram:LineID>
-            </ram:AssociatedDocumentLineDocument>
-            <ram:SpecifiedTradeProduct>
-                <ram:GlobalID schemeID="GTIN">1234567890128</ram:GlobalID>
-                <ram:SellerAssignedID>JB011</ram:SellerAssignedID>
-                <ram:Name>Network cable</ram:Name>
-                <ram:ApplicableProductCharacteristic>
-                    <ram:Description>Type</ram:Description>
-                    <ram:Value>Cat5</ram:Value>
-                </ram:ApplicableProductCharacteristic>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="UNSPSC">12344325</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-                <ram:DesignatedProductClassification>
-                    <ram:ClassCode listID="CPV">65434564</ram:ClassCode>
-                </ram:DesignatedProductClassification>
-            </ram:SpecifiedTradeProduct>
-            <ram:SpecifiedLineTradeAgreement>
-                <ram:BuyerOrderReferencedDocument>
-                    <ram:LineID>4</ram:LineID>
-                </ram:BuyerOrderReferencedDocument>
-                <ram:NetPriceProductTradePrice>
-                    <ram:ChargeAmount currencyID="EUR">0.75</ram:ChargeAmount>
-                </ram:NetPriceProductTradePrice>
-            </ram:SpecifiedLineTradeAgreement>
-            <ram:SpecifiedLineTradeDelivery>
-                <ram:BilledQuantity unitCode="C62">250</ram:BilledQuantity>
-            </ram:SpecifiedLineTradeDelivery>
-            <ram:SpecifiedLineTradeSettlement>
-                <ram:ApplicableTradeTax>
-                    <ram:TypeCode>VAT</ram:TypeCode>
-                    <ram:CategoryCode>S</ram:CategoryCode>
-                    <ram:RateApplicablePercent>20</ram:RateApplicablePercent>
-                </ram:ApplicableTradeTax>
-                <ram:SpecifiedTradeSettlementLineMonetarySummation>
-                    <ram:LineTotalAmount currencyID="EUR">187.5</ram:LineTotalAmount>
-                </ram:SpecifiedTradeSettlementLineMonetarySummation>
-                <ram:ReceivableSpecifiedTradeAccountingAccount>
-                    <ram:ID>BookingCode002</ram:ID>
-                </ram:ReceivableSpecifiedTradeAccountingAccount>
-            </ram:SpecifiedLineTradeSettlement>
-        </ram:IncludedSupplyChainTradeLineItem>
-        <ram:ApplicableHeaderTradeAgreement>
-            <ram:SellerTradeParty>
-                <ram:ID schemeID="ZZZ">Supp123</ram:ID>
-                <ram:Name>Salescompany ltd.</ram:Name>
-                <ram:SpecifiedLegalOrganization>
-                    <ram:ID schemeID="CVR">5402697509</ram:ID>
-                    <ram:TradingBusinessName>The Sellercompany Incorporated</ram:TradingBusinessName>
-                    <ram:PostalTradeAddress>
-                        <ram:CityName>Big city</ram:CityName>
-                        <ram:CountryID>DK</ram:CountryID>
-                        <ram:CountrySubDivisionName>RegionA</ram:CountrySubDivisionName>
-                    </ram:PostalTradeAddress>
-                </ram:SpecifiedLegalOrganization>
-                <ram:PostalTradeAddress>
-                    <ram:PostcodeCode>54321</ram:PostcodeCode>
-                    <ram:LineOne>Main street</ram:LineOne>
-                    <ram:LineTwo>Suite 123</ram:LineTwo>
-                    <ram:CityName>Big city</ram:CityName>
-                    <ram:CountryID>DK</ram:CountryID>
-                </ram:PostalTradeAddress>
-                <ram:URIUniversalCommunication>
-                    <ram:URIID schemeID="GLN">1234567890123</ram:URIID>
-                </ram:URIUniversalCommunication>
-                <ram:SpecifiedTaxRegistration>
-                    <ram:ID schemeID="VAT">DK12345</ram:ID>
-                </ram:SpecifiedTaxRegistration>
-            </ram:SellerTradeParty>
-            <ram:BuyerTradeParty>
-                <ram:ID schemeID="ZZZ">345KS5324</ram:ID>
-                <ram:Name>Buyercompany ltd</ram:Name>
-                <ram:SpecifiedLegalOrganization>
-                    <ram:ID schemeID="ZZZ">5645342123</ram:ID>
-                    <ram:TradingBusinessName>The buyercompany inc.</ram:TradingBusinessName>
-                    <ram:PostalTradeAddress>
-                        <ram:CityName>Mainplace</ram:CityName>
-                        <ram:CountryID>BE</ram:CountryID>
-                        <ram:CountrySubDivisionName>RegionB</ram:CountrySubDivisionName>
-                    </ram:PostalTradeAddress>
-                </ram:SpecifiedLegalOrganization>
-                <ram:PostalTradeAddress>
-                    <ram:PostcodeCode>101</ram:PostcodeCode>
-                    <ram:LineOne>Anystreet</ram:LineOne>
-                    <ram:LineTwo>Back door</ram:LineTwo>
-                    <ram:CityName>Anytown</ram:CityName>
-                    <ram:CountryID>BE</ram:CountryID>
-                    <ram:CountrySubDivisionName>RegionB</ram:CountrySubDivisionName>
-                </ram:PostalTradeAddress>
-                <ram:URIUniversalCommunication>
-                    <ram:URIID schemeID="GLN">1234567987654</ram:URIID>
-                </ram:URIUniversalCommunication>
-                <ram:SpecifiedTaxRegistration>
-                    <ram:ID schemeID="VAT">BE54321</ram:ID>
-                </ram:SpecifiedTaxRegistration>
-            </ram:BuyerTradeParty>
-            <ram:BuyerOrderReferencedDocument>
-                <ram:IssuerAssignedID>123</ram:IssuerAssignedID>
-            </ram:BuyerOrderReferencedDocument>
-            <ram:ContractReferencedDocument>
-                <ram:IssuerAssignedID>Contract321</ram:IssuerAssignedID>
-            </ram:ContractReferencedDocument>
-            <ram:AdditionalReferencedDocument>
-                <ram:IssuerAssignedID>Doc1</ram:IssuerAssignedID>
-                <ram:URIID>http://www.suppliersite.eu/sheet001.html</ram:URIID>
-            </ram:AdditionalReferencedDocument>
-            <ram:AdditionalReferencedDocument>
-                <ram:IssuerAssignedID>Doc2</ram:IssuerAssignedID>
-            </ram:AdditionalReferencedDocument>
-        </ram:ApplicableHeaderTradeAgreement>
-        <ram:ApplicableHeaderTradeDelivery>
-            <ram:ShipToTradeParty>
-                <ram:ID schemeID="GLN">6754238987648</ram:ID>
-                <ram:PostalTradeAddress>
-                    <ram:PostcodeCode>523427</ram:PostcodeCode>
-                    <ram:LineOne>Deliverystreet</ram:LineOne>
-                    <ram:LineTwo>Side door</ram:LineTwo>
-                    <ram:CityName>DeliveryCity</ram:CityName>
-                    <ram:CountryID>BE</ram:CountryID>
-                    <ram:CountrySubDivisionName />
-                </ram:PostalTradeAddress>
-            </ram:ShipToTradeParty>
-            <ram:ActualDeliverySupplyChainEvent>
-                <ram:OccurrenceDateTime>
-                    <udt:DateTimeString format="102">20091215</udt:DateTimeString>
-                </ram:OccurrenceDateTime>
-            </ram:ActualDeliverySupplyChainEvent>
-        </ram:ApplicableHeaderTradeDelivery>
-        <ram:ApplicableHeaderTradeSettlement>
-            <ram:PaymentReference>Payref1</ram:PaymentReference>
-            <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
-            <ram:PayeeTradeParty>
-                <ram:ID schemeID="GLN">098740918237</ram:ID>
-                <ram:Name>Ebeneser Scrooge Inc.</ram:Name>
-                <ram:SpecifiedLegalOrganization>
-                    <ram:ID schemeID="UK:CH">6411982340</ram:ID>
-                </ram:SpecifiedLegalOrganization>
-            </ram:PayeeTradeParty>
-            <ram:SpecifiedTradeSettlementPaymentMeans>
-                <ram:TypeCode>31</ram:TypeCode>
-                <ram:PayeePartyCreditorFinancialAccount>
-                    <ram:IBANID>DK1212341234123412</ram:IBANID>
-                </ram:PayeePartyCreditorFinancialAccount>
-            </ram:SpecifiedTradeSettlementPaymentMeans>
-            <ram:ApplicableTradeTax>
-                <ram:CalculatedAmount currencyID="EUR">292.1</ram:CalculatedAmount>
-                <ram:TypeCode>S</ram:TypeCode>
-                <ram:BasisAmount currencyID="EUR">1460.5</ram:BasisAmount>
-            </ram:ApplicableTradeTax>
-            <ram:BillingSpecifiedPeriod>
-                <ram:StartDateTime>
-                    <udt:DateTimeString format="102">20091101</udt:DateTimeString>
-                </ram:StartDateTime>
-                <ram:EndDateTime>
-                    <udt:DateTimeString format="102">20091130</udt:DateTimeString>
-                </ram:EndDateTime>
-            </ram:BillingSpecifiedPeriod>
-            <ram:SpecifiedTradeAllowanceCharge>
-                <ram:ChargeIndicator>
-                    <udt:Indicator>false</udt:Indicator>
-                </ram:ChargeIndicator>
-                <ram:ActualAmount>100</ram:ActualAmount>
-                <ram:Reason>Packing cost</ram:Reason>
-            </ram:SpecifiedTradeAllowanceCharge>
-            <ram:SpecifiedTradeAllowanceCharge>
-                <ram:ChargeIndicator>
-                    <udt:Indicator>false</udt:Indicator>
-                </ram:ChargeIndicator>
-                <ram:ActualAmount>100</ram:ActualAmount>
-                <ram:Reason>Promotion discount</ram:Reason>
-            </ram:SpecifiedTradeAllowanceCharge>
-            <ram:SpecifiedTradePaymentTerms>
-                <ram:Description>Penalty percentage 10% from due date</ram:Description>
-                <ram:DueDateDateTime>
-                    <udt:DateTimeString format="102">20091231</udt:DateTimeString>
-                </ram:DueDateDateTime>
-            </ram:SpecifiedTradePaymentTerms>
-            <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
-                <ram:LineTotalAmount currencyID="EUR">1436.5</ram:LineTotalAmount>
-                <ram:ChargeTotalAmount currencyID="EUR">100</ram:ChargeTotalAmount>
-                <ram:AllowanceTotalAmount currencyID="EUR">100</ram:AllowanceTotalAmount>
-                <ram:TaxBasisTotalAmount currencyID="EUR">1436.5</ram:TaxBasisTotalAmount>
-                <ram:TaxTotalAmount currencyID="EUR">292.20</ram:TaxTotalAmount>
-                <ram:RoundingAmount currencyID="EUR">0.30</ram:RoundingAmount>
-                <ram:GrandTotalAmount currencyID="EUR">1729</ram:GrandTotalAmount>
-                <ram:TotalPrepaidAmount currencyID="EUR">1000</ram:TotalPrepaidAmount>
-                <ram:DuePayableAmount currencyID="EUR">729</ram:DuePayableAmount>
-            </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
-            <ram:ReceivableSpecifiedTradeAccountingAccount>
-                <ram:ID>Project cost code 123</ram:ID>
-            </ram:ReceivableSpecifiedTradeAccountingAccount>
-        </ram:ApplicableHeaderTradeSettlement>
-    </rsm:SupplyChainTradeTransaction>
-</rsm:CrossIndustryInvoice>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8608753..50e3751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,26 +18,26 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>com.helger</groupId>
     <artifactId>parent-pom</artifactId>
     <version>2.0.6</version>
   </parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.myproj</groupId>
-	<artifactId>en16931-ubl2cii-parent-pom</artifactId>
-	<packaging>war</packaging>
-	<name>en16931-ubl2cii-parent-pom</name>
-	<version>1.1.0-SNAPSHOT</version>
-	
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>en16931-ubl2cii-parent-pom</artifactId>
+  <packaging>pom</packaging>
+  <name>en16931-ubl2cii-parent-pom</name>
+  <inceptionYear>2024</inceptionYear>
+  <version>1.1.0-SNAPSHOT</version>
+
   <properties>
     <phive-rules.version>3.2.2</phive-rules.version>
   </properties>
 
-	<dependencyManagement>
-	  <dependencies>
+  <dependencyManagement>
+    <dependencies>
       <dependency>
         <groupId>com.helger.commons</groupId>
         <artifactId>ph-commons-parent-pom</artifactId>
@@ -59,60 +59,22 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-	  </dependencies>
-	</dependencyManagement>
+    </dependencies>
+  </dependencyManagement>
 
-	<dependencies>
-    <dependency>
-      <groupId>com.helger.ubl</groupId>
-      <artifactId>ph-ubl21</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.helger.cii</groupId>
-      <artifactId>ph-cii-d16b</artifactId>
-    </dependency>
+  <modules>
+    <module>en16931-ubl2cii</module>
+  </modules>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.helger.phive.rules</groupId>
-      <artifactId>phive-rules-en16931</artifactId>
-      <version>${phive-rules.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-	</dependencies>
-	
-	<build>
-    <resources>
-      <!-- Don't specify the targetPath because this leads to a broken JAR file 
-        in combination with the bundle plugin (absolute file paths in ZIP file) -->
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>false</filtering>
-        <excludes>
-          <exclude>**/*.properties</exclude>
-        </excludes>  
-      </resource>
-    </resources>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>