diff options
| author |   Toine Siebelink <toine.siebelink@est.tech> | 2024-10-29 18:01:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2024-10-29 18:01:09 +0000 |
| commit | 0e39cb260532a11bb8fea755ed775f0623fb8101 (patch) | |
| tree | 07d61ce3f54f4bc71699174c47ca75ce6e10faa0 | |
| parent | f120f1bc23569319adaaad9b8e73cf35a16759c4 (diff) | |
| parent | ff99139d82e9911e485f228bcd93e0d9b4d6a74b (diff) | |
Merge "Add metadata related to builds and commits"
| -rw-r--r-- | cps-application/pom.xml | 24 | ||||
| -rw-r--r-- | cps-application/src/main/resources/application.yml | 5 | ||||
| -rw-r--r-- | cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml | 5 | ||||
| -rw-r--r-- | cps-parent/pom.xml | 15 |
4 files changed, 43 insertions, 6 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml index c37447306c..08c718167e 100644 --- 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 3789e92b08..d7e39f7fae 100644 --- 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 1fcea8f567..aa7e1fb13a 100644 --- 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 f97a40b223..a83278d6cd 100644 --- a/cps-parent/pom.xml +++ b/cps-parent/pom.xml @@ -122,13 +122,26 @@ <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> <version>3.0.0-M5</version> |