From 8604cd9d7223da9aff8b20301ffd4858ace200e8 Mon Sep 17 00:00:00 2001 From: Grzegorz Kostkowski Date: Tue, 24 Sep 2024 15:49:23 +0200 Subject: [PATCH] Accept alternative URIs of the supported UML versions --- src/html-conventions-report.xsl | 6 +++--- src/html-model-glossary.xsl | 6 +++--- src/svrl-conventions-report.xsl | 8 ++++---- test/ePO-default-config/config-parameters.xsl | 9 ++++++++- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/html-conventions-report.xsl b/src/html-conventions-report.xsl index 9d471c02..e1bcde5c 100644 --- a/src/html-conventions-report.xsl +++ b/src/html-conventions-report.xsl @@ -42,7 +42,7 @@ @@ -92,11 +92,11 @@

Wrong model version detected.


-

Please make sure that the XMI file uses XMI version 2.5.1 and UML version 2.5.1.

+

Please make sure that the XMI file uses XMI version 2.5.1 and UML version 2.5.x (either 2.5 or 2.5.1).

The namespaces to check:

  • xmi="http://www.omg.org/spec/XMI/20131001"
    • -
  • uml="http://www.omg.org/spec/UML/20131001"
    • +
  • uml=""
diff --git a/src/html-model-glossary.xsl b/src/html-model-glossary.xsl index 3db53bfa..26e830dc 100644 --- a/src/html-model-glossary.xsl +++ b/src/html-model-glossary.xsl @@ -26,7 +26,7 @@
@@ -49,11 +49,11 @@

Wrong model version detected.


-

Please make sure that the XMI file uses XMI version 2.5.1 and UML version 2.5.1.

+

Please make sure that the XMI file uses XMI version 2.5.1 and UML version 2.5.x (either 2.5 or 2.5.1).

The namespaces to check:

  • xmi="http://www.omg.org/spec/XMI/20131001"
    • -
  • uml="http://www.omg.org/spec/UML/20131001"
    • +
  • uml="'"
diff --git a/src/svrl-conventions-report.xsl b/src/svrl-conventions-report.xsl index 335952ed..cf8395e2 100644 --- a/src/svrl-conventions-report.xsl +++ b/src/svrl-conventions-report.xsl @@ -37,7 +37,7 @@ @@ -47,9 +47,9 @@ - - Wrong model version detected.Please make sure that the XMI file uses XMI version 2.5.1 and UML version 2.5.1. - The namespaces to check: uml="http://www.omg.org/spec/UML/20131001" and xmi="http://www.omg.org/spec/XMI/20131001" + + Wrong model version detected.Please make sure that the XMI file uses XMI version 2.5.1 and UML version 2.5.x (either 2.5 or 2.5.1). + The namespaces to check: uml="" and xmi="http://www.omg.org/spec/XMI/20131001" diff --git a/test/ePO-default-config/config-parameters.xsl b/test/ePO-default-config/config-parameters.xsl index d574cb3b..5ce591e1 100644 --- a/test/ePO-default-config/config-parameters.xsl +++ b/test/ePO-default-config/config-parameters.xsl @@ -91,7 +91,14 @@ - + + +