Skip to content

Commit 9d7e41f

Browse files
v-rudkovskiyv-rudkovskiy
authored
Modernize release flow
1 parent cb63c3a commit 9d7e41f

File tree

3 files changed

+57
-27
lines changed

3 files changed

+57
-27
lines changed

‎NetLicensingClient-demo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.labs64.netlicensing</groupId>
88
<artifactId>netlicensing-client-parent</artifactId>
9-
<version>2.10.0-SNAPSHOT</version>
9+
<version>${revision}</version>
1010
</parent>
1111

1212
<artifactId>netlicensing-client-demo</artifactId>

‎NetLicensingClient/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.labs64.netlicensing</groupId>
88
<artifactId>netlicensing-client-parent</artifactId>
9-
<version>2.10.0-SNAPSHOT</version>
9+
<version>${revision}</version>
1010
</parent>
1111

1212
<artifactId>netlicensing-client</artifactId>

‎pom.xml‎

Lines changed: 55 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<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">
33

44
<modelVersion>4.0.0</modelVersion>
5-
65
<groupId>com.labs64.netlicensing</groupId>
76
<artifactId>netlicensing-client-parent</artifactId>
8-
<version>2.10.0-SNAPSHOT</version>
7+
<version>${revision}</version>
98
<packaging>pom</packaging>
109
<name>Labs64 :: NetLicensing :: Client :: Parent</name>
1110
<url>https://netlicensing.io</url>
@@ -64,6 +63,7 @@
6463
</modules>
6564

6665
<properties>
66+
<revision>2.10.0-SNAPSHOT</revision>
6767
<project.title>${project.name}</project.title>
6868
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6969

@@ -90,8 +90,7 @@
9090
<!-- plugin.version>0.0.0</plugin.version -->
9191
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
9292
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
93-
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
94-
<nexus-staging-maven-plugin.version>1.6.12</nexus-staging-maven-plugin.version>
93+
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
9594
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
9695
<maven-site-plugin.version>3.11.0</maven-site-plugin.version>
9796
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
@@ -112,6 +111,8 @@
112111
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
113112
<spotbugs-maven-plugin.version>4.6.0.0</spotbugs-maven-plugin.version>
114113
<maven-pmd-plugin.version>3.16.0</maven-pmd-plugin.version>
114+
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
115+
<maven-scm-plugin.version>1.13.0</maven-scm-plugin.version>
115116
</properties>
116117

117118
<build>
@@ -188,26 +189,10 @@
188189
<target>${java.version}</target>
189190
</configuration>
190191
</plugin>
191-
<plugin>
192-
<groupId>org.apache.maven.plugins</groupId>
193-
<artifactId>maven-release-plugin</artifactId>
194-
<version>${maven-release-plugin.version}</version>
195-
<configuration>
196-
<useReleaseProfile>false</useReleaseProfile>
197-
<releaseProfiles>release</releaseProfiles>
198-
<goals>deploy</goals>
199-
</configuration>
200-
</plugin>
201192
<plugin>
202193
<groupId>org.sonatype.plugins</groupId>
203194
<artifactId>nexus-staging-maven-plugin</artifactId>
204195
<version>${nexus-staging-maven-plugin.version}</version>
205-
<extensions>true</extensions>
206-
<configuration>
207-
<serverId>ossrh</serverId>
208-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
209-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
210-
</configuration>
211196
</plugin>
212197
<plugin>
213198
<groupId>org.apache.maven.plugins</groupId>
@@ -379,6 +364,15 @@
379364
</dependency>
380365
</dependencies>
381366
</plugin>
367+
<plugin>
368+
<groupId>org.codehaus.mojo</groupId>
369+
<artifactId>flatten-maven-plugin</artifactId>
370+
<version>${flatten-maven-plugin.version}</version>
371+
</plugin>
372+
<plugin>
373+
<artifactId>maven-scm-plugin</artifactId>
374+
<version>${maven-scm-plugin.version}</version>
375+
</plugin>
382376
</plugins>
383377
</pluginManagement>
384378

@@ -391,6 +385,37 @@
391385
<groupId>org.apache.maven.plugins</groupId>
392386
<artifactId>maven-site-plugin</artifactId>
393387
</plugin>
388+
<plugin>
389+
<groupId>org.codehaus.mojo</groupId>
390+
<artifactId>flatten-maven-plugin</artifactId>
391+
<executions>
392+
<execution>
393+
<id>flatten</id>
394+
<phase>process-resources</phase>
395+
<goals>
396+
<goal>flatten</goal>
397+
</goals>
398+
</execution>
399+
<execution>
400+
<id>flatten.clean</id>
401+
<phase>clean</phase>
402+
<goals>
403+
<goal>clean</goal>
404+
</goals>
405+
</execution>
406+
</executions>
407+
<configuration>
408+
<updatePomFile>true</updatePomFile>
409+
<flattenMode>ossrh</flattenMode>
410+
<outputDirectory>${project.build.directory}</outputDirectory>
411+
</configuration>
412+
</plugin>
413+
<plugin>
414+
<artifactId>maven-scm-plugin</artifactId>
415+
<configuration>
416+
<tag>${project.version}</tag>
417+
</configuration>
418+
</plugin>
394419
</plugins>
395420
</build>
396421

@@ -519,11 +544,6 @@
519544
<artifactId>maven-javadoc-plugin</artifactId>
520545
</plugin>
521546
<plugin>
522-
<groupId>org.sonatype.plugins</groupId>
523-
<artifactId>nexus-staging-maven-plugin</artifactId>
524-
</plugin>
525-
<plugin>
526-
<groupId>org.apache.maven.plugins</groupId>
527547
<artifactId>maven-gpg-plugin</artifactId>
528548
<executions>
529549
<execution>
@@ -542,6 +562,16 @@
542562
</execution>
543563
</executions>
544564
</plugin>
565+
<plugin>
566+
<groupId>org.sonatype.plugins</groupId>
567+
<artifactId>nexus-staging-maven-plugin</artifactId>
568+
<extensions>true</extensions>
569+
<configuration>
570+
<serverId>ossrh</serverId>
571+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
572+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
573+
</configuration>
574+
</plugin>
545575
</plugins>
546576
</build>
547577
<distributionManagement>

0 commit comments

Comments
 (0)