Skip to content

Commit ad1aed9

Browse files
author
Dennis Labordus
committed
Small changes regarding gradle to maven migration.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent a4c9b1f commit ad1aed9

File tree

5 files changed

+15
-35
lines changed

5 files changed

+15
-35
lines changed

.dockerignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
*
6-
!build/*-runner
7-
!build/*-runner.jar
8-
!build/lib/*
9-
!build/quarkus-app/*
6+
!target/*-runner
7+
!target/*-runner.jar
8+
!target/lib/*
9+
!target/quarkus-app/*

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
#
88
# These are explicitly windows files and should use crlf
99
*.bat text eol=crlf
10+
*.cmd text eol=crlf
1011

app/pom.xml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,8 @@ SPDX-License-Identifier: Apache-2.0
141141
</goals>
142142
<configuration>
143143
<systemPropertyVariables>
144-
<native.image.path>
145-
${project.build.directory}/${project.build.finalName}-runner
146-
</native.image.path>
147-
<java.util.logging.manager>org.jboss.logmanager.LogManager
148-
</java.util.logging.manager>
144+
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
145+
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
149146
<maven.home>${maven.home}</maven.home>
150147
</systemPropertyVariables>
151148
</configuration>
@@ -160,20 +157,11 @@ SPDX-License-Identifier: Apache-2.0
160157
<id>sonar</id>
161158

162159
<properties>
163-
<sonar.coverage.jacoco.xmlReportPaths>target/jacoco-report/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
160+
<sonar.coverage.jacoco.xmlReportPaths>
161+
target/jacoco-report/jacoco.xml,
162+
target/site/jacoco/jacoco.xml,
163+
</sonar.coverage.jacoco.xmlReportPaths>
164164
</properties>
165-
166-
<build>
167-
<plugins>
168-
<plugin>
169-
<groupId>org.jacoco</groupId>
170-
<artifactId>jacoco-maven-plugin</artifactId>
171-
<configuration>
172-
<skip>true</skip>
173-
</configuration>
174-
</plugin>
175-
</plugins>
176-
</build>
177165
</profile>
178166
</profiles>
179167
</project>

app/src/main/resources/META-INF/resources/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ <h3>Application</h3>
132132
<li>GroupId: <code>org.lfenergy.compas.scl.data</code></li>
133133
<li>ArtifactId: <code>app</code></li>
134134
<li>Version: <code>1.0.0-SNAPSHOT</code></li>
135-
<li>Quarkus Version: <code>1.13.4.Final</code></li>
135+
<li>Quarkus Version: <code>2.0.0.Final</code></li>
136136
</ul>
137137
</div>
138138
<div class="right-section">

pom.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ SPDX-License-Identifier: Apache-2.0
2626
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
2727
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2828

29-
<compas-core-version>1.0-SNAPSHOT</compas-core-version>
3029
<jakarta-bind-api.version>2.3.3</jakarta-bind-api.version>
3130
<jakarta-cdi-api.version>2.0.2</jakarta-cdi-api.version>
3231
<microprofile-config-api.version>2.0</microprofile-config-api.version>
@@ -65,17 +64,6 @@ SPDX-License-Identifier: Apache-2.0
6564
<scope>import</scope>
6665
</dependency>
6766

68-
<dependency>
69-
<groupId>org.lfenergy.compas</groupId>
70-
<artifactId>core-commons</artifactId>
71-
<version>${compas-core-version}</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>org.lfenergy.compas</groupId>
75-
<artifactId>scl-extension</artifactId>
76-
<version>${compas-core-version}</version>
77-
</dependency>
78-
7967
<dependency>
8068
<groupId>jakarta.xml.bind</groupId>
8169
<artifactId>jakarta.xml.bind-api</artifactId>
@@ -192,6 +180,9 @@ SPDX-License-Identifier: Apache-2.0
192180
<!-- JaCoCo Properties -->
193181
<jacoco.version>0.8.6</jacoco.version>
194182
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
183+
<sonar.coverage.jacoco.xmlReportPaths>
184+
target/site/jacoco/jacoco.xml,
185+
</sonar.coverage.jacoco.xmlReportPaths>
195186
</properties>
196187

197188
<build>

0 commit comments

Comments
 (0)