back to use timestamp as plugin version

2019-09-10 11:41:47 +08:00
1 changed files with 8 additions and 11 deletions
--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -237,12 +237,12 @@
                            <dependency>
                                <groupId>org.eclipse.tycho.extras</groupId>
                                <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                                <version>${tycho.version}</version>
+                                <version>${tycho-extras.version}</version>
                            </dependency>
                        </dependencies>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -254,8 +254,8 @@
                            <jgit.ignore>pom.xml</jgit.ignore>
                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
                        </configuration>
-                    </plugin>
-                     </plugins>
+                    </plugin>
+                </plugins>
            </build>
        </profile>
        <profile>
@@ -286,7 +286,7 @@
                        <version>${tycho.version}</version>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -330,12 +330,12 @@
                            <dependency>
                                <groupId>org.eclipse.tycho.extras</groupId>
                                <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                                <version>${tycho.version}</version>
+                                <version>${tycho-extras.version}</version>
                            </dependency>
                        </dependencies>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -391,7 +391,7 @@
                        </dependencies>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>'${product.timestamp}${release.suffix}'</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -399,9 +399,6 @@
                                    <Built-By />
                                </manifestEntries>
                            </archive>
-                            <timestampProvider>jgit</timestampProvider>
-                            <jgit.ignore>pom.xml</jgit.ignore>
-                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
                        </configuration>
                    </plugin>
                </plugins>