Set version to 7.2.1 M1

test (#149 )
DOCT-11369: Update documentation dependency to 7.2.1-SNAPSHOT. (#148 )
2018-12-18 14:27:31 +01:00 · 2018-12-04 12:34:13 +08:00 · 2018-11-21 10:02:08 +01:00 · 2018-11-12 11:28:52 +08:00 · 2018-10-30 19:22:56 +08:00 · 2018-10-30 11:01:44 +08:00
13 changed files with 54 additions and 31 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-M1</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -110,12 +110,12 @@
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
-            <version>2.9.4</version>
+            <version>2.9.5</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.9.4</version>
+            <version>2.9.5</version>
        </dependency>
        <!-- end of daikon dependencies -->

@@ -282,7 +282,7 @@
 			<artifactId>commons-codec</artifactId>
 			<version>1.10</version>
 		</dependency>
-		<!-- to avoid updatin the complete eclipse target platform we add these
+		<!-- to avoid updatin the complete eclipse target platform we add these
 			single dependencies -->
        <dependency>
            <groupId>biz.aQute.bnd</groupId>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -5,13 +5,13 @@

    <groupId>org.talend.repo</groupId>
    <artifactId>dependencies.p2</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.2.1-M1</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.25.0</components.version>
-        <daikon.version>0.26.1</daikon.version>
-        <dataquality.lib.version>6.1.2</dataquality.lib.version>
+        <components.version>0.26.0-SNAPSHOT</components.version>
+        <daikon.version>0.29.0-SNAPSHOT</daikon.version>
+        <dataquality.lib.version>6.2.0-SNAPSHOT</dataquality.lib.version>
    </properties>

    <distributionManagement>
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-M1</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.tos.all.p2.product/pom.xml
+++ b/build/talend.studio.tos.all.p2.product/pom.xml
@@ -4,12 +4,13 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-M1</version>
 		<relativePath />
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M1</version>

 	<properties>
 		<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-M1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M1</version>
 </project>
--- a/build/talend.studio.tos.di.product/pom.xml
+++ b/build/talend.studio.tos.di.product/pom.xml
@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-M1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.di.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M1</version>
 </project>
--- a/build/talend.studio.tos.dq.product/config.ini
+++ b/build/talend.studio.tos.dq.product/config.ini
@@ -10,3 +10,5 @@ osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader
 file.encoding=UTF-8
+eclipse.p2.data.area=@config.dir/../p2/
+eclipse.p2.profile=profile
--- a/build/talend.studio.tos.dq.product/pom.xml
+++ b/build/talend.studio.tos.dq.product/pom.xml
@@ -4,12 +4,13 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-M1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.dq.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M1</version>
 	<build>
 		<plugins>
 			<plugin>
--- a/build/talend.studio.tos.esb.product/pom.xml
+++ b/build/talend.studio.tos.esb.product/pom.xml
@@ -4,10 +4,11 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.2.1-M1</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.esb.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>7.2.1.M1</version>
 </project>
--- a/build/talend.studio.tos.mdm.product/pom.xml
+++ b/build/talend.studio.tos.mdm.product/pom.xml
@@ -4,12 +4,13 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.2.1-M1</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.mdm.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>7.2.1.M1</version>
    <properties>
        <product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
    </properties>
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>parent-pom</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.2.1-M1</version>
        <relativePath />
    </parent>

--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-M1</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -3,20 +3,20 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.2.1-M1</version>
    <packaging>pom</packaging>

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <tycho.version>0.22.0</tycho.version>
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
-        <base.version>7.1.1</base.version>
+        <base.version>7.2.1</base.version>
        <!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
-        <osgi.compatible.version>${base.version}-SNAPSHOT</osgi.compatible.version>
+        <osgi.compatible.version>${base.version}.M1</osgi.compatible.version>
        <!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
-        <maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
-        <repo.type>Snapshot</repo.type>
-	<doc.version>7.1.1-SNAPSHOT</doc.version>
+        <maven.compatible.version>${base.version}-M1</maven.compatible.version>
+        <repo.type>Release</repo.type>
+	<doc.version>7.2.1-SNAPSHOT</doc.version>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
        <talend.nexus.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
        <talend.nexus.p2unzip.url>${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
@@ -36,7 +36,7 @@
        <osgi.ws>win32</osgi.ws>
        <osgi.os>win32</osgi.os>
        <osgi.arch>x86</osgi.arch>
-        <strictVersions>true</strictVersions>
+        <strictVersions>false</strictVersions>
    </properties>

    <distributionManagement>
@@ -232,12 +232,12 @@
                            <dependency>
                                <groupId>org.eclipse.tycho.extras</groupId>
                                <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                                <version>${tycho-extras.version}</version>
+                                <version>${tycho.version}</version>
                            </dependency>
                        </dependencies>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
+                            <format>yyyyMMdd'_'HHmm</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -250,7 +250,19 @@
                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
                        </configuration>
                    </plugin>
-                </plugins>
+                    <plugin>
+                        <groupId>org.eclipse.tycho</groupId>
+                        <artifactId>tycho-p2-plugin</artifactId>
+                        <version>${tycho.version}</version>
+                        <configuration>
+                        <baselineRepositories>
+                            <repository>
+                            <url>http://localhost:8080/p2site/</url>
+                            </repository>
+                        </baselineRepositories>
+                        </configuration>
+                    </plugin>
+                     </plugins>
            </build>
        </profile>
        <profile>
@@ -281,7 +293,7 @@
                        <version>${tycho.version}</version>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
+                            <format>yyyyMMdd'_'HHmm</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -325,12 +337,12 @@
                            <dependency>
                                <groupId>org.eclipse.tycho.extras</groupId>
                                <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                                <version>${tycho-extras.version}</version>
+                                <version>${tycho.version}</version>
                            </dependency>
                        </dependencies>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
+                            <format>yyyyMMdd'_'HHmm</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -386,7 +398,7 @@
                        </dependencies>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>'${product.timestamp}${release.suffix}'</format>
+                            <format>yyyyMMdd'_'HHmm</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -394,6 +406,9 @@
                                    <Built-By />
                                </manifestEntries>
                            </archive>
+                            <timestampProvider>jgit</timestampProvider>
+                            <jgit.ignore>pom.xml</jgit.ignore>
+                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
                        </configuration>
                    </plugin>
                </plugins>
Author	SHA1	Message	Date
Jenkins Continuous Build server	f87039b21d	Set version to 7.2.1 M1	2018-12-18 14:27:31 +01:00
nrousseau	d79a477817	test (#149 )	2018-12-04 12:34:13 +08:00
gdalencon	bc3e64196a	DOCT-11369: Update documentation dependency to 7.2.1-SNAPSHOT. (#148 )	2018-11-21 10:02:08 +01:00
qiongli	2ec536f370	bugfix(TDQ-15911) add 2 parameter to fix NPE (#138 )	2018-11-12 11:28:52 +08:00
Ivan Gonchar	13909039a3	chore: update daikon to 0.29.0-SNAPSHOT (#143 )	2018-10-30 19:22:56 +08:00
wang wei	97ca3e1216	fix(TDI-41295): Update master with the new version of tcomp / daikon (#142 )	2018-10-30 11:01:44 +08:00
Nicolas Rousseau	4e03b9d382	fix(TUP-21000) fix jackson to 2.9.5	2018-10-20 14:11:10 +08:00
build-talend	5c3a397035	chore(Jenkins): Update DQ libs to 6.2.0-SNAPSHOT (#132 )	2018-10-18 15:47:28 +02:00
Jenkins Continuous Build server	67739cb628	Set version to 7.2.1 SNAPSHOT	2018-10-18 13:37:51 +02:00