Skip to content

Commit

Permalink
Merge pull request #1018 from luechtdiode/fix/merge-java-bumps
Browse files Browse the repository at this point in the history
Fix/merge java bumps
  • Loading branch information
luechtdiode authored Dec 29, 2024
2 parents 6568e0a + ecf73d7 commit 891ad2f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
22 changes: 11 additions & 11 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ USER kutu

EXPOSE 5757

ENV X_KUTU_SECRET ""
ENV X_DB_CONFIG_NAME "sqlite"
ENV X_POSTGRES_HOST ""
ENV X_POSTGRES_USER ""
ENV X_POSTGRES_PASSWORD ""

ENV X_SMTP_HOST "undefined"
ENV X_SMTP_PORT 0
ENV X_SMTP_USERNAME "undefined"
ENV X_SMTP_DOMAIN "undefined"
ENV X_SMTP_PASSWORD "undefined"
ENV X_KUTU_SECRET=""
ENV X_DB_CONFIG_NAME="sqlite"
ENV X_POSTGRES_HOST=""
ENV X_POSTGRES_USER=""
ENV X_POSTGRES_PASSWORD=""

ENV X_SMTP_HOST="undefined"
ENV X_SMTP_PORT=0
ENV X_SMTP_USERNAME="undefined"
ENV X_SMTP_DOMAIN="undefined"
ENV X_SMTP_PASSWORD="undefined"

ENTRYPOINT [ "java", "-cp", ".:app.jar:libs/*" \
, "-Duser.home=/home" \
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,9 @@
<scala.majorversion>2.13</scala.majorversion>
<scala.version>2.13.14</scala.version>
<akkaHttp.version>10.5.3</akkaHttp.version>
<javafx.version>21.0.4</javafx.version>
<javafx.version>23</javafx.version>
<akka.version>2.8.6</akka.version>
<scalafx.version>21.0.0-R32</scalafx.version>
<scalafx.version>23.0.1-R34</scalafx.version>
<!--scalafx.version>20.0.0-R31</scalafx.version-->
<scalatest.version>3.3.0-SNAP4</scalatest.version>
<scala-maven-plugin.version>4.9.2</scala-maven-plugin.version>
Expand Down Expand Up @@ -415,7 +415,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.1.0</version>
<version>6.2.1</version>
</dependency>

<!-- akka / akkahttp -->
Expand Down Expand Up @@ -544,7 +544,7 @@
<dependency>
<groupId>org.javadelight</groupId>
<artifactId>delight-nashorn-sandbox</artifactId>
<version>0.4.2</version>
<version>0.5.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -629,7 +629,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.2</version>
<configuration>
<includes>
<include>**/*Suite.class</include>
Expand Down
Binary file added src/main/resources/images/search-inv.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 891ad2f

Please sign in to comment.