fix: make fetching closest git tag work
This commit is contained in:
parent
d4122402b4
commit
ea3776e485
28
pom.xml
28
pom.xml
@ -8,7 +8,7 @@
|
|||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
<name>GhydraMCP</name>
|
<name>GhydraMCP</name>
|
||||||
<url>https://github.com/teal-bauer/GhydraMCP</url>
|
<url>https://github.com/starsong-consulting/GhydraMCP</url>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
@ -99,14 +99,14 @@
|
|||||||
<plugins>
|
<plugins>
|
||||||
<!-- Set Java version -->
|
<!-- Set Java version -->
|
||||||
<!-- Resources plugin to handle filtering -->
|
<!-- Resources plugin to handle filtering -->
|
||||||
<plugin>
|
<!-- <plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
<version>3.3.1</version>
|
<version>3.3.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin> -->
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@ -115,16 +115,15 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<source>21</source>
|
<source>21</source>
|
||||||
<target>21</target>
|
<target>21</target>
|
||||||
<!-- Ignore warning about system paths -->
|
|
||||||
<compilerArgument>-Xlint:-path</compilerArgument>
|
<compilerArgument>-Xlint:-path</compilerArgument>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- Git Commit ID plugin to generate version from git -->
|
<!-- Git Commit ID plugin to generate version info -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.github.git-commit-id</groupId>
|
<groupId>io.github.git-commit-id</groupId>
|
||||||
<artifactId>git-commit-id-maven-plugin</artifactId>
|
<artifactId>git-commit-id-maven-plugin</artifactId>
|
||||||
<version>5.0.0</version>
|
<version>9.0.1</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>get-git-info</id>
|
<id>get-git-info</id>
|
||||||
@ -135,19 +134,16 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
<gitDescribe>
|
||||||
|
<tags>true</tags>
|
||||||
|
</gitDescribe>
|
||||||
<generateGitPropertiesFile>true</generateGitPropertiesFile>
|
<generateGitPropertiesFile>true</generateGitPropertiesFile>
|
||||||
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
|
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
|
||||||
<includeOnlyProperties>
|
|
||||||
<includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
|
|
||||||
<includeOnlyProperty>git.commit.time</includeOnlyProperty>
|
|
||||||
<includeOnlyProperty>git.closest.tag.name</includeOnlyProperty>
|
|
||||||
<includeOnlyProperty>git.build.version</includeOnlyProperty>
|
|
||||||
</includeOnlyProperties>
|
|
||||||
<commitIdGenerationMode>full</commitIdGenerationMode>
|
<commitIdGenerationMode>full</commitIdGenerationMode>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- Set revision property from git info -->
|
<!-- Simplified version naming - use tag if available, otherwise commit+dirty -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
@ -161,9 +157,9 @@
|
|||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<name>revision</name>
|
<name>revision</name>
|
||||||
<value>${git.commit.id.abbrev}-${maven.build.timestamp}</value>
|
<value>${git.closest.tag.name}</value>
|
||||||
<regex>.*</regex>
|
<regex>^$</regex>
|
||||||
<replacement>$0</replacement>
|
<replacement>${git.commit.id.abbrev}${git.dirty ? "-dirty" : ""}</replacement>
|
||||||
<failIfNoMatch>false</failIfNoMatch>
|
<failIfNoMatch>false</failIfNoMatch>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user