Add metadata related to builds and commits

- removing the build-info goal from the existing spring-boot-maven-plugin
- adding git-commit-id-maven-plugin to expose the git related info using
  actuator/info endpoint
- adding the dateFormat to git plugin to make it same as the build-info
- cleaning up a duplicate dependency in cps-ncmp-rest-stub module

Issue-ID: CPS-2445
Change-Id: Id7179a81361718d293b7b31f50c1adbdd2ad4302
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index c374473..08c7181 100644 (file)
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -172,6 +172,30 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>get-git-info</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dateFormat>yyyy-MM-dd'T'HH:mm:ss.sss'Z'</dateFormat>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.(id.full|message.short|user.name|user.email)$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.branch</includeOnlyProperty>
+                    </includeOnlyProperties>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                    <commitIdGenerationMode>full</commitIdGenerationMode>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 3789e92..d7e39f7 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -180,6 +180,11 @@ management:
             probes:
                 enabled: true
 
+    info:
+        git:
+            enabled: true
+            mode: full
+
 logging:
     format: json
     level:

diff --git a/cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml b/cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml
index 1fcea8f..aa7e1fb 100644 (file)
--- a/cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml
+++ b/cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml
@@ -63,11 +63,6 @@
             <artifactId>spock-spring</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     
 </project>
\ No newline at end of file

diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index f97a40b..a83278d 100644 (file)
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -122,12 +122,25 @@
                     <executions>
                         <execution>
                             <goals>
-                                <goal>build-info</goal>
                                 <goal>repackage</goal>
                             </goals>
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>io.github.git-commit-id</groupId>
+                    <artifactId>git-commit-id-maven-plugin</artifactId>
+                    <version>9.0.0</version>
+                    <executions>
+                        <execution>
+                            <id>get-git-info</id>
+                            <goals>
+                                <goal>revision</goal>
+                            </goals>
+                            <phase>package</phase>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>