change p2 version to PATCH2

chore: bump components version to 0.28.4 (#274 )
* chore: bump components version to 0.28.4 * chore: update p2 tos repo url Co-authored-by: nrousseau <nrousseau@talend.com>
2020-06-24 15:55:35 +08:00 · 2020-05-22 11:14:27 +08:00 · 2020-05-21 20:11:19 +08:00 · 2020-05-07 14:35:58 +08:00 · 2020-03-26 10:52:07 +08:00 · 2020-02-18 08:39:16 +08:00
14 changed files with 317 additions and 241 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.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH2</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -189,7 +189,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.10</version>
+			<version>1.19</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.livesense</groupId>
@@ -314,7 +314,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>
@@ -344,32 +344,42 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-yaml</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-csv</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-smile</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-		    <version>1.23</version>
+			<version>1.25</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.woodstox</groupId>
+			<artifactId>stax2-api</artifactId>
+			<version>4.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.woodstox</groupId>
+			<artifactId>woodstox-core</artifactId>
+			<version>5.3.0</version>
 		</dependency>
 	</dependencies>

--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -1,166 +1,168 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-    <groupId>org.talend.repo</groupId>
-    <artifactId>dependencies.p2</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <properties>
-        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.28.0-SNAPSHOT</components.version>
-        <dataquality.lib.version>7.2.1-SNAPSHOT</dataquality.lib.version>
-        <fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
-        <daikon.version>0.31.10-SNAPSHOT</daikon.version>
-    </properties>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-            <snapshots><enabled>true</enabled></snapshots>
-            <releases><enabled>false</enabled></releases>
-        </snapshotRepository>
-        <repository>
-            <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
-            <snapshots><enabled>false</enabled></snapshots>
-            <releases><enabled>true</enabled></releases>
-        </repository>
-    </distributionManagement>
-
-    <repositories>
-        <repository>
-            <id>talend_open</id>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
-        </repository>
-        <repository>
-            <id>talend_open_snapshots</id>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-        </repository>
-    </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
-                            <excludeTransitive>true</excludeTransitive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>zip-p2-repo</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <zip destfile="${project.build.directory}/${project.artifactId}.zip">
-                                    <fileset dir="${project.build.directory}/output">
-                                        <include name="**/*" />    
-                                    </fileset>
-                                </zip>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>choose-target-repository</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                            if (project.version.endsWith("-SNAPSHOT")){
-                              project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
-                            }
-                            else {
-                              project.properties.targetrepository = project.distributionManagement.repository.url;
-                            }
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <executions>
-                    <execution>
-                        <id>deploy_p2_zip</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>zip</packaging>
-                            <generatePom>true</generatePom>
-                            <url>${targetrepository}</url>
-                            <repositoryId>talend_nexus_deployment</repositoryId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <groupId>org.talend.repo</groupId>
-                            <version>${project.version}</version>
-                            <file>${project.build.directory}/${project.artifactId}.zip</file>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho.extras</groupId>
-                <artifactId>tycho-p2-extras-plugin</artifactId>
-                <version>0.22.0</version>
-                <executions>
-                    <execution>
-                        <id>create-p2-repository</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>publish-features-and-bundles</goal>
-                        </goals>
-                        <configuration>
-                            <metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
-                            <artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
-                            <sourceLocation>${project.build.directory}/p2</sourceLocation>
-                            <compress>true</compress>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+    <groupId>org.talend.repo</groupId>
+    <artifactId>dependencies.p2</artifactId>
+    <version>7.3.1-PATCH2</version>
+    <packaging>pom</packaging>
+    <properties>
+        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
+        <components.version>0.28.4</components.version>
+        <dataquality.lib.version>8.0.1</dataquality.lib.version>
+        <fasterxml.jackson.version>2.10.1</fasterxml.jackson.version>
+        <!-- jackson dataformat and jaxb should use version 2.9.10 to make studio compatible with bonita -->
+        <fasterxml.jackson.bonita.compatible.version>2.9.10</fasterxml.jackson.bonita.compatible.version>
+        <daikon.version>0.31.10</daikon.version>
+    </properties>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>talend_nexus_deployment</id>
+            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+            <snapshots><enabled>true</enabled></snapshots>
+            <releases><enabled>false</enabled></releases>
+        </snapshotRepository>
+        <repository>
+            <id>talend_nexus_deployment</id>
+            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+            <snapshots><enabled>false</enabled></snapshots>
+            <releases><enabled>true</enabled></releases>
+        </repository>
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>talend_open</id>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
+        </repository>
+        <repository>
+            <id>talend_open_snapshots</id>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>zip-p2-repo</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <zip destfile="${project.build.directory}/${project.artifactId}.zip">
+                                    <fileset dir="${project.build.directory}/output">
+                                        <include name="**/*" />    
+                                    </fileset>
+                                </zip>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>choose-target-repository</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                            if (project.version.endsWith("-SNAPSHOT")){
+                              project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
+                            }
+                            else {
+                              project.properties.targetrepository = project.distributionManagement.repository.url;
+                            }
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <executions>
+                    <execution>
+                        <id>deploy_p2_zip</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy-file</goal>
+                        </goals>
+                        <configuration>
+                            <packaging>zip</packaging>
+                            <generatePom>true</generatePom>
+                            <url>${targetrepository}</url>
+                            <repositoryId>talend_nexus_deployment</repositoryId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <groupId>org.talend.repo</groupId>
+                            <version>${project.version}</version>
+                            <file>${project.build.directory}/${project.artifactId}.zip</file>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho.extras</groupId>
+                <artifactId>tycho-p2-extras-plugin</artifactId>
+                <version>0.22.0</version>
+                <executions>
+                    <execution>
+                        <id>create-p2-repository</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>publish-features-and-bundles</goal>
+                        </goals>
+                        <configuration>
+                            <metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
+                            <artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
+                            <sourceLocation>${project.build.directory}/p2</sourceLocation>
+                            <compress>true</compress>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-SNAPSHOT</version>
+		<version>7.3.1</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.bom/pom.xml
+++ b/build/talend.studio.bom/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>studio-bom</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
    <packaging>pom</packaging>
    <name>studio bom</name>
    
--- 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.3.1-SNAPSHOT</version>
+		<version>7.3.1</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.tos.all.p2.product/talend.product
+++ b/build/talend.studio.tos.all.p2.product/talend.product
@@ -63,6 +63,9 @@
      <feature id="org.talend.updates.feature"/>
      <feature id="org.talend.utils.feature"/>
      <feature id="org.talend.dataquality.se.test.feature"/>
+      <feature id="org.talend.help.di.feature"/>
+      <feature id="org.talend.help.bd.feature"/>
+      <feature id="org.talend.help.esb.feature"/>
   </features>


--- a/build/talend.studio.tos.bd.product/config.ini
+++ b/build/talend.studio.tos.bd.product/config.ini
@@ -15,4 +15,4 @@ eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile
 default.update.site.url=https://update.talend.com/Studio/tos/

-component.java.coordinates = org.talend.components:couchbase:1.3.0-SNAPSHOT
+component.java.coordinates = org.talend.components:couchbase:1.6.0
--- 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.3.1-SNAPSHOT</version>
+		<version>7.3.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- 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.3.1-SNAPSHOT</version>
+		<version>7.3.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- 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>7.3.1-SNAPSHOT</version>
+		<version>7.3.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- 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.3.1-SNAPSHOT</version>
+        <version>7.3.1</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

--- 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.3.1-SNAPSHOT</version>
+        <version>7.3.1</version>
        <relativePath />
    </parent>

@@ -174,7 +174,7 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>studio-add-conf</artifactId>
-									<version>7.2.1-SNAPSHOT</version>
+									<version>7.3.1-SNAPSHOT</version>
 									<type>zip</type>
 									<classifier />
 									<overWrite>true</overWrite>
@@ -456,29 +456,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>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-SNAPSHOT</version>
+		<version>7.3.1</version>
 		<relativePath />
 	</parent>

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

    <properties>
@@ -12,11 +12,11 @@
        <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)-->
-        <osgi.compatible.version>${base.version}-SNAPSHOT</osgi.compatible.version>
+        <osgi.compatible.version>${base.version}</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.2.1-SNAPSHOT</doc.version>
+        <maven.compatible.version>${base.version}</maven.compatible.version>
+        <repo.type>Release</repo.type>
+		<doc.version>7.3.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>
@@ -31,12 +31,12 @@
        <opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
        <opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url>
        <tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}/talend-tos-p2-repo-${osgi.compatible.version}.zip-unzip/</tos-p2-repo.url>
-        <tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/</tos-deps-p2-repo.url>
+        <tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/7.3.1-PATCH2/dependencies.p2.tos-7.3.1-PATCH2.zip-unzip/</tos-deps-p2-repo.url>
        <jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
        <osgi.ws>win32</osgi.ws>
        <osgi.os>win32</osgi.os>
        <osgi.arch>x86_64</osgi.arch>
-        <strictVersions>true</strictVersions>
+        <strictVersions>false</strictVersions>
    </properties>

    <distributionManagement>
@@ -105,7 +105,7 @@
            </snapshots>
            <url>${opensourcesnapshot-repo.url}</url>
        </repository>
-    </repositories>  
+    </repositories>

    <build>
        <pluginManagement>
@@ -134,12 +134,12 @@
                <artifactId>tycho-maven-plugin</artifactId>
                <version>${tycho.version}</version>
                <extensions>true</extensions>
-            </plugin>  
+            </plugin>
            <plugin>
                <groupId>org.eclipse.tycho</groupId>
                <artifactId>tycho-versions-plugin</artifactId>
                <version>${tycho.version}</version>
-            </plugin>			
+            </plugin>
            <plugin>
                <groupId>org.eclipse.tycho</groupId>
                <artifactId>target-platform-configuration</artifactId>
@@ -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,23 +170,23 @@
                            </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>
            </plugin>
@@ -204,6 +204,67 @@
        </plugins>
    </build>
    <profiles>
+	 <profile>
+		<id>patch</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
+                <timestamp>${maven.build.timestamp}</timestamp>
+                <maven.build.timestamp.format>yyyyMMdd'_'HHmm</maven.build.timestamp.format>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>talend_open_p2</id>
+                    <url>${tos-p2-repo.url}</url>
+                    <layout>p2</layout>
+                </repository>
+            </repositories>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>1.8</version>
+                        <executions>
+                            <execution>
+                                <id>parse-version</id>
+                                <goals>
+                                    <goal>parse-version</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.eclipse.tycho</groupId>
+                        <artifactId>tycho-packaging-plugin</artifactId>
+                        <version>${tycho.version}</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.eclipse.tycho.extras</groupId>
+                                <artifactId>tycho-buildtimestamp-jgit</artifactId>
+                                <version>${tycho-extras.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <strictBinIncludes>false</strictBinIncludes>
+                            <format>${timestamp}'-patch'</format>
+                            <archive>
+                                <addMavenDescriptor>false</addMavenDescriptor>
+                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
+                                <manifestEntries>
+                                    <Built-By />
+                                </manifestEntries>
+                            </archive>
+                            <timestampProvider>jgit</timestampProvider>
+                            <jgit.ignore>pom.xml</jgit.ignore>
+                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
        <profile>
            <id>nonofficial</id>
            <activation>
@@ -376,7 +437,7 @@
                                    </files>
                                </configuration>
                            </execution>
-                        </executions>      
+                        </executions>
                    </plugin>
                    <plugin>
                        <groupId>org.eclipse.tycho</groupId>
@@ -429,7 +490,7 @@
                                            <sequential>
                                                <echo>Signing @{jarFile}</echo>
                                                <exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true">
-                                                    <arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" /> 
+                                                    <arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
                                                </exec>
                                            </sequential>
                                        </ac:for>
Author	SHA1	Message	Date
Nicolas Rousseau	303d60d7a7	change p2 version to PATCH2	2020-06-24 15:55:35 +08:00
mbasiuk-talend	a87727f940	chore: bump components version to 0.28.4 (#274 ) * chore: bump components version to 0.28.4 * chore: update p2 tos repo url Co-authored-by: nrousseau <nrousseau@talend.com>	2020-05-22 11:14:27 +08:00
Liu Xinquan	7aefe14622	chore(TDQ-18431) using DQ SE 8.0.1 on 7.3.1 monthly release (#278 )	2020-05-21 20:11:19 +08:00
Zhiwei Xue	a8732814cc	chore: use another version for dependencies.p2.tos as p2 repository	2020-05-07 14:35:58 +08:00
Zhiwei Xue	c5fb502c21	Patch/731 tdi 43218 (#260 ) * patch(TPS-3845): Add azure AD feature for monthly patch (#258) * patch(TPS-3845): Add azure AD feature for monthly patch * patch(TPS-3845): Add azure AD feature for monthly patch Co-authored-by: wang wei <wwang@talend.com> Co-authored-by: Nicolas Rousseau <nrousseau@talend.com>	2020-03-26 10:52:07 +08:00
Pierre Teyssier	d95215f5c7	chore(TDI-43696): cherry-pick on release (#246 )	2020-02-18 08:39:16 +08:00
Jenkins Continuous Build server	f9e05fa54c	Set version to 7.3.1	2020-02-14 13:38:42 +01:00
build-talend-tdq	8712de2933	chore(Jenkins): Update DQ libs to 8.0.0 (#244 )	2020-02-13 18:44:21 +01:00
Ivan Gonchar	02d9cca2ad	chore: bump tcompV0 version to 0.28.1 (#242 )	2020-02-14 01:16:42 +08:00
wang wei	d240f4a4a8	fix(TDI-43678): bump tacokit version for studio (#239 )	2020-02-10 17:06:10 +08:00
wang wei	48c7fcab7f	fix(TDI-43671): bump tcompv0 and daikon in studio (#238 )	2020-02-10 12:25:26 +08:00
wang wei	5ef43c83e6	fix(TDI-43574): update the reference point for tacokit in studio (#237 )	2020-02-05 10:12:31 +08:00
build-talend-tdq	65816f5ea7	chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#236 )	2020-02-04 18:12:50 +01:00
Matthieu Debarre	733df4c762	DOCT-13317 (#233 )	2020-01-24 19:00:34 +01:00
build-talend	078d0b5476	chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT (#229 )	2020-01-09 10:47:53 +01:00
kjwang	ec11efc3b6	Fix TUP-24523 Online Help in studio - refactor help features (Fix a (#228 ) * Fix TUP-24523 Online Help in studio - refactor help features (Fix a comiple error) https://jira.talendforge.org/browse/TUP-24523 * Fix TUP-24523 Online Help in studio - refactor help features (Fix a comiple error) https://jira.talendforge.org/browse/TUP-24523	2019-12-30 19:16:15 +08:00
Pierre Teyssier	481c4a55a5	chore(TDI-43099): bump connectors (#227 )	2019-12-30 18:36:19 +08:00
Liu Xinquan	44e4727bc4	Revert "chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT (#225 )" (#226 ) This reverts commit `0d4b025d62`.	2019-12-24 17:50:42 +08:00
build-talend	0d4b025d62	chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT (#225 )	2019-12-24 10:55:07 +08:00
build-talend	8f9f871822	chore(Jenkins): Update DQ libs to 7.4.2-SNAPSHOT (#224 ) * chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT * use DQ lib SE 7.4.2-SNAPSHOT	2019-12-12 07:39:20 +01:00
Zhiwei Xue	e8ef341670	feat(TUP-24717):Activate/Deactivate plugins when install patch/update (#217 ) * feat(TUP-24717):Activate/Deactivate plugins when install patch/update * feat(TUP-25187): add test case. * feat(TUP-25187): remove testing repository.	2019-12-11 16:05:26 +08:00
Chao MENG	4de7a06af0	fix(TUP-24026): update jackson to 2.10.0 (#223 ) * fix(TUP-24026): update jackson to 2.10.0 make studio compatible with bonita plugins * fix(TUP-24026): update jackson to 2.10.0 make studio compatible with bonita plugins	2019-12-11 11:06:08 +08:00
nrousseau	b00f29c951	fix(TUP-24026): update jackson to 2.10.1	2019-12-09 14:32:25 +08:00
nrousseau	e23c04ab2a	fix(TUP-24026): update jackson to 2.10.1	2019-12-09 13:58:13 +08:00
Chao MENG	ad0c723115	fix(TUP-24026): update jackson to 2.10.0 (#215 ) * fix(TUP-24026): update jackson to 2.10.0 https://jira.talendforge.org/browse/TUP-24026 * fix(TUP-24026): update jackson to 2.10.1 https://jira.talendforge.org/browse/TUP-24026	2019-12-09 10:55:57 +08:00
Emmanuel GALLOIS	ddebe7e96a	fix(TDI-43300): fix tacokit component jar clash with locales (#222 )	2019-12-02 21:34:51 +08:00
nrousseau	25836f9d3e	Revert "chore(TUP-21116) upgrade tycho version to 1.5.1" This reverts commit `fc4e9b6159`.	2019-12-02 14:47:54 +08:00
Nicolas Rousseau	fc4e9b6159	chore(TUP-21116) upgrade tycho version to 1.5.1	2019-12-02 14:45:54 +08:00
build-talend	32733397a5	chore(Jenkins): Update DQ libs to 7.4.1-SNAPSHOT (#216 )	2019-10-31 16:42:14 +01:00
build-talend	405a0c1960	chore(Jenkins): Update DQ libs to 7.4.0-SNAPSHOT (#214 )	2019-10-22 11:09:27 +02:00
nrousseau	3157c8dbdf	Update studio configuration for 7.3.1	2019-10-18 10:23:58 +08:00
mbasiuk-talend	2d9e2e0dd8	fix(TDI-42834): update commons-compress lib version (#205 ) * fix(TDI-42834): update commons-compress lib version * fix(TDI-42834): upgrade commons-compress to latest version	2019-10-09 02:00:33 +02:00
build-talend	9bdd384b29	chore(Jenkins): Update DQ libs to 7.3.0-SNAPSHOT (#212 )	2019-09-24 17:26:45 +02:00
build-talend	61d9cec36c	chore(Jenkins): Update DQ libs to 7.2.2-SNAPSHOT (#209 )	2019-09-16 19:22:13 +02:00
build-talend	345a7c6491	chore(Jenkins): Update DQ libs to 7.2.1 (#208 )	2019-09-16 17:42:17 +02:00