Skip to content
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

Jump to bottom

New release #237

Merged
merged 8 commits into from
Jul 12, 2022
Merged

New release #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2505e7e
Bump quarkus.platform.version from 2.10.1.Final to 2.10.2.Final
dependabot[bot] Jul 7, 2022
c73de5c
Merge pull request #234 from com-pas/dependabot/maven/quarkus.platfor…
Jul 11, 2022
6a868d6
Select the first Hitem that matches the version.
Jul 11, 2022
2708d49
Added Postman collection.
Jul 11, 2022
ac3a7dc
Select the first Hitem that matches the version. (BaseX)
Jul 11, 2022
4997980
Fixed re-use issue.
Jul 11, 2022
4bc6772
Fixed re-use issue.
Jul 11, 2022
f0b6d92
Merge pull request #235 from com-pas/fix-history
pascalwilbrink Jul 12, 2022
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
2 changes: 1 addition & 1 deletion mvnw.cmd.license
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SPDX-FileCopyrightText: 2021 2021 Alliander N.V.
SPDX-FileCopyrightText: 2022 Alliander N.V.

SPDX-License-Identifier: Apache-2.0
2 changes: 1 addition & 1 deletion mvnw.license
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SPDX-FileCopyrightText: 2021 2021 Alliander N.V.
SPDX-FileCopyrightText: 2022 Alliander N.V.

SPDX-License-Identifier: Apache-2.0
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0

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

<quarkus.platform.version>2.10.1.Final</quarkus.platform.version>
<quarkus.platform.version>2.10.2.Final</quarkus.platform.version>
<jaxb-impl.version>2.3.6</jaxb-impl.version>
<microprofile-openapi-api.version>3.0</microprofile-openapi-api.version>
<slf4j.version>1.7.36</slf4j.version>
Expand Down
947 changes: 947 additions & 0 deletions postman/scl-data-service.collection.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions postman/scl-data-service.collection.json.license
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SPDX-FileCopyrightText: 2022 Alliander N.V.

SPDX-License-Identifier: Apache-2.0
2 changes: 1 addition & 1 deletion ...main/java/org/lfenergy/compas/scl/data/basex/repository/CompasSclDataBaseXRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public List<HistoryItem> listVersionsByUUID(SclFileType type, UUID id) {
" let $id := $resource" + SCL_HEADER_ID_XPATH + "\n" +
" let $version := $resource" + SCL_HEADER_VERSION_XPATH + "\n" +
" let $name := $resource" + COMPAS_NAME_EXTENSION_XPATH + "\n" +
" let $header := $resource/scl:SCL/scl:Header/scl:History/scl:Hitem[(not(@revision) or @revision=\"\") and @version=$version]\n" +
" let $header := ($resource/scl:SCL/scl:Header/scl:History/scl:Hitem[(not(@revision) or @revision=\"\") and @version=$version])[1]\n" +
" let $parts := tokenize($version, '\\.')\n" +
" let $majorVersion := xs:int($parts[1])\n" +
" let $minorVersion := xs:int($parts[2])\n" +
Expand Down
2 changes: 1 addition & 1 deletion ...org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class CompasSclDataPostgreSQLRepository implements CompasSclDataRepositor
private static final String JOIN_HEADER_CLAUSE = " left outer join (" +
"SELECT id, major_version, minor_version, patch_version," +
" unnest(" +
" xpath('/scl:SCL/scl:Header//scl:Hitem[(not(@revision) or @revision=\"\") and @version=\"' || major_version || '.' || minor_version || '.' || patch_version || '\"]' " +
" xpath('(/scl:SCL/scl:Header//scl:Hitem[(not(@revision) or @revision=\"\") and @version=\"' || major_version || '.' || minor_version || '.' || patch_version || '\"])[1]' " +
" , scl_data::xml " +
" , ARRAY[ARRAY['scl', 'http://www.iec.ch/61850/2003/SCL']])) as header " +
" from scl_file) scl_data " +
Expand Down