From 020f108f07731af77750b3829c8d6c26c0732a94 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Sat, 17 Dec 2022 16:30:05 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                 |  18 +++++
 haiti-external-bom/pom.xml | 156 -------------------------------------
 pom.xml                    |  32 +++++---
 3 files changed, 40 insertions(+), 166 deletions(-)
 delete mode 100644 haiti-external-bom/pom.xml

diff --git a/.drone.yml b/.drone.yml
index a06e156..62ba031 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,6 +4,24 @@ name: haiti-framework
 
 steps:
 
+  - name: publish external bom
+    image: maven:3.8.6-openjdk-11
+    volumes:
+      - name: m2
+        path: /root/.m2/repository
+    environment:
+      GPG_PRIVATE_KEY:
+        from_secret: GPG_PRIVATE_KEY
+      MAVEN_SETTINGS:
+        from_secret: MAVEN_SETTINGS
+      GPG_PASSPHRASE:
+        from_secret: GPG_PASSPHRASE
+    commands:
+      - 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 clean deploy
+
   - name: publish
     image: maven:3.8.6-openjdk-11
     volumes:
diff --git a/haiti-external-bom/pom.xml b/haiti-external-bom/pom.xml
deleted file mode 100644
index 908946d..0000000
--- a/haiti-external-bom/pom.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>dev.struchkov.haiti</groupId>
-    <artifactId>haiti-external-bom</artifactId>
-    <version>2.2.0</version>
-    <packaging>pom</packaging>
-
-    <name>Haiti External Dependencies</name>
-    <description>External dependencies required for Haiti components</description>
-    <url>https://github.com/haiti-projects/haiti-framework</url>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/haiti-projects/haiti-framework/issues</url>
-    </issueManagement>
-
-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <javax.persistence.api.version>2.2</javax.persistence.api.version>
-        <google.auto.service.version>1.0.1</google.auto.service.version>
-        <slf4j.api.version>2.0.6</slf4j.api.version>
-
-        <plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver>
-        <plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver>
-        <plugin.maven.source.ver>3.2.1</plugin.maven.source.ver>
-        <plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>javax.persistence</groupId>
-                <artifactId>javax.persistence-api</artifactId>
-                <version>${javax.persistence.api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.auto.service</groupId>
-                <artifactId>auto-service</artifactId>
-                <version>${google.auto.service.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.api.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${plugin.maven.compiler.ver}</version>
-                    <configuration>
-                        <source>${maven.compiler.source}</source>
-                        <target>${maven.compiler.target}</target>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${plugin.nexus.staging.ver}</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>${plugin.maven.source.ver}</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${plugin.maven.gpg.ver}</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <scm>
-        <connection>scm:git:https://github.com/haiti-projects/haiti-framework.git</connection>
-        <url>https://github.com/haiti-projects/haiti-framework</url>
-        <developerConnection>scm:git:https://github.com/haiti-projects/haiti-framework.git</developerConnection>
-    </scm>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <developers>
-        <developer>
-            <id>uPagge</id>
-            <name>Struchkov Mark</name>
-            <email>mark@struchkov.dev</email>
-            <url>https://mark.struchkov.dev</url>
-        </developer>
-    </developers>
-
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5c4046b..518f67a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>dev.struchkov.haiti</groupId>
     <artifactId>haiti-dependencies</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
     <packaging>pom</packaging>
 
     <name>Haiti Framework</name>
@@ -35,13 +35,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <haiti.ver>2.3.0</haiti.ver>
-        <haiti.external.ver>2.2.0</haiti.external.ver>
+        <haiti.ver>2.3.1</haiti.ver>
         <haiti.exception.ver>${haiti.ver}</haiti.exception.ver>
         <haiti.context.ver>${haiti.ver}</haiti.context.ver>
         <haiti.filter.api.ver>${haiti.ver}</haiti.filter.api.ver>
         <haiti.utils.ver>${haiti.ver}</haiti.utils.ver>
 
+        <javax.persistence.api.version>2.2</javax.persistence.api.version>
+        <google.auto.service.version>1.0.1</google.auto.service.version>
+        <slf4j.api.version>2.0.6</slf4j.api.version>
+
         <plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver>
         <plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver>
         <plugin.maven.source.ver>3.2.1</plugin.maven.source.ver>
@@ -51,13 +54,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>dev.struchkov.haiti</groupId>
-                <artifactId>haiti-external-bom</artifactId>
-                <version>${haiti.external.ver}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>dev.struchkov.haiti</groupId>
                 <artifactId>haiti-exception</artifactId>
@@ -68,6 +64,22 @@
                 <artifactId>haiti-utils</artifactId>
                 <version>${haiti.utils.ver}</version>
             </dependency>
+
+            <dependency>
+                <groupId>javax.persistence</groupId>
+                <artifactId>javax.persistence-api</artifactId>
+                <version>${javax.persistence.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.auto.service</groupId>
+                <artifactId>auto-service</artifactId>
+                <version>${google.auto.service.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.api.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>