Skip to content

Commit 40c349b

Browse files
committed
Use jgitver to set project version from git tags
Removing maven release plugin because releases can now be performed by pushing git tag to CI
1 parent 992c625 commit 40c349b

File tree

3 files changed

+31
-48
lines changed

3 files changed

+31
-48
lines changed

.mvn/extensions.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
3+
<extension>
4+
<groupId>fr.brouillard.oss</groupId>
5+
<artifactId>jgitver-maven-plugin</artifactId>
6+
<version>1.5.1</version>
7+
</extension>
8+
</extensions>

.mvn/jgitver.config.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<configuration xmlns="http://jgitver.github.io/maven/configuration/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://jgitver.github.io/maven/configuration/1.1.0 https://jgitver.github.io/maven/configuration/jgitver-configuration-v1_1_0.xsd">
4+
<strategy>MAVEN</strategy>
5+
<mavenLike>true</mavenLike>
6+
<useGitCommitId>false</useGitCommitId>
7+
<autoIncrementPatch>true</autoIncrementPatch>
8+
</configuration>

pom.xml

Lines changed: 15 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>org.locationtech.proj4j</groupId>
55
<artifactId>proj4j</artifactId>
6-
<version>1.1.1-SNAPSHOT</version>
6+
<version>${revision}</version>
77
<packaging>bundle</packaging>
88
<name>Proj4J</name>
99
<url>https://github.com/locationtech/proj4j</url>
@@ -136,24 +136,6 @@
136136
</execution>
137137
</executions>
138138
</plugin>
139-
<plugin>
140-
<groupId>org.apache.maven.plugins</groupId>
141-
<artifactId>maven-release-plugin</artifactId>
142-
<version>2.5.3</version>
143-
<configuration>
144-
<localCheckout>true</localCheckout>
145-
<pushChanges>false</pushChanges>
146-
<mavenExecutorId>forked-path</mavenExecutorId>
147-
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
148-
</configuration>
149-
<dependencies>
150-
<dependency>
151-
<groupId>org.apache.maven.scm</groupId>
152-
<artifactId>maven-scm-provider-gitexe</artifactId>
153-
<version>1.9.5</version>
154-
</dependency>
155-
</dependencies>
156-
</plugin>
157139
</plugins>
158140
</build>
159141

@@ -198,37 +180,22 @@
198180
<autoReleaseAfterClose>false</autoReleaseAfterClose>
199181
</configuration>
200182
</plugin>
183+
<plugin>
184+
<groupId>org.apache.maven.plugins</groupId>
185+
<artifactId>maven-gpg-plugin</artifactId>
186+
<version>1.6</version>
187+
<executions>
188+
<execution>
189+
<id>sign-artifacts</id>
190+
<phase>verify</phase>
191+
<goals>
192+
<goal>sign</goal>
193+
</goals>
194+
</execution>
195+
</executions>
196+
</plugin>
201197
</plugins>
202198
</build>
203199
</profile>
204-
205-
<!-- GPG Signature on release -->
206-
<profile>
207-
<id>release-sign-artifacts</id>
208-
<activation>
209-
<property>
210-
<name>performRelease</name>
211-
<value>true</value>
212-
</property>
213-
</activation>
214-
<build>
215-
<plugins>
216-
<plugin>
217-
<groupId>org.apache.maven.plugins</groupId>
218-
<artifactId>maven-gpg-plugin</artifactId>
219-
<version>1.6</version>
220-
<executions>
221-
<execution>
222-
<id>sign-artifacts</id>
223-
<phase>verify</phase>
224-
<goals>
225-
<goal>sign</goal>
226-
</goals>
227-
</execution>
228-
</executions>
229-
</plugin>
230-
</plugins>
231-
</build>
232-
</profile>
233200
</profiles>
234201
</project>

0 commit comments

Comments
 (0)