diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 135f243..a79e3f8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,33 +12,15 @@ jobs: # When GitHub Actions supports it: https://github.com/actions/toolkit/issues/399 # We will use the experimental flag as indicator whether a failure should cause a workflow failure include: - - jdk: 8 - - jdk: 11 - - jdk: 16 - - jdk: 11 - build-jdk: 11 - jdk: 17 build-jdk: 17 steps: - uses: actions/checkout@v2 - - name: Set up Java 8 - uses: AdoptOpenJDK/install-jdk@v1 - with: - version: 8 - targets: JDK8_HOME;JAVA_HOME - - name: Download Requested JDK - uses: actions/setup-java@v3 - if: ${{ matrix.jdk != 8 }} - with: - java-version: ${{ matrix.jdk }} - distribution: temurin - name: Set up Requested JDK uses: actions/setup-java@v3 - if: ${{ matrix.jdk != 8 }} with: java-version: ${{ matrix.jdk }} distribution: temurin - - name: Get year/month for cache key id: get-date run: | @@ -57,14 +39,13 @@ jobs: - name: Run build script env: - JDK8_HOME: ${{ env.JDK8_HOME }} JDK: ${{ matrix.jdk }} BUILD_JDK: ${{ matrix.build-jdk }} run: ./ci/build-github.sh shell: bash - name: Upload test reports (if Maven failed) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: test-reports-jdk${{ matrix.jdk }}-build-jdk${{ matrix.build-jdk }} diff --git a/.github/workflows/publish-snapshot.yaml b/.github/workflows/publish-snapshot.yaml index 0b7d870..9c7d707 100644 --- a/.github/workflows/publish-snapshot.yaml +++ b/.github/workflows/publish-snapshot.yaml @@ -11,11 +11,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Java 8 - uses: AdoptOpenJDK/install-jdk@v1 - with: - version: 8 - targets: JDK8_HOME;JAVA_HOME - name: Download JDK 17 uses: actions/setup-java@v3 with: @@ -43,4 +38,4 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} run: ./ci/deploy-snapshot.sh - shell: bash \ No newline at end of file + shell: bash diff --git a/.travis.yml b/.travis.yml index e93a5db..50116c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java sudo: false -dist: trusty +dist: jammy notifications: slack: "blazebit:$SLACK_API_TOKEN" cache: @@ -21,4 +21,4 @@ env: matrix: fast_finish: true include: - - jdk: oraclejdk8 \ No newline at end of file + - jdk: openjdk17 diff --git a/build.sh b/build.sh index f288149..cfc082e 100755 --- a/build.sh +++ b/build.sh @@ -18,10 +18,6 @@ else export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m $MAVEN_OPTS" fi -if [ "$JDK" = "9" ]; then - export JAVA_HOME="/usr/lib/jvm/java-9-oracle/" -fi - $DIR/mvnw -version PROPERTIES="$PROPERTIES -Duser.country=US -Duser.language=en" @@ -30,8 +26,4 @@ if [ "$BUILD_JDK" != "" ]; then PROPERTIES="$PROPERTIES -Djava.version=$BUILD_JDK" fi -if [ "$JDK" != "" ]; then - PROPERTIES="$PROPERTIES -Djdk8.home=/usr/lib/jvm/java-8-oracle" -fi - exec $DIR/mvnw -B clean install -V $PROPERTIES diff --git a/ci/deploy-snapshot.sh b/ci/deploy-snapshot.sh index 0fe5298..08a1b7c 100755 --- a/ci/deploy-snapshot.sh +++ b/ci/deploy-snapshot.sh @@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" echo "Starting snapshot deployment..." export MAVEN_OPTS="$MAVEN_OPTS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn" -exec $DIR/../mvnw -B -P "blazebit-release" -s $DIR/deploy-settings.xml -DperformRelease -DskipTests -DskipNpmDeploy -Dgpg.skip=true -Dquiet=true -Djdk8.home=$JDK8_HOME clean deploy +exec $DIR/../mvnw -B -P "blazebit-release" -s $DIR/deploy-settings.xml -DperformRelease -DskipTests -DskipNpmDeploy -Dgpg.skip=true -Dquiet=true clean deploy diff --git a/entity-view/model/pom.xml b/entity-view/model/pom.xml index c2f89f7..3f382fd 100644 --- a/entity-view/model/pom.xml +++ b/entity-view/model/pom.xml @@ -15,11 +15,9 @@ - - javax - javaee-api - provided + jakarta.persistence + jakarta.persistence-api ${project.groupId} @@ -28,12 +26,12 @@ ${project.groupId} - blaze-persistence-entity-view-api + blaze-persistence-entity-view-api-jakarta ${version.blaze-persistence} ${project.groupId} - blaze-persistence-entity-view-impl + blaze-persistence-entity-view-impl-jakarta ${version.blaze-persistence} runtime @@ -52,4 +50,4 @@ - \ No newline at end of file + diff --git a/entity-view/storage/pom.xml b/entity-view/storage/pom.xml index 7bf2d06..c7897f6 100644 --- a/entity-view/storage/pom.xml +++ b/entity-view/storage/pom.xml @@ -15,11 +15,9 @@ - - javax - javaee-api - provided + jakarta.persistence + jakarta.persistence-api ${project.groupId} @@ -95,4 +93,4 @@ - \ No newline at end of file + diff --git a/entity-view/storage/src/main/java/com/blazebit/job/view/storage/EntityViewJobManager.java b/entity-view/storage/src/main/java/com/blazebit/job/view/storage/EntityViewJobManager.java index 71115d7..6498ca8 100644 --- a/entity-view/storage/src/main/java/com/blazebit/job/view/storage/EntityViewJobManager.java +++ b/entity-view/storage/src/main/java/com/blazebit/job/view/storage/EntityViewJobManager.java @@ -32,9 +32,9 @@ import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.metamodel.EntityType; import java.io.Serializable; import java.time.Clock; import java.time.Instant; diff --git a/entity-view/storage/src/main/java/com/blazebit/job/view/storage/EntityViewPartitionKeyProvider.java b/entity-view/storage/src/main/java/com/blazebit/job/view/storage/EntityViewPartitionKeyProvider.java index dbd98e2..e30744f 100644 --- a/entity-view/storage/src/main/java/com/blazebit/job/view/storage/EntityViewPartitionKeyProvider.java +++ b/entity-view/storage/src/main/java/com/blazebit/job/view/storage/EntityViewPartitionKeyProvider.java @@ -31,9 +31,9 @@ import com.blazebit.persistence.view.metamodel.ManagedViewType; import com.blazebit.persistence.view.metamodel.ViewType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.Metamodel; import java.lang.annotation.Annotation; import java.util.Collection; import java.util.Map; diff --git a/jpa/model/pom.xml b/jpa/model/pom.xml index 2b6bc40..03b73f0 100644 --- a/jpa/model/pom.xml +++ b/jpa/model/pom.xml @@ -15,11 +15,9 @@ - - javax - javaee-api - provided + jakarta.persistence + jakarta.persistence-api ${project.groupId} diff --git a/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJob.java b/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJob.java index 98989b3..5980b07 100644 --- a/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJob.java +++ b/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJob.java @@ -18,12 +18,12 @@ import com.blazebit.job.Job; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; -import javax.persistence.PrePersist; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.time.Instant; /** diff --git a/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJobInstance.java b/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJobInstance.java index 3b4b65f..b5a8704 100644 --- a/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJobInstance.java +++ b/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJobInstance.java @@ -19,13 +19,13 @@ import com.blazebit.job.JobInstanceProcessingContext; import com.blazebit.job.JobInstanceState; -import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.MappedSuperclass; -import javax.persistence.PrePersist; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.time.Instant; /** diff --git a/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJobTrigger.java b/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJobTrigger.java index e6f94c9..6bf2a00 100644 --- a/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJobTrigger.java +++ b/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractJobTrigger.java @@ -21,16 +21,16 @@ import com.blazebit.job.JobInstanceProcessingContext; import com.blazebit.job.Schedule; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; /** * An abstract mapped superclass implementing the {@link JpaJobTrigger} interface. diff --git a/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractTriggerBasedJobInstance.java b/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractTriggerBasedJobInstance.java index 4fc878a..3b83ac8 100644 --- a/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractTriggerBasedJobInstance.java +++ b/jpa/model/src/main/java/com/blazebit/job/jpa/model/AbstractTriggerBasedJobInstance.java @@ -18,13 +18,13 @@ import com.blazebit.job.JobTrigger; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; /** * An abstract mapped superclass implementing the {@link JpaTriggerBasedJobInstance} interface. diff --git a/jpa/model/src/main/java/com/blazebit/job/jpa/model/BaseEntity.java b/jpa/model/src/main/java/com/blazebit/job/jpa/model/BaseEntity.java index e3091e9..d02d5df 100644 --- a/jpa/model/src/main/java/com/blazebit/job/jpa/model/BaseEntity.java +++ b/jpa/model/src/main/java/com/blazebit/job/jpa/model/BaseEntity.java @@ -17,7 +17,7 @@ package com.blazebit.job.jpa.model; import java.io.Serializable; -import javax.persistence.Transient; +import jakarta.persistence.Transient; /** * An abstract mapped superclass holding the id and implementing equals and hashCode based on that. @@ -57,7 +57,7 @@ public ID id() { /** * Returns the id of the entity. - * Subclasses must annotate this method accordingly with {@link javax.persistence.Id} or {@link javax.persistence.EmbeddedId}. + * Subclasses must annotate this method accordingly with {@link jakarta.persistence.Id} or {@link jakarta.persistence.EmbeddedId}. * * @return the id of the entity */ diff --git a/jpa/model/src/main/java/com/blazebit/job/jpa/model/JobConfiguration.java b/jpa/model/src/main/java/com/blazebit/job/jpa/model/JobConfiguration.java index f13f7e8..1ed7d76 100644 --- a/jpa/model/src/main/java/com/blazebit/job/jpa/model/JobConfiguration.java +++ b/jpa/model/src/main/java/com/blazebit/job/jpa/model/JobConfiguration.java @@ -16,10 +16,10 @@ package com.blazebit.job.jpa.model; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Lob; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Lob; +import jakarta.persistence.Transient; import java.io.Serializable; import java.time.Instant; import java.util.HashMap; diff --git a/jpa/storage/pom.xml b/jpa/storage/pom.xml index 75500e5..59d14b4 100644 --- a/jpa/storage/pom.xml +++ b/jpa/storage/pom.xml @@ -15,11 +15,9 @@ - - javax - javaee-api - provided + jakarta.persistence + jakarta.persistence-api ${project.groupId} @@ -90,4 +88,4 @@ - \ No newline at end of file + diff --git a/jpa/storage/src/main/java/com/blazebit/job/jpa/storage/JpaJobManager.java b/jpa/storage/src/main/java/com/blazebit/job/jpa/storage/JpaJobManager.java index 9bd6940..21da1c6 100644 --- a/jpa/storage/src/main/java/com/blazebit/job/jpa/storage/JpaJobManager.java +++ b/jpa/storage/src/main/java/com/blazebit/job/jpa/storage/JpaJobManager.java @@ -32,10 +32,10 @@ import com.blazebit.job.jpa.model.JpaTriggerBasedJobInstance; import com.blazebit.job.spi.TransactionSupport; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.metamodel.EntityType; import java.io.Serializable; import java.time.Clock; import java.time.Instant; diff --git a/jpa/storage/src/main/java/com/blazebit/job/jpa/storage/JpaPartitionKeyProvider.java b/jpa/storage/src/main/java/com/blazebit/job/jpa/storage/JpaPartitionKeyProvider.java index eef8fb7..1ad1dda 100644 --- a/jpa/storage/src/main/java/com/blazebit/job/jpa/storage/JpaPartitionKeyProvider.java +++ b/jpa/storage/src/main/java/com/blazebit/job/jpa/storage/JpaPartitionKeyProvider.java @@ -27,10 +27,10 @@ import com.blazebit.job.jpa.model.JpaPartitionKey; import com.blazebit.job.spi.PartitionKeyProvider; -import javax.persistence.EntityManager; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.Metamodel; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/parent/pom.xml b/parent/pom.xml index 7e0024a..8c12b0a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,25 +18,25 @@ Bohrium 0.1.21 - 1.6.0 - 1.0.0-Alpha5 + 1.6.14 + 1.0.0-Alpha6 2.4.5.Final - 5.0.7.RELEASE + 6.2.1 4.12 4.11.0 - 5.2.11.Final + 6.6.4.Final 3.3.2 - - javax - javaee-api - 7.0 - provided + jakarta.platform + jakarta.jakartaee-bom + 10.0.0 + pom + import @@ -111,7 +111,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${version.checkstyle.plugin} blaze-job/checkstyle-config.xml blaze-job/checkstyle-suppressions.xml diff --git a/pom.xml b/pom.xml index a85127c..1fe342e 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,7 @@ Blazebit Blaze-Job - ${env.JAVA_HOME} - 1.8 + 17 ${java.version} ${java.version} 8.7 @@ -84,9 +83,7 @@ Mobe91 Moritz Becker - m.becker@ordami.com - Ordami - http://www.ordami.com + moritz.becker@gmx.at UTC+1 Committer @@ -189,51 +186,4 @@ - - - - javadoc-xdoclint-disable-jdk8+ - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - -Xdoclint:none - - - - - - - - jdk9+ - - [1.9,) - - - 3.0.0-M1 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - 8 - -Xdoclint:none - - - - - - - - \ No newline at end of file + diff --git a/processor/hibernate-insert-select/pom.xml b/processor/hibernate-insert-select/pom.xml index a582350..e4138e5 100644 --- a/processor/hibernate-insert-select/pom.xml +++ b/processor/hibernate-insert-select/pom.xml @@ -15,11 +15,9 @@ - - javax - javaee-api - provided + jakarta.persistence + jakarta.persistence-api ${project.groupId} @@ -28,9 +26,9 @@ ${project.groupId} - blaze-persistence-core-api + blaze-persistence-core-api-jakarta ${version.blaze-persistence} - \ No newline at end of file + diff --git a/processor/hibernate-insert-select/src/main/java/com/blazebit/job/processor/hibernate/insertselect/AbstractInsertSelectJobInstanceProcessor.java b/processor/hibernate-insert-select/src/main/java/com/blazebit/job/processor/hibernate/insertselect/AbstractInsertSelectJobInstanceProcessor.java index bb5d504..33bf7d4 100644 --- a/processor/hibernate-insert-select/src/main/java/com/blazebit/job/processor/hibernate/insertselect/AbstractInsertSelectJobInstanceProcessor.java +++ b/processor/hibernate-insert-select/src/main/java/com/blazebit/job/processor/hibernate/insertselect/AbstractInsertSelectJobInstanceProcessor.java @@ -22,7 +22,7 @@ import com.blazebit.persistence.CriteriaBuilderFactory; import com.blazebit.persistence.InsertCriteriaBuilder; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * An abstract job instance processor implementation that produces target entities via a INSERT-SELECT statement. diff --git a/schedule/spring/src/main/java/com/blazebit/job/schedule/spring/TriggerSchedule.java b/schedule/spring/src/main/java/com/blazebit/job/schedule/spring/TriggerSchedule.java index 9f1e21b..d9b0a43 100644 --- a/schedule/spring/src/main/java/com/blazebit/job/schedule/spring/TriggerSchedule.java +++ b/schedule/spring/src/main/java/com/blazebit/job/schedule/spring/TriggerSchedule.java @@ -17,6 +17,7 @@ import com.blazebit.job.Schedule; import com.blazebit.job.ScheduleContext; +import java.time.Instant; import org.springframework.scheduling.Trigger; import org.springframework.scheduling.TriggerContext; @@ -75,15 +76,30 @@ public Date lastScheduledExecutionTime() { return new Date(delegate.getLastScheduleTime()); } + @Override + public Instant lastScheduledExecution() { + return Instant.ofEpochMilli(delegate.getLastScheduleTime()); + } + @Override public Date lastActualExecutionTime() { return new Date(delegate.getLastExecutionTime()); } + @Override + public Instant lastActualExecution() { + return Instant.ofEpochMilli(delegate.getLastExecutionTime()); + } + @Override public Date lastCompletionTime() { return new Date(delegate.getLastCompletionTime()); } + + @Override + public Instant lastCompletion() { + return Instant.ofEpochMilli(delegate.getLastCompletionTime()); + } } } diff --git a/transaction/jpa/pom.xml b/transaction/jpa/pom.xml index b032f30..d8beae0 100644 --- a/transaction/jpa/pom.xml +++ b/transaction/jpa/pom.xml @@ -16,9 +16,8 @@ - javax - javaee-api - provided + jakarta.persistence + jakarta.persistence-api ${project.groupId} @@ -77,4 +76,4 @@ - \ No newline at end of file + diff --git a/transaction/jpa/src/main/java/com/blazebit/job/transaction/jpa/JpaTransactionSupport.java b/transaction/jpa/src/main/java/com/blazebit/job/transaction/jpa/JpaTransactionSupport.java index 19ec8d7..956969d 100644 --- a/transaction/jpa/src/main/java/com/blazebit/job/transaction/jpa/JpaTransactionSupport.java +++ b/transaction/jpa/src/main/java/com/blazebit/job/transaction/jpa/JpaTransactionSupport.java @@ -19,8 +19,8 @@ import com.blazebit.job.JobContext; import com.blazebit.job.spi.TransactionSupport; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; diff --git a/transaction/jta/pom.xml b/transaction/jta/pom.xml index 9fcdaf4..a0780f2 100644 --- a/transaction/jta/pom.xml +++ b/transaction/jta/pom.xml @@ -16,9 +16,8 @@ - javax - javaee-api - provided + jakarta.transaction + jakarta.transaction-api ${project.groupId} @@ -82,4 +81,4 @@ - \ No newline at end of file + diff --git a/transaction/jta/src/main/java/com/blazebit/job/transaction/javaee/JtaResources.java b/transaction/jta/src/main/java/com/blazebit/job/transaction/javaee/JtaResources.java index 1313580..2ebcbeb 100644 --- a/transaction/jta/src/main/java/com/blazebit/job/transaction/javaee/JtaResources.java +++ b/transaction/jta/src/main/java/com/blazebit/job/transaction/javaee/JtaResources.java @@ -18,9 +18,9 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; /** * A holder of JTA resources. diff --git a/transaction/jta/src/main/java/com/blazebit/job/transaction/javaee/JtaTransactionSupport.java b/transaction/jta/src/main/java/com/blazebit/job/transaction/javaee/JtaTransactionSupport.java index ac40f4c..ca200cb 100644 --- a/transaction/jta/src/main/java/com/blazebit/job/transaction/javaee/JtaTransactionSupport.java +++ b/transaction/jta/src/main/java/com/blazebit/job/transaction/javaee/JtaTransactionSupport.java @@ -20,11 +20,11 @@ import com.blazebit.job.JobContext; import com.blazebit.job.spi.TransactionSupport; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.Consumer;