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

Update eclipse-temurin Docker tag to v21 #151

Merged
merged 5 commits into from
Dec 1, 2023
Merged

Update eclipse-temurin Docker tag to v21 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b29459a
Update eclipse-temurin Docker tag to v21
renovate[bot] Oct 31, 2023
8ed407a
Upgrade to Java 21
laxsrbija Dec 1, 2023
bf46b33
Update the target version
laxsrbija Dec 1, 2023
c7c1271
Upgrade to JDK 21
laxsrbija Dec 1, 2023
87fed3e
Merge branch 'main' into renovate/eclipse-temurin-21.x
laxsrbija Dec 1, 2023
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/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM maven:3.9-eclipse-temurin-17 as build
FROM maven:3.9-eclipse-temurin-21 AS build

WORKDIR /tmp
COPY . .

RUN mvn -B clean package

FROM eclipse-temurin:17-jre
FROM eclipse-temurin:21-jre

WORKDIR /opt/chore-manager
COPY --from=build /tmp/chore-manager-backend/chore-manager-application/target/chore-manager.jar .
Expand Down
2 changes: 2 additions & 0 deletions ...e-manager-rest-adapter/src/main/java/net/lazars/chores/adapter/rest/mapper/DtoMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ default void sortCompletionHistory(@MappingTarget TaskDto taskDto) {
@Named("toCompleteUserDto")
CompleteUserDto toCompleteUserDto(User user);

User toUser(UserDto userDto);

UserDto toUserDto(User user);

@Named("toRecurrence")
Expand Down
7 changes: 4 additions & 3 deletions ...e-manager-backend/chore-manager-core/src/main/java/net/lazars/chores/core/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
Expand All @@ -21,11 +22,11 @@ public class User extends BaseModel {

private String image;

private List<Permission> permissions = new ArrayList<>();
@Builder.Default private List<Permission> permissions = new ArrayList<>();

private List<Household> households = new ArrayList<>();
@Builder.Default private List<Household> households = new ArrayList<>();

private String chanifyToken;

private List<NotificationChannel> notificationChannels = new ArrayList<>();
@Builder.Default private List<NotificationChannel> notificationChannels = new ArrayList<>();
}
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
</modules>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<springdoc-openapi-starter.version>2.2.0</springdoc-openapi-starter.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<retrofit.version>2.9.0</retrofit.version>

<node.version>v16.16.0</node.version>
<npm.version>8.11.0</npm.version>
<node.version>v20.10.0</node.version>
<npm.version>10.2.4</npm.version>

<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
<frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
Expand Down Expand Up @@ -70,8 +70,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<source>${java.version}</source>
<target>${java.version}</target>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
Expand Down