File tree 3 files changed +27
-2
lines changed
java/org/eclipse/tycho/version
resources/org/eclipse/tycho/version
3 files changed +27
-2
lines changed Original file line number Diff line number Diff line change 57
57
<groupId >org.apache.maven.plugins</groupId >
58
58
<artifactId >maven-plugin-plugin</artifactId >
59
59
</plugin >
60
+ <plugin >
61
+ <groupId >org.codehaus.mojo</groupId >
62
+ <artifactId >buildnumber-maven-plugin</artifactId >
63
+ <version >3.1.0</version >
64
+ <executions >
65
+ <execution >
66
+ <phase >validate</phase >
67
+ <goals >
68
+ <goal >create</goal >
69
+ </goals >
70
+ </execution >
71
+ </executions >
72
+ <configuration >
73
+ <doCheck >false</doCheck >
74
+ <doUpdate >false</doUpdate >
75
+ </configuration >
76
+ </plugin >
60
77
</plugins >
61
78
</build >
62
79
</project >
Original file line number Diff line number Diff line change @@ -22,6 +22,8 @@ public class TychoVersion {
22
22
23
23
private static final String TYCHO_SCM = readVersion ("scm" );
24
24
25
+ private static final String TYCHO_BUILDNUMBER = readVersion ("buildNumber" );
26
+
25
27
private static final String BND_VERSION = readVersion ("bnd" );
26
28
27
29
private static Properties PROPERTIES ;
@@ -36,7 +38,11 @@ public static String getBndVersion() {
36
38
37
39
public static String getSCMInfo () {
38
40
if ("${env.GIT_COMMIT}" .equals (TYCHO_SCM )) {
39
- return "local build" ;
41
+ if ("${buildNumber}" .equals (TYCHO_BUILDNUMBER )) {
42
+ //no way then...
43
+ return "local build" ;
44
+ }
45
+ return TYCHO_BUILDNUMBER ;
40
46
}
41
47
return TYCHO_SCM ;
42
48
}
Original file line number Diff line number Diff line change @@ -2,4 +2,6 @@ version=${project.version}
2
2
bnd =${bnd.version}
3
3
scm =${env.GIT_COMMIT}
4
4
url =${env.GIT_URL}
5
- branch =${env.GIT_BRANCH}
5
+ branch =${env.GIT_BRANCH}
6
+ scmBranch =${scmBranch}
7
+ buildNumber =${buildNumber}
You can’t perform that action at this time.
0 commit comments