next-version

2023-01-23 14:42:45 +03:00
2 changed files with 176 additions and 19 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,11 +1,51 @@
+---
 kind: pipeline
 type: docker
-name: haiti-framework
+name: snapshot-publish
+
+trigger:
+  branch:
+    - develop
+
+volumes:
+  - name: m2
+    host:
+      path: /drone/volume/m2
+
+steps:
+
+  - name: publish
+    image: maven:3.8.5-openjdk-17
+    privileged: true
+    volumes:
+      - name: m2
+        path: /root/.m2/repository
+    environment:
+      MAVEN_SETTINGS:
+        from_secret: MAVEN_SETTINGS
+    commands:
+      - echo "$MAVEN_SETTINGS" >> maven-settings.xml
+      - mvn --settings maven-settings.xml -U -P snapshot clean deploy
+
+---
+kind: pipeline
+type: docker
+name: release-maven-central
+
+trigger:
+  ref:
+    - refs/tags/v.*.*.*
+
+volumes:
+  - name: m2
+    host:
+      path: /drone/volume/m2

 steps:

  - name: publish maven central
-    image: maven:3.8.6-openjdk-11
+    image: maven:3.8.5-openjdk-17
+    privileged: true
    volumes:
      - name: m2
        path: /root/.m2/repository
@ -22,6 +62,11 @@ steps:
      - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import gpg.key
      - mvn --settings maven-settings.xml -U -P ossrh,release clean deploy

+---
+kind: pipeline
+type: docker
+name: release-struchkov-nexus
+
 trigger:
  ref:
    - refs/tags/v.*.*.*
@ -29,4 +74,30 @@ trigger:
 volumes:
  - name: m2
    host:
-      path: /drone/volume/m2
+      path: /drone/volume/m2
+
+steps:
+
+  - name: publish struchkov nexus
+    image: maven:3.8.5-openjdk-17
+    privileged: true
+    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-struchkov-nexus clean deploy
+---
+kind: signature
+hmac: 43c584bfa9959fef91227a75238af6f91762f0e91472c8eaafaa8b1139c18b0e
+
+...
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@

    <groupId>dev.struchkov.haiti</groupId>
    <artifactId>haiti-dependencies</artifactId>
-    <version>2.3.4</version>
+    <version>2.4.0-SNAPSHOT</version>
    <packaging>pom</packaging>

    <name>Haiti Framework</name>
@ -35,11 +35,9 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-        <haiti.ver>2.3.4</haiti.ver>
+        <haiti.ver>${project.version}</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>
@ -91,11 +89,6 @@
                    <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>
@ -150,6 +143,10 @@
        </pluginManagement>

        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
@ -173,6 +170,11 @@
                    <plugin>
                        <groupId>org.sonatype.plugins</groupId>
                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
                    </plugin>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
@ -189,21 +191,105 @@
                </plugins>
            </build>
        </profile>
+        <profile>
+            <id>release-struchkov-nexus</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <configuration>
+                            <serverId>struchkov-nexus</serverId>
+                            <nexusUrl>https://nexus.struchkov.dev/nexus/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                            <skipStaging>true</skipStaging>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>snapshot</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <configuration>
+                            <serverId>struchkov-nexus</serverId>
+                            <nexusUrl>https://nexus.struchkov.dev/nexus/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                    </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>
+    <repositories>
+        <repository>
+            <id>struchkov-nexus-release</id>
+            <url>https://nexus.struchkov.dev/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>struchkov-nexus-snapshot</id>
+            <url>https://nexus.struchkov.dev/repository/maven-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </snapshots>
+        </repository>
+    </repositories>

    <distributionManagement>
+        <repository>
+            <id>struchkov-nexus-release</id>
+            <url>https://nexus.struchkov.dev/repository/maven-releases/</url>
+        </repository>
        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <id>struchkov-nexus-snapshot</id>
+            <url>https://nexus.struchkov.dev/repository/maven-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>

+    <scm>
+        <connection>scm:git:https://git.struchkov.dev/Haiti/haiti-framework.git</connection>
+        <url>https://git.struchkov.dev/Haiti/haiti-framework</url>
+        <developerConnection>scm:git:https://git.struchkov.dev/Haiti/haiti-framework.git</developerConnection>
+    </scm>
+
    <developers>
        <developer>
            <id>uPagge</id>