diff --git a/.drone.yml b/.drone.yml index 1fd8b27..64ce215 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ volumes: steps: - name: publish - image: maven:3.8.5-openjdk-17 + image: maven:3.9-eclipse-temurin-17-alpine privileged: true volumes: - name: m2 @@ -44,7 +44,7 @@ volumes: steps: - name: publish maven central - image: maven:3.8.5-openjdk-17 + image: maven:3.9-eclipse-temurin-17-alpine privileged: true volumes: - name: m2 @@ -57,6 +57,7 @@ steps: GPG_PASSPHRASE: from_secret: GPG_PASSPHRASE commands: + - apk add gnupg - echo "$GPG_PRIVATE_KEY" >> gpg.key - echo "$MAVEN_SETTINGS" >> maven-settings.xml - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import gpg.key @@ -79,7 +80,7 @@ volumes: steps: - name: publish struchkov nexus - image: maven:3.8.5-openjdk-17 + image: maven:3.9-eclipse-temurin-17-alpine privileged: true volumes: - name: m2 @@ -92,12 +93,13 @@ steps: GPG_PASSPHRASE: from_secret: GPG_PASSPHRASE commands: + - apk add gnupg - echo "$GPG_PRIVATE_KEY" >> gpg.key - echo "$MAVEN_SETTINGS" >> maven-settings.xml - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import gpg.key - mvn --settings maven-settings.xml -U -P ossrh,release-struchkov-nexus clean deploy --- kind: signature -hmac: ef2fc291eccd3ad61a646b5fc652e09d6fd7ae10714b35aa6bf147a52529e8e0 +hmac: 4f46a8db7f63cc0cec9e91d01212852b0d70d8eb0f6dd2a3df457ea76c4b6762 ... diff --git a/pom.xml b/pom.xml index 27e9cd0..faa7fe3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ dev.struchkov.haiti haiti-dependencies - 2.7.2 + 3.0.0-SNAPSHOT dev.struchkov.haiti.utils haiti-utils-field-constants - 0.0.12-SNAPSHOT + 1.0.0-SNAPSHOT Haiti Field Name Constants Utils Generating class field names @@ -33,8 +33,8 @@ haiti-utils - javax.persistence - javax.persistence-api + jakarta.persistence + jakarta.persistence-api com.google.auto.service @@ -52,7 +52,7 @@ com.google.auto.service auto-service - 1.0.1 + ${google.auto.service.version} diff --git a/src/main/java/dev/struchkov/haiti/utils/fieldconstants/generator/GeneratorTableMode.java b/src/main/java/dev/struchkov/haiti/utils/fieldconstants/generator/GeneratorTableMode.java index 30c40ba..a56f362 100644 --- a/src/main/java/dev/struchkov/haiti/utils/fieldconstants/generator/GeneratorTableMode.java +++ b/src/main/java/dev/struchkov/haiti/utils/fieldconstants/generator/GeneratorTableMode.java @@ -11,13 +11,13 @@ import dev.struchkov.haiti.utils.fieldconstants.domain.mode.table.JoinFieldDto; import dev.struchkov.haiti.utils.fieldconstants.domain.mode.table.JoinTableContainer; import dev.struchkov.haiti.utils.fieldconstants.domain.mode.table.SimpleTableFieldDto; import dev.struchkov.haiti.utils.fieldconstants.util.Generator; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Table; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Table; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 5d6736f..28ed022 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -6,6 +6,6 @@ module haiti.utils.fieldconstants { requires java.compiler; requires com.google.auto.service; - requires java.persistence; + requires jakarta.persistence; requires haiti.utils; } \ No newline at end of file