Skip to content
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

chore: update dependencies #62

Merged
merged 3 commits into from
Jan 30, 2024
Merged

chore: update dependencies #62

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
5162346
chore: update dependencies
pooriamehregan Jan 30, 2024
8704ce1
fix: force guava version for security reason
pooriamehregan Jan 30, 2024
ad1e106
chore: alpine base dockerfile & add non-root user
pooriamehregan Jan 30, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod&demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
with:
app_name: catalog-admin-service
environment: prod
java_version: '19'
java_version: '21'
coverage_file_path: ./target/site/jacoco/jacoco.xml
secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
app_name: catalog-admin-service
environment: staging
java_version: '19'
java_version: '21'
coverage_file_path: ./target/site/jacoco/jacoco.xml
secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
17 changes: 14 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
FROM openjdk:19-slim
FROM eclipse-temurin:21-jre-alpine

ARG USER=default
ENV HOME /home/$USER

ENV TZ=Europe/Oslo
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

VOLUME /tmp
COPY /target/app.jar app.jar
# install sudo as root
RUN apk add --update sudo

RUN adduser -D $USER \
&& echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER \
&& chmod 0440 /etc/sudoers.d/$USER

USER $USER
WORKDIR $HOME

COPY --chown=app:app /target/app.jar app.jar
CMD java -jar -XX:+UseZGC $JAVA_OPTS app.jar
46 changes: 32 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.3</version>
<version>3.2.2</version>
<relativePath/>
</parent>

<properties>
<java.release>19</java.release>
<java.release>21</java.release>
<java.encoding>UTF-8</java.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>${java.release}</maven.compiler.source>
<maven.compiler.target>${java.release}</maven.compiler.target>
<maven.exec.skip>false</maven.exec.skip>

<kotlin.version>1.9.10</kotlin.version>
<testcontainers.version>1.19.0</testcontainers.version>
<jena.version>4.9.0</jena.version>
<kotlin.version>1.9.22</kotlin.version>
<testcontainers.version>1.19.4</testcontainers.version>
<jena.version>4.10.0</jena.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -81,19 +81,30 @@
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>2.1.2</version>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.parsson</groupId>
<artifactId>jakarta.json</artifactId>
<version>1.1.4</version>
<version>1.1.5</version>
</dependency>

<!-- SVG validation -->
<dependency>
<groupId>com.github.bgalek.security.svg</groupId>
<artifactId>safe-svg</artifactId>
<version>1.1.7</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.3-jre</version>
</dependency>
NilsOveTen marked this conversation as resolved.
Show resolved Hide resolved

<!-- Test -->
Expand All @@ -111,7 +122,7 @@
<dependency>
<groupId>org.mockito.kotlin</groupId>
<artifactId>mockito-kotlin</artifactId>
<version>5.1.0</version>
<version>5.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -135,11 +146,16 @@
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.0.2</version>
<artifactId>wiremock-standalone</artifactId>
<version>3.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.2.2</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -204,7 +220,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<version>0.8.11</version>
<executions>
<execution>
<id>before-unit-test-execution</id>
Expand Down Expand Up @@ -262,8 +278,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<argLine>${surefire.jacoco.args}</argLine>
<groups>unit</groups>
<excludedGroups>integration</excludedGroups>
Expand All @@ -275,8 +292,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<argLine>${failsafe.jacoco.args}</argLine>
<groups>integration</groups>
<excludedGroups>unit</excludedGroups>
Expand Down
Loading