Skip to content

Commit 212a35c

Browse files
author
Dennis Labordus
authored
Merge pull request #237 from com-pas/develop
New release
2 parents 0a3a6f2 + f0b6d92 commit 212a35c

File tree

7 files changed

+955
-5
lines changed

7 files changed

+955
-5
lines changed

mvnw.cmd.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SPDX-FileCopyrightText: 2021 2021 Alliander N.V.
1+
SPDX-FileCopyrightText: 2022 Alliander N.V.
22

33
SPDX-License-Identifier: Apache-2.0

mvnw.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SPDX-FileCopyrightText: 2021 2021 Alliander N.V.
1+
SPDX-FileCopyrightText: 2022 Alliander N.V.
22

33
SPDX-License-Identifier: Apache-2.0

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0
2626

2727
<compas.core.version>0.9.1</compas.core.version>
2828

29-
<quarkus.platform.version>2.10.1.Final</quarkus.platform.version>
29+
<quarkus.platform.version>2.10.2.Final</quarkus.platform.version>
3030
<jaxb-impl.version>2.3.6</jaxb-impl.version>
3131
<microprofile-openapi-api.version>3.0</microprofile-openapi-api.version>
3232
<slf4j.version>1.7.36</slf4j.version>

postman/scl-data-service.collection.json

Lines changed: 947 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2022 Alliander N.V.
2+
3+
SPDX-License-Identifier: Apache-2.0

repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/repository/CompasSclDataBaseXRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public List<HistoryItem> listVersionsByUUID(SclFileType type, UUID id) {
115115
" let $id := $resource" + SCL_HEADER_ID_XPATH + "\n" +
116116
" let $version := $resource" + SCL_HEADER_VERSION_XPATH + "\n" +
117117
" let $name := $resource" + COMPAS_NAME_EXTENSION_XPATH + "\n" +
118-
" let $header := $resource/scl:SCL/scl:Header/scl:History/scl:Hitem[(not(@revision) or @revision=\"\") and @version=$version]\n" +
118+
" let $header := ($resource/scl:SCL/scl:Header/scl:History/scl:Hitem[(not(@revision) or @revision=\"\") and @version=$version])[1]\n" +
119119
" let $parts := tokenize($version, '\\.')\n" +
120120
" let $majorVersion := xs:int($parts[1])\n" +
121121
" let $minorVersion := xs:int($parts[2])\n" +

repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class CompasSclDataPostgreSQLRepository implements CompasSclDataRepositor
3333
private static final String JOIN_HEADER_CLAUSE = " left outer join (" +
3434
"SELECT id, major_version, minor_version, patch_version," +
3535
" unnest(" +
36-
" xpath('/scl:SCL/scl:Header//scl:Hitem[(not(@revision) or @revision=\"\") and @version=\"' || major_version || '.' || minor_version || '.' || patch_version || '\"]' " +
36+
" xpath('(/scl:SCL/scl:Header//scl:Hitem[(not(@revision) or @revision=\"\") and @version=\"' || major_version || '.' || minor_version || '.' || patch_version || '\"])[1]' " +
3737
" , scl_data::xml " +
3838
" , ARRAY[ARRAY['scl', 'http://www.iec.ch/61850/2003/SCL']])) as header " +
3939
" from scl_file) scl_data " +

0 commit comments

Comments
 (0)