From 7bab16db21bb0a8f924b0424ef098ce5462c5ff9 Mon Sep 17 00:00:00 2001
From: kameshsr <kameshsr1338@gmail.com>
Date: Wed, 16 Oct 2024 16:12:15 +0530
Subject: [PATCH] MOSIP-30443 Corrected git commit id plugin

Signed-off-by: kameshsr <kameshsr1338@gmail.com>
---
 .../pom.xml                                   |  2 +-
 authentication/authentication-common/pom.xml  | 29 +++++++++++++++++++
 authentication/authentication-core/pom.xml    | 29 +++++++++++++++++++
 .../authentication-filter-api/pom.xml         |  3 +-
 .../authentication-hotlistfilter-impl/pom.xml |  3 +-
 .../authentication-internal-service/pom.xml   | 25 ++++++++++++++++
 .../authentication-otp-service/pom.xml        | 25 ++++++++++++++++
 authentication/authentication-service/pom.xml | 25 ++++++++++++++++
 8 files changed, 136 insertions(+), 5 deletions(-)

diff --git a/authentication/authentication-authtypelockfilter-impl/pom.xml b/authentication/authentication-authtypelockfilter-impl/pom.xml
index 96b67740f1..295ab5f5c1 100644
--- a/authentication/authentication-authtypelockfilter-impl/pom.xml
+++ b/authentication/authentication-authtypelockfilter-impl/pom.xml
@@ -460,7 +460,7 @@
  			</executions>
  			<configuration>
 				<generateGitPropertiesFile>true</generateGitPropertiesFile>
-				<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+				<generateGitPropertiesFilename>git.properties</generateGitPropertiesFilename>
                     		<includeOnlyProperties>
                         		<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
                         		<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
diff --git a/authentication/authentication-common/pom.xml b/authentication/authentication-common/pom.xml
index 0c424e1169..15fd3667a7 100644
--- a/authentication/authentication-common/pom.xml
+++ b/authentication/authentication-common/pom.xml
@@ -261,4 +261,33 @@
 			<artifactId>spring-batch-infrastructure</artifactId>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>3.0.1</version>
+				<executions>
+					<execution>
+						<id>get-the-git-infos</id>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+						<phase>validate</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<generateGitPropertiesFile>true</generateGitPropertiesFile>
+					<generateGitPropertiesFilename>git.properties</generateGitPropertiesFilename>
+					<includeOnlyProperties>
+						<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+						<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+					</includeOnlyProperties>
+					<commitIdGenerationMode>full</commitIdGenerationMode>
+					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+					<!-- <format>json</format> -->
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/authentication/authentication-core/pom.xml b/authentication/authentication-core/pom.xml
index e630e10cde..2c359ba5e2 100644
--- a/authentication/authentication-core/pom.xml
+++ b/authentication/authentication-core/pom.xml
@@ -178,4 +178,33 @@
 			</exclusions>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>3.0.1</version>
+				<executions>
+					<execution>
+						<id>get-the-git-infos</id>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+						<phase>validate</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<generateGitPropertiesFile>true</generateGitPropertiesFile>
+					<generateGitPropertiesFilename>git.properties</generateGitPropertiesFilename>
+					<includeOnlyProperties>
+						<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+						<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+					</includeOnlyProperties>
+					<commitIdGenerationMode>full</commitIdGenerationMode>
+					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+					<!-- <format>json</format> -->
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/authentication/authentication-filter-api/pom.xml b/authentication/authentication-filter-api/pom.xml
index de2dd5f18f..c4397464ea 100644
--- a/authentication/authentication-filter-api/pom.xml
+++ b/authentication/authentication-filter-api/pom.xml
@@ -381,7 +381,7 @@
  			</executions>
  			<configuration>
 				<generateGitPropertiesFile>true</generateGitPropertiesFile>
-				<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+				<generateGitPropertiesFilename>git.properties</generateGitPropertiesFilename>
                     		<includeOnlyProperties>
                         		<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
                         		<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
@@ -413,5 +413,4 @@
                   <organizationUrl>https://github.com/mosip/commons</organizationUrl>
                 </developer>
         </developers>
-		
 	</project>
diff --git a/authentication/authentication-hotlistfilter-impl/pom.xml b/authentication/authentication-hotlistfilter-impl/pom.xml
index 5dcdecfd4f..816268a461 100644
--- a/authentication/authentication-hotlistfilter-impl/pom.xml
+++ b/authentication/authentication-hotlistfilter-impl/pom.xml
@@ -460,7 +460,7 @@
  			</executions>
  			<configuration>
 				<generateGitPropertiesFile>true</generateGitPropertiesFile>
-				<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+				<generateGitPropertiesFilename>git.properties</generateGitPropertiesFilename>
                     		<includeOnlyProperties>
                         		<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
                         		<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
@@ -492,5 +492,4 @@
                   <organizationUrl>https://github.com/mosip/commons</organizationUrl>
                 </developer>
         </developers>
-		
 	</project>
diff --git a/authentication/authentication-internal-service/pom.xml b/authentication/authentication-internal-service/pom.xml
index 99e72f7799..6eb5c5ec9c 100644
--- a/authentication/authentication-internal-service/pom.xml
+++ b/authentication/authentication-internal-service/pom.xml
@@ -277,6 +277,31 @@
 					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
+					<plugin>
+						<groupId>pl.project13.maven</groupId>
+						<artifactId>git-commit-id-plugin</artifactId>
+						<version>3.0.1</version>
+						<executions>
+							<execution>
+								<id>get-the-git-infos</id>
+								<goals>
+									<goal>revision</goal>
+								</goals>
+								<phase>validate</phase>
+							</execution>
+						</executions>
+						<configuration>
+							<generateGitPropertiesFile>true</generateGitPropertiesFile>
+							<generateGitPropertiesFilename>${project.build.outputDirectory}/service-git.properties</generateGitPropertiesFilename>
+							<includeOnlyProperties>
+								<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+								<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+							</includeOnlyProperties>
+							<commitIdGenerationMode>full</commitIdGenerationMode>
+							<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+							<!-- <format>json</format> -->
+						</configuration>
+					</plugin>
 		</plugins>
 	</build>
 	<profiles>
diff --git a/authentication/authentication-otp-service/pom.xml b/authentication/authentication-otp-service/pom.xml
index 2a1ed63ec5..9697b7c7d4 100644
--- a/authentication/authentication-otp-service/pom.xml
+++ b/authentication/authentication-otp-service/pom.xml
@@ -201,6 +201,31 @@
 					</execution>
 				</executions>
 			</plugin>
+					<plugin>
+						<groupId>pl.project13.maven</groupId>
+						<artifactId>git-commit-id-plugin</artifactId>
+						<version>3.0.1</version>
+						<executions>
+							<execution>
+								<id>get-the-git-infos</id>
+								<goals>
+									<goal>revision</goal>
+								</goals>
+								<phase>validate</phase>
+							</execution>
+						</executions>
+						<configuration>
+							<generateGitPropertiesFile>true</generateGitPropertiesFile>
+							<generateGitPropertiesFilename>${project.build.outputDirectory}/service-git.properties</generateGitPropertiesFilename>
+							<includeOnlyProperties>
+								<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+								<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+							</includeOnlyProperties>
+							<commitIdGenerationMode>full</commitIdGenerationMode>
+							<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+							<!-- <format>json</format> -->
+						</configuration>
+					</plugin>
 		</plugins>
 	</build>
 
diff --git a/authentication/authentication-service/pom.xml b/authentication/authentication-service/pom.xml
index ce8f102a14..a1a8c19e5f 100644
--- a/authentication/authentication-service/pom.xml
+++ b/authentication/authentication-service/pom.xml
@@ -329,6 +329,31 @@
                     </execution>
                 </executions>
             </plugin>
+                    <plugin>
+                        <groupId>pl.project13.maven</groupId>
+                        <artifactId>git-commit-id-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <id>get-the-git-infos</id>
+                                <goals>
+                                    <goal>revision</goal>
+                                </goals>
+                                <phase>validate</phase>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                            <generateGitPropertiesFilename>${project.build.outputDirectory}/service-git.properties</generateGitPropertiesFilename>
+                            <includeOnlyProperties>
+                                <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                                <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+                            </includeOnlyProperties>
+                            <commitIdGenerationMode>full</commitIdGenerationMode>
+                            <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                            <!-- <format>json</format> -->
+                        </configuration>
+                    </plugin>
         </plugins>
     </build>
     <profiles>