Skip to content

Updating dependencies #18

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

Merged
BertScholten merged 3 commits into from
Jan 31, 2025
Merged

Updating dependencies #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1188d9d
Updating dependencies
BertScholten Jan 29, 2025
3f8898f
Adding dependency-check profile
BertScholten Jan 31, 2025
c7b6228
Removed java.version property
BertScholten Jan 31, 2025
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
4 changes: 2 additions & 2 deletions source/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Builder part for maven packaging.
FROM maven:3-eclipse-temurin-17 as builder
FROM maven:3-eclipse-temurin-21 as builder

WORKDIR /app

Expand All @@ -17,7 +17,7 @@ FROM debian:bullseye

# Get java from eclipse-temurin image (could perhaps do something with jlink later on)
ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
ENV PATH "${JAVA_HOME}/bin:${PATH}"

# Set defaults
Expand Down
2 changes: 2 additions & 0 deletions source/file-server-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<version>${okhttp.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
26 changes: 18 additions & 8 deletions source/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>nl.aerius</groupId>
<artifactId>aerius-root-pom</artifactId>
<version>1.0.0</version>
<version>1.1.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<packaging>pom</packaging>
Expand All @@ -35,15 +35,10 @@
<description>The file server Parent</description>

<properties>
<java.version>17</java.version>

<amazons3.version>2.20.56</amazons3.version>
<amazons3.version>2.30.7</amazons3.version>
<okhttp.version>4.12.0</okhttp.version>

<sonar.projectKey>aerius_file-server</sonar.projectKey>
<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
<sonar.organization>aerius</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.java.pmd.reportPaths>${project.build.directory}/dependency-check-report-pmd.xml</sonar.java.pmd.reportPaths>
</properties>

<repositories>
Expand Down Expand Up @@ -80,4 +75,19 @@
<module>file-server</module>
<module>file-server-client</module>
</modules>

<profiles>
<profile>
<id>dependency-check</id>
<build>
<plugins>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>