Haiti/haiti-framework
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Переход на jakarta

Browse Source
This commit is contained in:
Struchkov Mark 2023-05-16 16:30:54 +03:00
parent 72f111f97f
commit d33621afcc
Signed by: upagge
GPG Key ID: D3018BE7BA428CA6
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.drone.yml
View File

@ -15,7 +15,7 @@ volumes:
steps: steps:
- name: publish - name: publish
image: maven:3.8.5-openjdk-17 image: maven:3.9-eclipse-temurin-17-alpine
privileged: true privileged: true
volumes: volumes:
- name: m2 - name: m2
@ -44,7 +44,7 @@ volumes:
steps: steps:
- name: publish maven central - name: publish maven central
image: maven:3.8.5-openjdk-17 image: maven:3.9-eclipse-temurin-17-alpine
privileged: true privileged: true
volumes: volumes:
- name: m2 - name: m2
@ -79,7 +79,7 @@ volumes:
steps: steps:
- name: publish struchkov nexus - name: publish struchkov nexus
image: maven:3.8.5-openjdk-17 image: maven:3.9-eclipse-temurin-17-alpine
privileged: true privileged: true
volumes: volumes:
- name: m2 - name: m2
@ -98,6 +98,6 @@ steps:
- mvn --settings maven-settings.xml -U -P ossrh,release-struchkov-nexus clean deploy - mvn --settings maven-settings.xml -U -P ossrh,release-struchkov-nexus clean deploy
--- ---
kind: signature kind: signature
hmac: 43c584bfa9959fef91227a75238af6f91762f0e91472c8eaafaa8b1139c18b0e hmac: 87bc14ee1077bf556a2945e4ada98f119cdb225b0d0e4ddd81bea93bc6191613
... ...

2
haiti-exception/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.haiti</groupId> <groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-dependencies</artifactId> <artifactId>haiti-dependencies</artifactId>
<version>2.7.3-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>haiti-exception</artifactId> <artifactId>haiti-exception</artifactId>

2
haiti-utils/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.haiti</groupId> <groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-dependencies</artifactId> <artifactId>haiti-dependencies</artifactId>
<version>2.7.3-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<name>Haiti Utils</name> <name>Haiti Utils</name>

36
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>dev.struchkov.haiti</groupId> <groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-dependencies</artifactId> <artifactId>haiti-dependencies</artifactId>
<version>2.7.3-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Haiti Framework</name> <name>Haiti Framework</name>
@ -27,22 +27,31 @@
</modules> </modules>
<properties> <properties>
<java.version>11</java.version> <java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<javax.persistence.api.version>2.2</javax.persistence.api.version> <!-- https://mvnrepository.com/artifact/jakarta.persistence/jakarta.persistence-api -->
<jakarta.persistence.version>3.1.0</jakarta.persistence.version>
<!-- https://mvnrepository.com/artifact/com.google.auto.service/auto-service -->
<google.auto.service.version>1.0.1</google.auto.service.version> <google.auto.service.version>1.0.1</google.auto.service.version>
<slf4j.api.version>2.0.6</slf4j.api.version> <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<slf4j.api.version>2.0.7</slf4j.api.version>
<plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver> <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
<plugin.maven.compiler.ver>3.11.0</plugin.maven.compiler.ver>
<!-- https://mvnrepository.com/artifact/org.sonatype.plugins/nexus-staging-maven-plugin -->
<plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver> <plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-source-plugin -->
<plugin.maven.source.ver>3.2.1</plugin.maven.source.ver> <plugin.maven.source.ver>3.2.1</plugin.maven.source.ver>
<plugin.maven.javadoc.ver>3.4.0</plugin.maven.javadoc.ver> <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-javadoc-plugin -->
<plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver> <plugin.maven.javadoc.ver>3.5.0</plugin.maven.javadoc.ver>
<plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver> <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-gpg-plugin -->
<plugin.maven.gpg.ver>3.1.0</plugin.maven.gpg.ver>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
<plugin.maven.release.ver>3.0.0</plugin.maven.release.ver>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -50,19 +59,20 @@
<dependency> <dependency>
<groupId>dev.struchkov.haiti</groupId> <groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-exception</artifactId> <artifactId>haiti-exception</artifactId>
<version>2.7.3-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dev.struchkov.haiti</groupId> <groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-utils</artifactId> <artifactId>haiti-utils</artifactId>
<version>2.7.3-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.persistence</groupId> <groupId>jakarta.persistence</groupId>
<artifactId>javax.persistence-api</artifactId> <artifactId>jakarta.persistence-api</artifactId>
<version>${javax.persistence.api.version}</version> <version>${jakarta.persistence.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.auto.service</groupId> <groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId> <artifactId>auto-service</artifactId>