From fc4e9b6159e8c400a079959074495405dc548a16 Mon Sep 17 00:00:00 2001
From: Nicolas Rousseau <nrousseau@talend.com>
Date: Mon, 2 Dec 2019 14:45:54 +0800
Subject: [PATCH] chore(TUP-21116) upgrade tycho version to 1.5.1

---
 .../talend.product                            |  2 +-
 .../talend.product                            |  2 +-
 .../talend.product                            |  2 +-
 .../talend.product                            |  2 +-
 .../talend.product                            |  2 +-
 talend.studio.parent.pom/pom.xml              | 45 ++++++++++---------
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/build/talend.studio.tos.all.p2.product/talend.product b/build/talend.studio.tos.all.p2.product/talend.product
index 8d2b64a..0f23aa8 100644
--- a/build/talend.studio.tos.all.p2.product/talend.product
+++ b/build/talend.studio.tos.all.p2.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Talend Open Studio" uid="org.talend.studio.tos.all.p2.product" id="org.talend.rcp.branding.tos.all.p2.product" application="org.talend.rcp.branding.tos.application" useFeatures="true" includeLaunchers="false">
+<product name="Talend Open Studio" uid="org.talend.studio.tos.all.p2.product" id="org.talend.rcp.branding.tos.all.p2.product" application="org.talend.rcp.branding.tos.application" useFeatures="true" includeLaunchers="false" version="7.3.1.qualifier">
 
    <configIni use="default">
       <linux>config.ini</linux>
diff --git a/build/talend.studio.tos.bd.product/talend.product b/build/talend.studio.tos.bd.product/talend.product
index db20568..4f91424 100644
--- a/build/talend.studio.tos.bd.product/talend.product
+++ b/build/talend.studio.tos.bd.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false">
+<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false" version="7.3.1.qualifier">
 
    <configIni use="default">
       <linux>config.ini</linux>
diff --git a/build/talend.studio.tos.di.product/talend.product b/build/talend.studio.tos.di.product/talend.product
index 796128b..e5c2aec 100644
--- a/build/talend.studio.tos.di.product/talend.product
+++ b/build/talend.studio.tos.di.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false">
+<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false" version="7.3.1.qualifier">
 
    <configIni use="default">
       <linux>config.ini</linux>
diff --git a/build/talend.studio.tos.dq.product/talend.product b/build/talend.studio.tos.dq.product/talend.product
index a2ede61..46ce943 100644
--- a/build/talend.studio.tos.dq.product/talend.product
+++ b/build/talend.studio.tos.dq.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false">
+<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false" version="7.3.1.qualifier">
 
    <configIni use="default">
       <linux>config.ini</linux>
diff --git a/build/talend.studio.tos.esb.product/talend.product b/build/talend.studio.tos.esb.product/talend.product
index ad8da07..202c35f 100644
--- a/build/talend.studio.tos.esb.product/talend.product
+++ b/build/talend.studio.tos.esb.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false">
+<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false" version="7.3.1.qualifier">
 
    <configIni use="default">
       <linux>config.ini</linux>
diff --git a/talend.studio.parent.pom/pom.xml b/talend.studio.parent.pom/pom.xml
index 1c9de9d..eaadd29 100644
--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -8,7 +8,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho.version>0.22.0</tycho.version>
+        <tycho.version>1.5.1</tycho.version>
         <tycho-extras.version>${tycho.version}</tycho-extras.version>
         <base.version>7.3.1</base.version>
         <!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
@@ -155,12 +155,12 @@
                     </environments>
                     <filters>
                         <!-- restrict version of a bundle -->
-                        <!--<filter>
-							<type>eclipse-plugin</type>
-							<id>org.eclipse.ui.views.properties.tabbed</id>
-							<restrictTo>
-								<version>3.6.100.v20140519-0906</version>
-							</restrictTo>
+                        <!--<filter>
+							<type>eclipse-plugin</type>
+							<id>org.eclipse.ui.views.properties.tabbed</id>
+							<restrictTo>
+								<version>3.6.100.v20140519-0906</version>
+							</restrictTo>
 						</filter>-->
                         <filter>
                             <type>eclipse-plugin</type>
@@ -170,22 +170,22 @@
                             </restrictTo>
                         </filter>
 
-                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
-				 <filter>
-					<type>java-package</type>
-					<id>javax.persistence</id>
-					<restrictTo>
-					   <type>eclipse-plugin</type>
-					   <id>javax.persistence</id>
-					</restrictTo>
-				 </filter>
+                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
+				 <filter>
+					<type>java-package</type>
+					<id>javax.persistence</id>
+					<restrictTo>
+					   <type>eclipse-plugin</type>
+					   <id>javax.persistence</id>
+					</restrictTo>
+				 </filter>
 -->
-                        <!-- example 3: work around Equinox bug 348045 
-				 <filter>
-					<type>p2-installable-unit</type>
-					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
-					<removeAll />
-				 </filter>
+                        <!-- example 3: work around Equinox bug 348045 
+				 <filter>
+					<type>p2-installable-unit</type>
+					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
+					<removeAll />
+				 </filter>
 -->				 
                     </filters>
                 </configuration>
@@ -199,6 +199,7 @@
                     <compilerVersion>1.8</compilerVersion>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <useProjectSettings>false</useProjectSettings>
                 </configuration>
             </plugin>
         </plugins>