Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b59318a

Browse files
committedJan 6, 2025·
Merge branch 'refs/heads/main' into enhancement/261-complete-commercial-endpoint-functionality
# Conflicts: # remsfal-service/src/main/java/de/remsfal/service/control/BuildingController.java # remsfal-service/src/test/java/de/remsfal/service/control/BuildingControllerTest.java
2 parents 687cc73 + 9943119 commit b59318a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3032
-685
lines changed
 

‎docker-compose.yml

+14
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ services:
2828
- remsfal
2929
ports:
3030
- '9090:9090'
31+
32+
minio:
33+
image: minio/minio
34+
container_name: minio
35+
environment:
36+
- MINIO_ROOT_USER=minioadmin
37+
- MINIO_ROOT_PASSWORD=minioadminpassword
38+
command: server /data --console-address ":9001"
39+
ports:
40+
- "9000:9000"
41+
- "9001:9001"
42+
volumes:
43+
- ./data/minio:/data
44+
3145
networks:
3246
remsfal:
3347
driver: bridge

‎remsfal-core/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>org.junit</groupId>
2727
<artifactId>junit-bom</artifactId>
28-
<version>5.11.3</version>
28+
<version>5.11.4</version>
2929
<type>pom</type>
3030
<scope>import</scope>
3131
</dependency>
@@ -68,6 +68,11 @@
6868
<artifactId>microprofile-openapi-api</artifactId>
6969
<version>${version.open-api}</version>
7070
</dependency>
71+
<dependency>
72+
<groupId>org.jboss.resteasy</groupId>
73+
<artifactId>resteasy-multipart-provider</artifactId>
74+
<version>6.2.11.Final</version>
75+
</dependency>
7176

7277
<!-- TEST dependencies -->
7378
<dependency>

0 commit comments

Comments
 (0)
Please sign in to comment.