Update Mac launcher version

DEVOPS-2742 Allow naming ESB and MDM ZIPs differently
DEVOPS-2742 Package TOS MDM and ESB in final form during nightly builds
2019-06-24 11:47:21 +02:00 · 2019-01-11 12:46:56 +01:00 · 2018-12-31 10:08:40 +01:00 · 2018-11-12 11:28:24 +08:00 · 2018-05-09 18:04:01 +08:00 · 2018-03-23 10:57:41 +01:00
18 changed files with 637 additions and 655 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -5,17 +5,12 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.4.2-SNAPSHOT</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
 	<packaging>pom</packaging>

-	<properties>
-		<components.version>0.19.0</components.version>
-		<daikon.version>0.17.0</daikon.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.ops4j.pax.url</groupId>
@@ -25,37 +20,37 @@
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-common</artifactId>
-			<version>1.6.3</version>
+			<version>1.6.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic-model</artifactId>
-			<version>1.6.3</version>
+			<version>1.6.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic</artifactId>
-			<version>1.6.3</version>
+			<version>1.6.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-statistics</artifactId>
-			<version>1.6.3</version>
+			<version>1.6.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-record-linkage</artifactId>
-			<version>3.3.3</version>
+			<version>3.3.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-standardization</artifactId>
-			<version>3.3.3</version>
+			<version>3.3.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-sampling</artifactId>
-			<version>2.4.3</version>
+			<version>2.4.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
@@ -175,12 +170,6 @@
 			<version>${components.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-dataprep</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
 			<artifactId>components-splunk</artifactId>
@@ -193,12 +182,6 @@
 			<version>${components.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-datastewardship</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
 			<artifactId>components-snowflake</artifactId>
@@ -219,7 +202,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
-			<artifactId>components-marketo</artifactId>
+			<artifactId>components-marketo-definition</artifactId>
 			<version>${components.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -5,10 +5,12 @@

    <groupId>org.talend.repo</groupId>
    <artifactId>dependencies.p2</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.4.2-SNAPSHOT</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
+        <components.version>0.19-SNAPSHOT</components.version>
+        <daikon.version>0.17.3-SNAPSHOT</daikon.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>6.4.1-SNAPSHOT</version>
+		<version>6.4.2-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.tos.all.p2.product/pom.xml
+++ b/build/talend.studio.tos.all.p2.product/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.4.2-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.4.2-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.bd.product/product.properties
+++ b/build/talend.studio.tos.bd.product/product.properties
@@ -1,7 +1,8 @@
 launcher.prefix=TOS_BD
+storage.prefix=${launcher.prefix}
 product.name=Talend Open Studio for Big Data
 product.branding.platform=org.talend.rcp.branding.tos.bigdata
 product.branding.id=${product.branding.platform}.product
 mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
 product.website=http://www.talend.com\n
-storage.dir=tos
+storage.dir=tosbd
--- a/build/talend.studio.tos.di.product/pom.xml
+++ b/build/talend.studio.tos.di.product/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.4.2-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.di.product/product.properties
+++ b/build/talend.studio.tos.di.product/product.properties
@@ -1,4 +1,5 @@
 launcher.prefix=TOS_DI
+storage.prefix=${launcher.prefix}
 product.name=Talend Open Studio for Data Integration
 product.branding.platform=org.talend.rcp.branding.tos
 product.branding.id=${product.branding.platform}.product
--- 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,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.4.2-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.dq.product/product.properties
+++ b/build/talend.studio.tos.dq.product/product.properties
@@ -1,4 +1,5 @@
 launcher.prefix=TOS_DQ
+storage.prefix=${launcher.prefix}
 product.name=Talend Open Profiler
 product.branding.platform=org.talend.rcp.branding.top
 product.branding.id=${product.branding.platform}.product
--- a/build/talend.studio.tos.esb.product/pom.xml
+++ b/build/talend.studio.tos.esb.product/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.2-SNAPSHOT</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

--- a/build/talend.studio.tos.esb.product/product.properties
+++ b/build/talend.studio.tos.esb.product/product.properties
@@ -1,4 +1,5 @@
 launcher.prefix=TOS_ESB
+storage.prefix=TOS_ESB-Studio
 product.name=Talend Open Studio
 product.branding.platform=org.talend.rcp.branding.esbstandard
 product.branding.id=${product.branding.platform}.product
--- a/build/talend.studio.tos.mdm.product/pom.xml
+++ b/build/talend.studio.tos.mdm.product/pom.xml
@@ -4,13 +4,10 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.4.2-SNAPSHOT</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.mdm.product</artifactId>
    <packaging>eclipse-repository</packaging>
-    <properties>
-        <product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
-    </properties>
 </project>
--- a/build/talend.studio.tos.mdm.product/product.properties
+++ b/build/talend.studio.tos.mdm.product/product.properties
@@ -1,5 +1,5 @@
 launcher.prefix=TOS_MDM
-product.final.name.prefix=TOS_MDM-Studio
+storage.prefix=TOS_MDM-Studio
 product.name=Talend Open Studio for MDM
 product.branding.platform=org.talend.rcp.branding.tombundle
 product.branding.id=${product.branding.platform}.product
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.4.2-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -3,14 +3,14 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.4.2-SNAPSHOT</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>6.4.1</base.version>
+        <base.version>6.4.2</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>
        <!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
@@ -149,12 +149,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>
@@ -164,22 +164,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>
Author	SHA1	Message	Date
Irene Wang	9434e26c7d	Update Mac launcher version	2019-06-24 11:47:21 +02:00
Irene Wang	474cfc496e	DEVOPS-2742 Allow naming ESB and MDM ZIPs differently	2019-01-11 12:46:56 +01:00
Irene Wang	746518136f	DEVOPS-2742 Package TOS MDM and ESB in final form during nightly builds	2018-12-31 10:08:40 +01:00
qiongli	f7abdf223e	bugfix(TDQ-15911) add 2 parameters to fix NPE (#141 )	2018-11-12 11:28:24 +08:00
nrousseau	a775fe212d	fix(TUP-19313) fix startup on mac (#115 )	2018-05-09 18:04:01 +08:00
build-talend	e16a797fef	chore(Jenkins): update DQ libs to 1.6.6-SNAPSHOT (#100 )	2018-03-23 10:57:41 +01:00
Ivan Gonchar	2f44912551	chore: bump daikon version to 0.17.3-SNAPSHOT (#96 )	2018-03-05 23:52:49 +08:00
Emmanuel GALLOIS	89e19f8d5a	feat(TDI-38416): Marketo backport to 651 (#82 )	2017-11-30 09:02:17 +08:00
iwangtalend	f34342540a	Merge pull request #74 from chmyga/maintenance/6.4 chore(TDI-39398): move components-ee (#73)	2017-09-11 10:02:25 +02:00
Dmytro Chmyga	c5f79bbcb3	chore(TDI-39398): move components-ee * Move version properties to parent pom	2017-09-07 09:30:47 +03:00
chmyga	1466f0a6c8	chore(TDI-39398): move components-ee (#73 ) * Move components-ee to enterprise repo	2017-09-06 12:24:54 +03:00
build-talend	009e77bbbc	chore(Jenkins): update DQ libs to 1.6.5-SNAPSHOT (#70 )	2017-08-29 15:34:47 +02:00
build-talend	df091f952b	chore(Jenkins): Release DQ libraries 1.6.4 (#69 )	2017-08-29 14:41:01 +02:00
Irene Wang	1667699aa7	Remove PPC launcher	2017-08-25 11:53:50 +02:00
Irene Wang	7702f62c1e	Remove all 32-bit INIs	2017-08-25 10:45:58 +02:00
Irene Wang	b887a7d970	Remove Win 32-bit INI	2017-08-25 10:34:47 +02:00
Irene Wang	f5bf4db250	DEVOPS-2901 Remove 32-bit launcher binaries	2017-08-14 12:46:21 +02:00
Pierre Teyssier	98d577db22	chore(TDI-39280): integrate tcomp/daikon version for 6.4.2	2017-08-08 10:39:58 +08:00
sizhaoliu	b779addf61	bump DQ library version to 1.6.4-SNAPSHOT	2017-07-26 12:51:08 +02:00
Jenkins Continuous Build server	8ec1cc81f9	Set version to 6.4.2 SNAPSHOT	2017-06-30 18:38:07 +02:00
Pierre Teyssier	57cca2cd54	chore: integrate tcomp release 0.19.2	2017-06-19 13:58:54 +08:00
Jenkins Continuous Build server	9787cc8e01	Set version to 6.4.1	2017-06-14 12:42:05 +02:00