fix(TDI-44125): Bump daikon-ee.format version (#270 ) (#292 )

chore(TUP-27463):Backport TUP-26304 to 7.3:Re-use (#291 )
talend.studio.parent.pom as a root studio bom for SE/EE product
2020-07-09 15:32:27 +03:00 · 2020-07-02 15:38:42 +08:00 · 2020-06-11 14:36:46 +08:00 · 2020-06-10 11:51:34 +08:00 · 2020-05-22 21:47:13 +08:00 · 2020-05-22 10:58:24 +08:00
13 changed files with 79 additions and 80 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-PATCH</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -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>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -1,18 +1,21 @@
 <?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>
+	<parent>
+        <groupId>org.talend.studio</groupId>
+        <artifactId>parent-pom</artifactId>
+        <version>7.3.1-PATCH</version>
+        <relativePath>../../talend.studio.parent.pom</relativePath>
+    </parent>
    <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.1</components.version>
-        <dataquality.lib.version>8.0.0</dataquality.lib.version>
+        <dataquality.lib.version>8.0.2</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>
--- 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-PATCH</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.bom/pom.xml
+++ b/build/talend.studio.bom/pom.xml
@@ -1,14 +0,0 @@
-<?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.studio</groupId>
-    <artifactId>studio-bom</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>studio bom</name>
-    
-    <properties>
-        <daikon.version>0.31.6</daikon.version>
-    </properties>
-    
-</project>
--- a/build/talend.studio.tos.all.p2.product/pom.xml
+++ b/build/talend.studio.tos.all.p2.product/pom.xml
@@ -4,12 +4,13 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath />
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.3.1.PATCH</version>

 	<properties>
 		<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
--- 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.6.0
+component.java.coordinates = org.talend.components:couchbase:1.9.0,org.talend.components:cosmosDB:1.9.0
--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

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

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

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

    <artifactId>org.talend.studio.tos.esb.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>7.3.1.PATCH</version>
 </project>
--- 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-PATCH</version>
        <relativePath />
    </parent>

@@ -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-PATCH</version>
 		<relativePath />
 	</parent>

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

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <components.version>0.28.5</components.version>
+        <daikon.version>0.31.10</daikon.version>
+        <daikon-ee.format.verison>1.5.0</daikon-ee.format.verison>
+        <daikon.audit.version>1.16.0</daikon.audit.version>
+        <org.talend.daikon.crypto-utils.version>0.31.10</org.talend.daikon.crypto-utils.version>
        <tycho.version>0.22.0</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)-->
-        <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>
+        <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>
@@ -30,13 +35,13 @@
        <equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
        <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-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}.PATCH/talend-tos-p2-repo-${osgi.compatible.version}.PATCH.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}-PATCH/dependencies.p2.tos-${maven.compatible.version}-PATCH.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>
@@ -155,12 +160,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 +175,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>
@@ -271,8 +276,8 @@
                <activeByDefault>true</activeByDefault>
            </activation>
            <properties>
-                <release.suffix>-SNAPSHOT</release.suffix>
-                <revision.filename>SNAPSHOT</revision.filename>
+                <release.suffix>-PATCH</release.suffix>
+                <revision.filename>PATCH</revision.filename>
                <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
            </properties>
            <build>
Author	SHA1	Message	Date
Roman	fe4681c4e0	fix(TDI-44125): Bump daikon-ee.format version (#270 ) (#292 )	2020-07-09 15:32:27 +03:00
Zhiwei Xue	57719ae3ed	chore(TUP-27463):Backport TUP-26304 to 7.3:Re-use (#291 ) talend.studio.parent.pom as a root studio bom for SE/EE product	2020-07-02 15:38:42 +08:00
jzhao	d82bcc0756	chore: bump tcompV0 version to 0.28.5 (#286 )	2020-06-11 14:36:46 +08:00
build-talend-tdq	f8e1658e8c	chore(Jenkins): Update DQ libs to 8.0.2 (#285 )	2020-06-10 11:51:34 +08:00
mbasiuk-talend	cbce9b8c6b	chore: backport patch731 changes to maintenance/7.3 (#281 )	2020-05-22 21:47:13 +08:00
Liu Xinquan	650a00c919	chore(TDQ-18431) using DQ SE 8.0.1 on 7.3.1 monthly release (#277 )	2020-05-22 10:58:24 +08:00
pyzhou	50ad6ec014	fix(TDI-43717):backport cosmos to 7.3 (#275 )	2020-05-19 16:32:45 +08:00
nrousseau	1a9cb4dc28	chore(TUP-26710): fix tos p2 build from maintenance/7.3 (#273 )	2020-05-18 16:11:52 +08:00
nrousseau	20061950b5	chore(TUP-26710): update pom (#272 ) * chore(TUP-26710): update pom * chore(TUP-26710): update pom	2020-05-18 13:52:25 +08:00
Zhiwei Xue	e17c5b760d	chore(TUP-26710):update version (#268 ) * chore(TUP-26710):update version * Set version to 7.3.1 PATCH Co-authored-by: Jenkins Continuous Build server <jenkins@tal-rd02.talend.lan>	2020-05-11 17:01:09 +08:00
Ivan Gonchar	455396a79d	chore: bump Components version to 0.28.4-SNAPSHOT (#259 )	2020-03-26 07:57:01 +08:00
Ivan Gonchar	08a5fadc26	chore: bump TCK components version to 1.6.3-SNAPSHOT (#256 )	2020-03-20 11:06:30 +08:00
Ivan Gonchar	6d2df45139	chore: bump Components version to 0.28.3-SNAPSHOT (#255 )	2020-03-20 10:53:25 +08:00
build-talend-tdq	47243627ee	chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#249 )	2020-02-28 14:53:00 +01:00
Jenkins Continuous Build server	8be6746d1e	Set version to 7.3.2 SNAPSHOT	2020-02-28 13:00:25 +01: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