Added gitflow plugin to the correct pom

Scaseco · May 25, 2024 · ded0707 · ded0707
1 parent e95a673
commit ded0707
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 56 deletions.
diff --git a/lsq-maven-plugin/pom.xml b/lsq-maven-plugin/pom.xml
@@ -73,17 +73,6 @@
 
 	<reporting>
 		<plugins>
-                        <plugin>
-                                <groupId>com.amashchenko.maven.plugin</groupId>
-                                <artifactId>gitflow-maven-plugin</artifactId>
-                                <version>${gitflow-maven-plugin.version}</version>
-                                <configuration>
-                                        <gitFlowConfig>
-                                                <versionTagPrefix>v</versionTagPrefix>
-						<productionBranch>main</productionBranch>
-                                        </gitFlowConfig>
-                                </configuration>
-                        </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -202,49 +191,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
-	<profiles>
-		<profile>
-			<id>release</id>
-			<activation>
-				<property>
-					<name>performRelease</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-								<configuration>
-									<keyname>AKSW</keyname>
-									<passphraseServerId>${gpg.keyname}</passphraseServerId>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.13</version>
-						<extensions>true</extensions>
-						<configuration>
-							<serverId>ossrh</serverId>
-							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-							<autoReleaseAfterClose>true</autoReleaseAfterClose>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -54,6 +54,7 @@
 		<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
 
 		<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
+		<gitflow-maven-plugin.version>1.9.0</gitflow-maven-plugin.version>
 	</properties>
 
 	<licenses>
@@ -78,6 +79,19 @@
 	</developers>
 
 	<build>
+		<plugins>
+		        <plugin>
+                                <groupId>com.amashchenko.maven.plugin</groupId>
+                                <artifactId>gitflow-maven-plugin</artifactId>
+                                <version>${gitflow-maven-plugin.version}</version>
+                                <configuration>
+                                        <gitFlowConfig>
+                                                <versionTagPrefix>v</versionTagPrefix>
+						<productionBranch>main</productionBranch>
+                                        </gitFlowConfig>
+                                </configuration>
+                        </plugin>
+		</plugins>
 		<pluginManagement>
 			<plugins>
 				<plugin>