From 1c7aed4c5a789520d099560b20c10ceb5864503d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 09:01:30 +0000 Subject: [PATCH 1/2] Chore(deps): Bump spring-boot-starter-parent from 2.7.5 to 3.0.2 Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.7.5 to 3.0.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.5...v3.0.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bfb5423..fae521b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.5 + 3.0.2 com.philips.research From 33b9b0be6755cf5d0972d20dc4eac87d0eae4301 Mon Sep 17 00:00:00 2001 From: Jeroen Knoops Date: Mon, 20 Feb 2023 16:01:17 +0100 Subject: [PATCH 2/2] chore: use jakarta instead of javax Signed-off-by: Jeroen Knoops --- .github/workflows/build.yml | 2 +- .../com/philips/research/bombar/controller/ProjectsRoute.java | 2 +- .../research/bombar/core/domain/PackageInteractor.java | 2 +- .../research/bombar/core/domain/ProjectInteractor.java | 2 +- .../research/bombar/persistence/AcceptanceConverter.java | 4 ++-- .../philips/research/bombar/persistence/DependencyEntity.java | 2 +- .../research/bombar/persistence/DistributionConverter.java | 4 ++-- .../philips/research/bombar/persistence/PackageEntity.java | 2 +- .../research/bombar/persistence/PackageRefConverter.java | 4 ++-- .../research/bombar/persistence/PackageUrlConverter.java | 4 ++-- .../philips/research/bombar/persistence/PhaseConverter.java | 4 ++-- .../philips/research/bombar/persistence/ProjectEntity.java | 2 +- .../research/bombar/persistence/RelationshipConverter.java | 4 ++-- .../com/philips/research/bombar/persistence/UriConverter.java | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c9fb6c..6fc693c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/setup-java@v3 with: - java-version: '11.0.1' + java-version: '17' distribution: 'zulu' - name: Download fronted from the frontend job diff --git a/src/main/java/com/philips/research/bombar/controller/ProjectsRoute.java b/src/main/java/com/philips/research/bombar/controller/ProjectsRoute.java index 2f8d8d1..3a3fcf7 100644 --- a/src/main/java/com/philips/research/bombar/controller/ProjectsRoute.java +++ b/src/main/java/com/philips/research/bombar/controller/ProjectsRoute.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.URI; import java.util.Map; diff --git a/src/main/java/com/philips/research/bombar/core/domain/PackageInteractor.java b/src/main/java/com/philips/research/bombar/core/domain/PackageInteractor.java index 807d63f..d61318f 100644 --- a/src/main/java/com/philips/research/bombar/core/domain/PackageInteractor.java +++ b/src/main/java/com/philips/research/bombar/core/domain/PackageInteractor.java @@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.net.URI; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/philips/research/bombar/core/domain/ProjectInteractor.java b/src/main/java/com/philips/research/bombar/core/domain/ProjectInteractor.java index e71d381..d2d3acc 100644 --- a/src/main/java/com/philips/research/bombar/core/domain/ProjectInteractor.java +++ b/src/main/java/com/philips/research/bombar/core/domain/ProjectInteractor.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import pl.tlinkowski.annotation.basic.NullOr; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.io.InputStream; import java.net.URI; import java.util.*; diff --git a/src/main/java/com/philips/research/bombar/persistence/AcceptanceConverter.java b/src/main/java/com/philips/research/bombar/persistence/AcceptanceConverter.java index ace8cb2..4459d1b 100644 --- a/src/main/java/com/philips/research/bombar/persistence/AcceptanceConverter.java +++ b/src/main/java/com/philips/research/bombar/persistence/AcceptanceConverter.java @@ -7,8 +7,8 @@ import com.philips.research.bombar.core.domain.Package.Acceptance; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @SuppressWarnings("unused") @Converter(autoApply = true) diff --git a/src/main/java/com/philips/research/bombar/persistence/DependencyEntity.java b/src/main/java/com/philips/research/bombar/persistence/DependencyEntity.java index cf3ccdf..566bdfb 100644 --- a/src/main/java/com/philips/research/bombar/persistence/DependencyEntity.java +++ b/src/main/java/com/philips/research/bombar/persistence/DependencyEntity.java @@ -9,7 +9,7 @@ import com.philips.research.bombar.core.domain.Project; import pl.tlinkowski.annotation.basic.NullOr; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Access(AccessType.FIELD) diff --git a/src/main/java/com/philips/research/bombar/persistence/DistributionConverter.java b/src/main/java/com/philips/research/bombar/persistence/DistributionConverter.java index 75bbac2..1451909 100644 --- a/src/main/java/com/philips/research/bombar/persistence/DistributionConverter.java +++ b/src/main/java/com/philips/research/bombar/persistence/DistributionConverter.java @@ -7,8 +7,8 @@ import com.philips.research.bombar.core.domain.Project.Distribution; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @SuppressWarnings("unused") @Converter(autoApply = true) diff --git a/src/main/java/com/philips/research/bombar/persistence/PackageEntity.java b/src/main/java/com/philips/research/bombar/persistence/PackageEntity.java index cae1324..e7791ec 100644 --- a/src/main/java/com/philips/research/bombar/persistence/PackageEntity.java +++ b/src/main/java/com/philips/research/bombar/persistence/PackageEntity.java @@ -9,7 +9,7 @@ import com.philips.research.bombar.core.domain.PackageRef; import pl.tlinkowski.annotation.basic.NullOr; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Access(AccessType.FIELD) diff --git a/src/main/java/com/philips/research/bombar/persistence/PackageRefConverter.java b/src/main/java/com/philips/research/bombar/persistence/PackageRefConverter.java index e32fef8..8df3d7f 100644 --- a/src/main/java/com/philips/research/bombar/persistence/PackageRefConverter.java +++ b/src/main/java/com/philips/research/bombar/persistence/PackageRefConverter.java @@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory; import pl.tlinkowski.annotation.basic.NullOr; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @SuppressWarnings("unused") @Converter(autoApply = true) diff --git a/src/main/java/com/philips/research/bombar/persistence/PackageUrlConverter.java b/src/main/java/com/philips/research/bombar/persistence/PackageUrlConverter.java index f5d4283..474c13f 100644 --- a/src/main/java/com/philips/research/bombar/persistence/PackageUrlConverter.java +++ b/src/main/java/com/philips/research/bombar/persistence/PackageUrlConverter.java @@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory; import pl.tlinkowski.annotation.basic.NullOr; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @SuppressWarnings("unused") @Converter(autoApply = true) diff --git a/src/main/java/com/philips/research/bombar/persistence/PhaseConverter.java b/src/main/java/com/philips/research/bombar/persistence/PhaseConverter.java index c6e9cfb..d58bf66 100644 --- a/src/main/java/com/philips/research/bombar/persistence/PhaseConverter.java +++ b/src/main/java/com/philips/research/bombar/persistence/PhaseConverter.java @@ -5,8 +5,8 @@ package com.philips.research.bombar.persistence; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import static com.philips.research.bombar.core.domain.Project.Phase; diff --git a/src/main/java/com/philips/research/bombar/persistence/ProjectEntity.java b/src/main/java/com/philips/research/bombar/persistence/ProjectEntity.java index 5d55f42..bb3e500 100644 --- a/src/main/java/com/philips/research/bombar/persistence/ProjectEntity.java +++ b/src/main/java/com/philips/research/bombar/persistence/ProjectEntity.java @@ -8,7 +8,7 @@ import com.philips.research.bombar.core.domain.Project; import pl.tlinkowski.annotation.basic.NullOr; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/src/main/java/com/philips/research/bombar/persistence/RelationshipConverter.java b/src/main/java/com/philips/research/bombar/persistence/RelationshipConverter.java index 92c104b..c81012c 100644 --- a/src/main/java/com/philips/research/bombar/persistence/RelationshipConverter.java +++ b/src/main/java/com/philips/research/bombar/persistence/RelationshipConverter.java @@ -7,8 +7,8 @@ import com.philips.research.bombar.core.domain.Relation.Relationship; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @SuppressWarnings("unused") @Converter(autoApply = true) diff --git a/src/main/java/com/philips/research/bombar/persistence/UriConverter.java b/src/main/java/com/philips/research/bombar/persistence/UriConverter.java index e9e083a..824985b 100644 --- a/src/main/java/com/philips/research/bombar/persistence/UriConverter.java +++ b/src/main/java/com/philips/research/bombar/persistence/UriConverter.java @@ -9,8 +9,8 @@ import org.slf4j.LoggerFactory; import pl.tlinkowski.annotation.basic.NullOr; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import java.net.URI; /**