Skip to content

Commit 9114a1c

Browse files
fix: java build issues on dependency upgrades (#378)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 26ae5fc commit 9114a1c

File tree

6 files changed

+40
-18
lines changed

6 files changed

+40
-18
lines changed

.gitattributes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Autodetect text files and force unix eols, so Windows does not break them
2+
* text=auto eol=lf
3+
4+
# Force images/fonts to be handled as binaries
5+
*.jpg binary
6+
*.jpeg binary
7+
*.gif binary
8+
*.png binary

.github/workflows/.deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ on:
4848
### Usually a bad idea / not recommended
4949
timeout-minutes:
5050
description: 'Timeout minutes'
51-
default: 10
51+
default: 30
5252
required: false
5353
type: number
5454
values:

backend-java/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<artifactId>quickstart-openshift-backends</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
<properties>
9-
<compiler-plugin.version>3.13.0</compiler-plugin.version>
9+
<compiler-plugin.version>3.14.0</compiler-plugin.version>
1010
<maven.compiler.release>23</maven.compiler.release>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1313
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
1414
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
15-
<quarkus.platform.version>3.17.5</quarkus.platform.version>
15+
<quarkus.platform.version>3.26.1</quarkus.platform.version>
1616
<skipITs>true</skipITs>
17-
<surefire-plugin.version>3.5.2</surefire-plugin.version>
17+
<surefire-plugin.version>3.5.3</surefire-plugin.version>
1818
</properties>
1919
<dependencyManagement>
2020
<dependencies>
@@ -93,13 +93,13 @@
9393
<dependency>
9494
<groupId>org.instancio</groupId>
9595
<artifactId>instancio-junit</artifactId>
96-
<version>5.2.1</version>
96+
<version>5.5.1</version>
9797
<scope>test</scope>
9898
</dependency>
9999
<dependency>
100100
<groupId>net.datafaker</groupId>
101101
<artifactId>datafaker</artifactId>
102-
<version>2.4.0</version>
102+
<version>2.4.4</version>
103103
</dependency>
104104
<dependency>
105105
<groupId>org.flywaydb</groupId>

backend-java/src/main/resources/application.properties

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ quarkus.datasource."default".devservices.port=5420
1010
quarkus.datasource.jdbc.max-size=2
1111
quarkus.datasource.jdbc.enable-metrics=true
1212
quarkus.http.port=3000
13-
quarkus.flyway.validate-at-start=true
13+
quarkus.flyway.validate-at-start=false
1414
quarkus.flyway.validate-migration-naming=true
1515
quarkus.flyway.migrate-at-start=true
1616
quarkus.flyway.create-schemas=true
1717
quarkus.flyway.default-schema=java_api
1818
quarkus.flyway.enabled=true
1919
quarkus.flyway.baseline-on-migrate=true
20+
# Validate after migration completes
21+
quarkus.flyway.validate-on-migrate=true
2022
quarkus.flyway.baseline-version=1
21-
quarkus.flyway.clean-on-validation-error=true
2223
quarkus.flyway.connect-retries=10
2324
quarkus.swagger-ui.always-include=true
24-
# this should fix the compatibility issue
25-
quarkus.native.additional-build-args=-march=compatibility
25+
# Combined native build args: compatibility and runtime initialization fixes
26+
quarkus.native.additional-build-args=-march=compatibility,--initialize-at-run-time=net.datafaker.service.RandomService\\,sun.java2d.pipe.Region\\,sun.java2d.Disposer

backend-java/src/test/java/ca/bc/gov/nrs/api/helpers/TestHelper.java

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import jakarta.inject.Inject;
88
import jakarta.transaction.Transactional;
99
import net.datafaker.Faker;
10-
import org.instancio.Instancio;
1110

1211
import java.util.List;
1312

@@ -38,11 +37,24 @@ public UserEntity saveUser() {
3837

3938
@Transactional(Transactional.TxType.REQUIRES_NEW)
4039
public List<UserEntity> saveUsers(int size) {
41-
var users = Instancio.ofList(UserEntity.class).size(size).create().stream().peek(x -> {
42-
x.setId(null);
43-
x.setAddresses(null);
44-
}).toList();
45-
this.userRepository.persist(users);
40+
var users = new java.util.ArrayList<UserEntity>();
41+
for (int i = 0; i < size; i++) {
42+
var name = faker.name();
43+
var email = faker.internet().emailAddress();
44+
UserEntity user = new UserEntity();
45+
user.setName(name.fullName());
46+
user.setEmail(email);
47+
users.add(user);
48+
}
49+
try{
50+
// Persist users individually
51+
for (UserEntity user : users) {
52+
this.userRepository.persist(user);
53+
}
54+
}catch(Exception e){
55+
e.printStackTrace();
56+
}
57+
4658
return users;
4759
}
4860

backend-java/src/test/resources/application.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ quarkus.datasource.username=quarkus
33
quarkus.datasource.password=quarkus
44
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5420/postgres
55
quarkus.datasource."default".devservices.port=5420
6-
quarkus.flyway.validate-at-start=true
6+
quarkus.flyway.validate-at-start=false
7+
# Validate after migration completes
8+
quarkus.flyway.validate-on-migrate=true
79
quarkus.flyway.validate-migration-naming=true
810
quarkus.flyway.migrate-at-start=true
911
quarkus.flyway.create-schemas=true
1012
quarkus.flyway.default-schema=java_api
1113
quarkus.flyway.enabled=true
1214
quarkus.flyway.baseline-on-migrate=true
1315
quarkus.flyway.baseline-version=1
14-
quarkus.flyway.clean-on-validation-error=true

0 commit comments

Comments
 (0)