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

Develop to Main #244

Merged
merged 17 commits into from
Jun 16, 2023
Merged

Develop to Main #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
07a3142
Bump jacoco-maven-plugin from 0.8.8 to 0.8.9
dependabot[bot] Apr 3, 2023
63ba51a
Bump quarkus-universe-bom from 2.16.4.Final to 2.16.6.Final
dependabot[bot] Apr 4, 2023
334c6ba
Merge branch 'develop' into dependabot/maven/org.jacoco-jacoco-maven-…
pascalwilbrink Apr 24, 2023
265ddd1
Merge branch 'develop' into dependabot/maven/io.quarkus-quarkus-unive…
pascalwilbrink Apr 24, 2023
169beb5
Merge pull request #224 from com-pas/dependabot/maven/org.jacoco-jaco…
pascalwilbrink Apr 24, 2023
041700c
Merge branch 'develop' into dependabot/maven/io.quarkus-quarkus-unive…
pascalwilbrink Apr 24, 2023
6688ddb
Merge pull request #225 from com-pas/dependabot/maven/io.quarkus-quar…
pascalwilbrink Apr 24, 2023
2c0c306
Bump jacoco-maven-plugin from 0.8.9 to 0.8.10
dependabot[bot] Apr 25, 2023
c2b817b
Merge pull request #228 from com-pas/dependabot/maven/org.jacoco-jaco…
pascalwilbrink Apr 26, 2023
b07678b
Bump maven-source-plugin from 3.2.1 to 3.3.0
dependabot[bot] May 22, 2023
5019e59
Merge pull request #237 from com-pas/dependabot/maven/org.apache.mave…
Stef3st May 23, 2023
575dca3
Bump maven-dependency-plugin from 3.5.0 to 3.6.0
dependabot[bot] May 23, 2023
e8b6faf
Merge pull request #236 from com-pas/dependabot/maven/org.apache.mave…
Stef3st May 23, 2023
0dfe303
Bump maven-jaxb2-plugin from 0.15.2 to 0.15.3
dependabot[bot] May 23, 2023
bec4607
Merge pull request #235 from com-pas/dependabot/maven/org.jvnet.jaxb2…
Stef3st May 23, 2023
ce8748a
Update scl-extension XSD resolves com-pas/compas-sct#286
samirromdhani Jun 8, 2023
defe0dd
Merge pull request #242 from com-pas/286-update-xsd-file-private-comp…
samirromdhani Jun 16, 2023
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
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SPDX-License-Identifier: Apache-2.0
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
<quarkus.platform.version>2.16.4.Final</quarkus.platform.version>
<quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
<jaxb.bind.version>2.3.8</jaxb.bind.version>
<log4j2.version>2.20.0</log4j2.version>
<openpojo.version>0.9.1</openpojo.version>
Expand Down Expand Up @@ -115,13 +115,13 @@ SPDX-License-Identifier: Apache-2.0
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>

<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.15.2</version>
<version>0.15.3</version>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
Expand Down Expand Up @@ -166,7 +166,7 @@ SPDX-License-Identifier: Apache-2.0
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -206,7 +206,7 @@ SPDX-License-Identifier: Apache-2.0
<sonar.language>java</sonar.language>

<!-- JaCoCo Properties -->
<jacoco.version>0.8.8</jacoco.version>
<jacoco.version>0.8.10</jacoco.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion scl-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ SPDX-License-Identifier: Apache-2.0
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.15.2</version>
<version>0.15.3</version>
<executions>
<execution>
<id>xjc</id>
Expand Down
2 changes: 1 addition & 1 deletion scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ SPDX-License-Identifier: Apache-2.0
The BayCodif is specific to each user to identify the bay kind.
</xs:documentation>
</xs:annotation>
<xs:attribute name="UUID" type="xs:string" use="optional"/>
<xs:attribute name="UUID" type="xs:string" use="required"/>
<xs:attribute name="Indice" type="xs:string" use="optional"/>
<xs:attribute name="Version" type="xs:string" use="optional"/>
<xs:attribute name="MainShortLabel" type="xs:string" use="required"/>
Expand Down