Skip to content

Commit 8ddf86d

Browse files
committed
fix: wrong build qualifier is used
1 parent 5f40353 commit 8ddf86d

File tree

1 file changed

+33
-8
lines changed

1 file changed

+33
-8
lines changed

pom.xml

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
SPDX-FileCopyrightText: © Haxe4E authors
3+
SPDX-FileCopyrightText: © The Haxe4E authors
44
SPDX-FileContributor: Sebastian Thomschke
55
SPDX-License-Identifier: EPL-2.0
6-
SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe4e-studio
6+
SPDX-ArtifactOfProjectHomePage: https://github.com/haxe4e/haxe-studio
77
-->
88
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
99
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>com.vegardit.maven</groupId>
1515
<artifactId>vegardit-maven-parent</artifactId>
16-
<version>6.1.8</version>
16+
<version>6.1.9</version>
1717
</parent>
1818

1919
<groupId>org.haxe4e.studio</groupId>
@@ -23,6 +23,7 @@
2323

2424

2525
<name>haxe4e-studio-parent</name>
26+
<url>https://github.com/haxe4e/haxe-studio</url>
2627
<inceptionYear>2021</inceptionYear>
2728
<organization>
2829
<name>The Haxe4E Project</name>
@@ -46,28 +47,29 @@
4647

4748
<scm>
4849
<!-- https://maven.apache.org/scm/git.html -->
49-
<url>https://github.com/haxe4e/haxe4e-studio</url>
50-
<connection>scm:git:https://github.com/haxe4e/haxe4e-studio.git</connection>
51-
<developerConnection>scm:git:https://github.com/haxe4e/haxe4e-studio.git</developerConnection>
50+
<url>https://github.com/haxe4e/haxe-studio</url>
51+
<connection>scm:git:https://github.com/haxe4e/haxe-studio.git</connection>
52+
<developerConnection>scm:git:https://github.com/haxe4e/haxe-studio.git</developerConnection>
5253
<tag>HEAD</tag>
5354
</scm>
5455

5556

5657
<issueManagement>
5758
<system>github.com</system>
58-
<url>https://github.com/haxe4e/haxe4e-studio/issues</url>
59+
<url>https://github.com/haxe4e/haxe-studio/issues</url>
5960
</issueManagement>
6061

6162

6263
<ciManagement>
6364
<system>github.com</system>
64-
<url>https://github.com/haxe4e/haxe4e-studio/actions</url>
65+
<url>https://github.com/haxe4e/haxe-studio/actions</url>
6566
</ciManagement>
6667

6768

6869
<properties>
6970
<java.version>21</java.version>
7071
<tycho.version>4.0.12</tycho.version>
72+
<jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree>
7173

7274
<!-- to prevent:
7375
[ERROR] Failed to execute goal com.hubspot.maven.plugins:dependency-scope-maven-plugin:0.10:check (check@validate) on project org.haxe4e:
@@ -150,9 +152,20 @@
150152
<version>${tycho.version}</version>
151153
<configuration>
152154
<format>yyyyMMdd-HHmm</format>
155+
<timestampProvider>jgit</timestampProvider>
156+
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
157+
<jgit.ignore>pom.xml</jgit.ignore>
158+
153159
<!-- replace SNAPSHOT version in the final product configuration -->
154160
<finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
155161
</configuration>
162+
<dependencies>
163+
<dependency>
164+
<groupId>org.eclipse.tycho</groupId>
165+
<artifactId>tycho-buildtimestamp-jgit</artifactId>
166+
<version>${tycho.version}</version>
167+
</dependency>
168+
</dependencies>
156169
</plugin>
157170
<plugin>
158171
<!-- https://tycho.eclipseprojects.io/doc/latest/tycho-p2-plugin/plugin-info.html -->
@@ -329,6 +342,18 @@
329342
</build>
330343

331344
<profiles>
345+
<profile>
346+
<!-- This profile prevents local maven builds from failing if uncommitted changes are present -->
347+
<id>local-dev</id>
348+
<activation>
349+
<property>
350+
<name>!env.CI</name>
351+
</property>
352+
</activation>
353+
<properties>
354+
<jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
355+
</properties>
356+
</profile>
332357
<profile>
333358
<id>disable-tycho-packaging-plugin-if-executed-in-eclipse</id>
334359
<activation>

0 commit comments

Comments
 (0)