Skip to content

GH-3: Rebase branch #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spah-soptim wants to merge 4 commits into
base: GT-3-Allow-any-cim-namespace-URIs
Choose a base branch
from
Open

GH-3: Rebase branch #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7974c04
chore(deps): update all non-major dependencies (#11)
renovate[bot] Jun 2, 2026
2770910
chore(deps): update dependency org.apache.jena:jena-arq to v6 (#12)
renovate[bot] Jun 2, 2026
40e00c1
Merge branch 'main' into GT-3-Allow-any-cim-namespace-URIs
spah-soptim Jun 12, 2026
33df58a
fix(parser): add empty checks for data type maps in CIMXML parsing
spah-soptim Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions cimxml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<groupId>de.soptim.opencgmes</groupId>
<artifactId>cimxml</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>OpenCGMES - IEC61970-552 CIMXML</name>
Expand Down Expand Up @@ -69,31 +69,31 @@
<maven.compiler.target>21</maven.compiler.target>

<!-- Main dependencies -->
<ver.jena>5.6.0</ver.jena>
<ver.jena>6.1.0</ver.jena>

<!-- XML -->
<ver.stax2-api>4.2.2</ver.stax2-api>
<ver.aalto-xml>1.3.4</ver.aalto-xml>
<ver.woodstox-core>7.1.1</ver.woodstox-core>
<ver.stax2-api>4.3.0</ver.stax2-api>
<ver.aalto-xml>1.4.0</ver.aalto-xml>
<ver.woodstox-core>7.2.0</ver.woodstox-core>

<!-- Utilities -->
<ver.commons-io>2.21.0</ver.commons-io>
<ver.commons-io>2.22.0</ver.commons-io>
<ver.commons-lang3>3.20.0</ver.commons-lang3>

<!-- Logging -->
<ver.slf4j>2.0.17</ver.slf4j>
<ver.log4j2>2.25.3</ver.log4j2>
<ver.slf4j>2.0.18</ver.slf4j>
<ver.log4j2>2.26.0</ver.log4j2>

<!-- Testing -->
<ver.junit4>4.13.2</ver.junit4>
<ver.mockito>5.22.0</ver.mockito>
<ver.mockito>5.23.0</ver.mockito>
<ver.awaitility>4.3.0</ver.awaitility>

<!-- Plugins -->
<ver.plugin.compiler>3.15.0</ver.plugin.compiler>
<ver.plugin.surefire>3.5.5</ver.plugin.surefire>
<ver.plugin.surefire>3.5.6</ver.plugin.surefire>
<ver.plugin.source>3.4.0</ver.plugin.source>
<ver.plugin.javadoc>3.11.3</ver.plugin.javadoc>
<ver.plugin.javadoc>3.12.0</ver.plugin.javadoc>
<ver.plugin.gpg>3.2.8</ver.plugin.gpg>
<ver.plugin.central-publishing>0.10.0</ver.plugin.central-publishing>

Expand Down
6 changes: 3 additions & 3 deletions cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/ParserCIMXML_StAX_SR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@ else if ( qNameMatches(qName, dmDifferenceModel) ) {
RDFXMLparseWarning("No CimProfileRegistry has been provided, so missing datatypes in CIMXML cannot be resolved.", location);
} else {
currentDataTypeMap = cimProfileRegistry.getHeaderPropertiesAndDatatypes(versionOfCIMXML);
if (currentDataTypeMap == null) {
RDFXMLparseWarning("No header profile has been registered for CIM version " + versionOfCIMXML, location);
if (currentDataTypeMap == null || currentDataTypeMap.isEmpty()) {
RDFXMLparseWarning("No header profile has been registered for CIMXML version " + versionOfCIMXML, location);
}
currentListOfPropertiesNotInProfile = new HashSet<>();
}
Expand Down Expand Up @@ -578,7 +578,7 @@ private void initCimModelHeaderCurrentProfileAndCurrentDatatypeMap(Location loca
}
currentListOfPropertiesNotInProfile = new HashSet<>();
currentDataTypeMap = cimProfileRegistry.getPropertiesAndDatatypes(currentCimProfiles);
if (currentDataTypeMap == null) {
if (currentDataTypeMap == null || currentDataTypeMap.isEmpty()) {
RDFXMLparseWarning("The profiles in the model header could not be found in the CimProfileRegistry. Profiles: " + currentCimProfiles.toString(), location);
}
}
Expand Down