DEVOPS-2742 Allow naming ESB and MDM ZIPs differently

Revert "DEVOPS-2742 Rename TOS ESB Studio-only"
This reverts commit 9dd74c6271.
2019-01-10 17:53:35 +01:00 · 2019-01-09 10:54:39 +01:00 · 2019-01-08 20:08:04 +01:00 · 2019-01-07 12:31:19 +08:00 · 2019-01-04 12:34:59 +08:00 · 2018-12-27 14:35:51 +01:00
20 changed files with 164 additions and 176 deletions
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@ http://www.talend.com
 ![alt text](https://www.talend.com/wp-content/uploads/2016/07/talend-logo.png "Talend")

 > Content
-==========

 Master repos using gitslave for aggregating the full Talend Studio open source repositories

--- 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-SNAPSHOT</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -45,6 +45,11 @@
 			<artifactId>dataquality-common</artifactId>
 			<version>${dataquality.lib.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-phone</artifactId>
+			<version>${dataquality.lib.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic-model</artifactId>
@@ -105,17 +110,17 @@
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
-            <version>3.4</version>
+            <version>3.7</version>
        </dependency>
        <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 -->

@@ -304,11 +309,6 @@
 			<artifactId>commons-configuration</artifactId>
 			<version>1.10</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
-		</dependency>
 	</dependencies>

 </project>
--- 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-SNAPSHOT</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.25.0-SNAPSHOT</components.version>
-        <daikon.version>0.26.0-SNAPSHOT</daikon.version>
-        <dataquality.lib.version>6.1.0-SNAPSHOT</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-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>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.tos.all.p2.product/talend.product
+++ b/build/talend.studio.tos.all.p2.product/talend.product
@@ -10,17 +10,61 @@
      <win32>config.ini</win32>
   </configIni>

+   <plugins>
+   </plugins>
+
   <features>
-      <feature id="org.talend.fragment.jars.feature"/>
+      <feature id="org.talend.fragment.jars.common.feature"/>
+      <feature id="org.talend.fragment.jars.di.feature"/>
+      <feature id="org.talend.fragment.jars.dq.feature"/>
      <feature id="org.talend.rcp.branding.tos.bigdata.feature"/>
-	  <feature id="org.talend.rcp.branding.tos.feature"/>
-	  <feature id="org.talend.rcp.branding.top.feature"/>
-	  <feature id="org.talend.rcp.branding.esbstandard.feature"/>
-	  <feature id="org.talend.rcp.branding.tombundle.feature"/>
-	  <feature id="org.talend.rcp.branding.tos.test.feature"/>
-	  <feature id="org.talend.babel.all.tos.feature"/>
-	  <feature id="org.talend.test.tos.feature"/>
-	  <feature id="org.talend.bigdata.se.test.feature"/>
-	  <feature id="org.talend.esb.tooling.test.feature"/>
+      <feature id="org.talend.rcp.branding.tos.feature"/>
+      <feature id="org.talend.rcp.branding.top.feature"/>
+      <feature id="org.talend.rcp.branding.esbstandard.feature"/>
+      <feature id="org.talend.rcp.branding.tombundle.feature"/>
+      <feature id="org.talend.rcp.branding.tos.test.feature"/>
+      <feature id="org.talend.mdm.tom.test.feature"/>
+      <feature id="org.talend.babel.all.tos.feature"/>
+      <feature id="org.talend.bigdata.se.test.feature"/>
+      <feature id="org.talend.esb.tooling.test.feature"/>
+      <feature id="org.talend.camel.core.feature"/>
+      <feature id="org.talend.camel.designer.feature"/>
+      <feature id="org.talend.camel.feature"/>
+      <feature id="org.talend.commons.feature"/>
+      <feature id="org.talend.core.feature"/>
+      <feature id="org.talend.designer.business.feature"/>
+      <feature id="org.talend.designer.feature"/>
+      <feature id="org.talend.esb.tooling.feature"/>
+      <feature id="org.talend.esb.tooling.rs.provider.feature"/>
+      <feature id="org.talend.esb.tooling.ws.consumer.feature"/>
+      <feature id="org.talend.esb.tooling.ws.provider.feature"/>
+      <feature id="org.talend.esbstandard.feature"/>
+      <feature id="org.talend.hadoop.distribution.feature"/>
+      <feature id="org.talend.help.feature"/>
+      <feature id="org.talend.jdt.feature"/>
+      <feature id="org.talend.libraries.jdbc.feature"/>
+      <feature id="org.talend.m2e.feature"/>
+      <feature id="org.talend.model.migration.feature"/>
+      <feature id="org.talend.platform.feature"/>
+      <feature id="org.talend.rcp.feature"/>
+      <feature id="org.talend.repository.feature"/>
+      <feature id="org.talend.repository.services.feature"/>
+      <feature id="org.talend.sbi.feature"/>
+      <feature id="org.talend.spagic.feature"/>
+      <feature id="org.talend.tom.feature"/>
+      <feature id="org.talend.top.feature"/>
+      <feature id="org.talend.top.libraries.feature"/>
+      <feature id="org.talend.tos.bigdata.feature"/>
+      <feature id="org.talend.tos.bigdata.libraries.feature"/>
+      <feature id="org.talend.tos.components.feature"/>
+      <feature id="org.talend.tos.core.feature"/>
+      <feature id="org.talend.tos.feature"/>
+      <feature id="org.talend.tos.libraries.feature"/>
+      <feature id="org.talend.update.p2.feature"/>
+      <feature id="org.talend.updates.feature"/>
+      <feature id="org.talend.utils.feature"/>
+      <feature id="org.talend.dataquality.se.test.feature"/>
   </features>
+
+
 </product>
--- 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>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-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>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-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,25 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.dq.product</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<id>generate-javajet</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
--- 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>7.1.1-SNAPSHOT</version>
+        <version>7.2.1-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>7.1.1-SNAPSHOT</version>
+        <version>7.2.1-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
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>parent-pom</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.2.1-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -36,7 +36,7 @@

    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
+        <product.final.name>${storage.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
        <studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.os}/${osgi.ws}/${osgi.arch}</studio.dir>
    </properties>

@@ -235,36 +235,6 @@
                    </execution>
                </executions>
            </plugin>
-            <!--    <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.3.2</version>
-                <executions>
-                    <execution>
-                        <id>generate-javajet</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>java</executable>
-                    <workingDirectory>${studio.dir}</workingDirectory>
-                    <arguments>
-                        <argument>-Xmx1536m</argument>
-                        <argument>-XX:MaxPermSize=512m</argument>
-                        <argument>-classpath</argument>
-                        <argument>${studio.dir}/plugins/${equinox.build}</argument>
-                        <argument>org.eclipse.core.launcher.Main</argument>
-                        <argument>-application</argument>
-                        <argument>org.talend.designer.codegen.CodeGenInit</argument>
-                        <argument>-nosplash</argument>
-                        <argument>-consoleLog</argument>
-                        <argument>-Dtalend.licence.path=${studio.dir}/license</argument>
-                    </arguments>
-                </configuration>
-            </plugin>-->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-antrun-plugin</artifactId>
@@ -376,43 +346,6 @@
                            <goal>run</goal>
                        </goals>
                    </execution>
-                    <execution>
-                        <!-- Generate javajet by launching product -->
-                        <id>generate-javajet</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                                <!-- Generate javajet -->
-                                <java classname="org.eclipse.core.launcher.Main" dir="${studio.dir}" fork="true" failonerror="false" maxmemory="1536m">
-                                    <arg line="-application org.talend.designer.codegen.CodeGenInit -nosplash -consoleLog" />
-                                    <classpath>
-                                        <pathelement location="${studio.dir}/plugins/${equinox.build}" />
-                                    </classpath>
-                                    <jvmarg value="-XX:MaxPermSize=512m" />
-                                    <jvmarg value="-Dtalend.licence.path=${studio.dir}/license" />
-                                </java>
-                                <delete file="${studio.dir}/license" />
-                                <delete dir="${studio.dir}/lib" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/temp" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/workspace/.Java" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/workspace/.Perl" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/workspace/.metadata" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/configuration/org.eclipse.core.runtime" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/configuration/org.eclipse.equinox.app" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/configuration/org.eclipse.osgi" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/configuration/org.eclipse.update" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/configuration/maven_repository" includeemptydirs="true" />
-                                <delete dir="${studio.dir}/configuration/.settings" includeemptydirs="true" />
-                                                <delete file="${studio.dir}/configuration/maven_user_settings.xml" />
-                                                <delete file="${studio.dir}/configuration/LibrariesIndex.xml" />
-                                                <delete file="${studio.dir}/configuration/MavenUriIndex.xml" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
                    <execution>
                        <!-- Create final product ZIP -->
                        <id>zip-product</id>
@@ -503,29 +436,29 @@
                            <timestampProvider>default</timestampProvider>
                        </configuration>
                    </plugin>
-                    <!--
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.7</version>
-                        <executions>
+                    <!--
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>1.7</version>
+                        <executions>
                            <execution>-->
                    <!-- Attach product ZIP to Maven artifact -->
-                    <!--    <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
-                                            <type>product</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
+                    <!--    <id>attach-artifacts</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
+                                            <type>product</type>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
                    </plugin>-->
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
@@ -539,8 +472,7 @@
                                <configuration>
                                    <target>
                                        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                                        <propertyregex property="product.version.short" input="${product.version}" regexp="\." replace="" global="true" casesensitive="false" override="true" />
-                                        <property name="product.build.path" value="${product.build.id}/${storage.dir}/V${product.version}${revision.filename}/${storage.dir}_${product.version.short}" />
+                                        <property name="product.build.path" value="${product.build.id}/${storage.dir}/V${product.version}${revision.filename}" />
                                        <property name="product.dir" value="${storage}/${product.build.path}" />
                                        <mkdir dir="${product.dir}" />
                                        <echo>Moving product ZIP ${project.build.directory}/products/${product.final.name}.zip to ${product.dir}</echo>
@@ -554,7 +486,12 @@
                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
                                            </then>
                                        </if>
-                                        <checksum file="${product.dir}/${product.final.name}.zip" />
+                                        <exec executable="openssl" dir="${product.dir}" outputproperty="sha256" >
+                                            <arg line="dgst" />
+                                            <arg line="-sha256" />
+                                            <arg line="${product.final.name}.zip"/>
+                                        </exec>
+                                        <echo file="${product.dir}/${product.final.name}.zip.sha256" append="false">${sha256}</echo>
                                    </target>
                                </configuration>
                                <goals>
--- 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-SNAPSHOT</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-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>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>
        <!-- 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>
+	<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>
@@ -80,6 +80,11 @@
            <url>${bonita-open-repo.url}</url>
            <layout>p2</layout>
        </repository>
+        <repository>
+            <id>swtbot</id>
+            <url>https://artifacts-oss.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceRelease/org/talend/repo/talend-swtbot/2.7.0/talend-swtbot-2.7.0.zip-unzip</url>
+            <layout>p2</layout>
+        </repository>
        <repository>
            <id>talend_open</id>
            <releases>
@@ -150,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>
@@ -165,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>
@@ -232,12 +237,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 +255,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 +298,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 +342,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 +403,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 +411,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
Irene Wang	7f67dd05e9	DEVOPS-2742 Allow naming ESB and MDM ZIPs differently	2019-01-10 17:53:35 +01:00
Irene Wang	12fffc246f	Revert "DEVOPS-2742 Rename TOS ESB Studio-only" This reverts commit `9dd74c6271`.	2019-01-09 10:54:39 +01:00
Irene Wang	9dd74c6271	DEVOPS-2742 Rename TOS ESB Studio-only	2019-01-08 20:08:04 +01:00
msjian	8ef366231f	Revert "fix studio compiler error (#155 )" (#156 ) This reverts commit `1bfad2c6e5`.	2019-01-07 12:31:19 +08:00
msjian	1bfad2c6e5	fix studio compiler error (#155 ) * fix studio compiler error * fix format	2019-01-04 12:34:59 +08:00
Irene Wang	c1ee67259b	DEVOPS-2742 Package TOS MDM and ESB in final form during nightly builds	2018-12-27 14:35:51 +01:00
sizhaoliu	2f9be800a5	chore(TDQ-16217): add dataquality-phone dependency (#154 )	2018-12-26 13:27:17 +02:00
Irene Wang	72fe26ce26	DEVOPS-5912 Remove javajet generation	2018-12-26 10:30:53 +01:00
Irene Wang	d474c70d38	DEVOPS-5921 [SHA256] TOS	2018-12-24 14:21:32 +01:00
Irene Wang	8cd6fcd334	DEVOPS-5921 [SHA256] TOS	2018-12-24 11:48:10 +01:00
nrousseau	cc9439c899	eat(TUP-21119): Cleanup features	2018-12-21 14:00:56 +08:00
Chao MENG	b6bcc7f7ae	feat(TUP-21119): Cleanup features, each plugin must be in one unique (#153 ) feature https://jira.talendforge.org/browse/TUP-21119	2018-12-20 17:44:09 +08:00
Chao MENG	60bc7074f0	feat(TUP-21119): Cleanup features, each plugin must be in one unique (#152 ) feature https://jira.talendforge.org/browse/TUP-21119	2018-12-20 14:35:13 +08:00
Chao MENG	5cfb683aef	Cmeng/feat/tup 21119 cleanup features (#151 ) * feat(TUP-21119): Cleanup features, each plugin must be in one unique feature https://jira.talendforge.org/browse/TUP-21119 * feat(TUP-21119): Cleanup features, each plugin must be in one unique feature https://jira.talendforge.org/browse/TUP-21119 * feat(TUP-21119): Cleanup features, each plugin must be in one unique feature https://jira.talendforge.org/browse/TUP-21119 * feat(TUP-21119): Cleanup features, each plugin must be in one unique feature https://jira.talendforge.org/browse/TUP-21119	2018-12-20 10:56:58 +08:00
nrousseau	d8680557a0	feature(TUP-21302) update swtbot version (#150 )	2018-12-20 10:32:20 +08: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
Nicolas Rousseau	2eb32f2d9a	fix(TDI-41112): upgrade apache commons lang3	2018-10-18 12:40:15 +08:00
nrousseau	f0cd5c0674	fix(TDI-41112): upgrade apache commons lang3 (#131 )	2018-10-18 10:25:05 +08:00
Ivan Gonchar	c0a708baa9	chore(release): bump Components version to 0.25.0 (#130 )	2018-10-18 09:59:12 +08:00
build-talend	407aabd4d9	chore(Jenkins): Update DQ libs to 6.1.2 (#129 )	2018-10-16 17:20:03 +02:00
build-talend	13a069a49e	chore(Jenkins): Update DQ libs to 6.1.1 (#128 )	2018-10-16 13:01:10 +02:00
build-talend	0a6eaf4d8f	chore(Jenkins): Update DQ libs to 6.1.1-SNAPSHOT (#127 ) * chore(Jenkins): Update DQ libs to 6.1.1-SNAPSHOT * update daikon version to 0.26.1-SNAPSHOT	2018-09-28 10:10:00 +02:00
Stéphane Bouchet	e20abc03a9	fix content section (#109 )	2018-08-30 11:22:50 +08:00