переход на jakarta

.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
 
 ...

pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>dev.struchkov.haiti</groupId>
         <artifactId>haiti-dependencies</artifactId>
-        <version>2.7.2</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>dev.struchkov.haiti.utils</groupId>
     <artifactId>haiti-utils-field-constants</artifactId>
-    <version>0.0.12-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <name>Haiti Field Name Constants Utils</name>
     <description>Generating class field names</description>
@@ -33,8 +33,8 @@
             <artifactId>haiti-utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.auto.service</groupId>
@@ -52,7 +52,7 @@
                         <path>
                             <groupId>com.google.auto.service</groupId>
                             <artifactId>auto-service</artifactId>
-                            <version>1.0.1</version>
+                            <version>${google.auto.service.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

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;

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;
 }