chore(TDI-44671): bump tck components (#319 )

* bump version of TCK components [1.12.0-SNAPSHOT] -> [1.14.0-SNAPSHOT]
fix(TUP-27438): restore org.apache.commons.codec (#315 )
2020-09-11 12:53:38 +03:00 · 2020-09-08 15:26:27 +08:00 · 2020-09-03 12:26:18 +03:00 · 2020-09-01 11:56:18 +08:00 · 2020-08-31 09:47:23 +08:00 · 2020-08-25 16:00:29 +08:00
12 changed files with 72 additions and 64 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.4.1-M0</version>
+		<version>7.4.1-SNAPSHOT</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -312,9 +312,9 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
+			<version>1.14</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>
@@ -381,6 +381,12 @@
 			<artifactId>woodstox-core</artifactId>
 			<version>5.3.0</version>
 		</dependency>
+        <dependency>
+            <groupId>org.talend.studio</groupId>
+            <artifactId>studio-utils</artifactId>
+            <version>${studio-utils.version}</version>
+            <classifier>bundle</classifier>
+        </dependency>
 	</dependencies>

 </project>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>parent-pom</artifactId>
-        <version>7.4.1-M0</version>
+        <version>7.4.1-SNAPSHOT</version>
        <relativePath>../../talend.studio.parent.pom</relativePath>
    </parent>
    <groupId>org.talend.repo</groupId>
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.4.1-M0</version>
+		<version>7.4.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,13 +4,12 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.4.1-M0</version>
+		<version>7.4.1-SNAPSHOT</version>
 		<relativePath />
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>7.4.1.M0</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.11.0-SNAPSHOT,org.talend.components:cosmosDB:1.11.0-SNAPSHOT
+component.java.coordinates = org.talend.components:couchbase:1.14.0-SNAPSHOT,org.talend.components:cosmosDB:1.14.0-SNAPSHOT
--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -4,11 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.4.1-M0</version>
+		<version>7.4.1-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

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

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

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

    <artifactId>org.talend.studio.tos.esb.product</artifactId>
    <packaging>eclipse-repository</packaging>
-	<version>7.4.1.M0</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.4.1-M0</version>
+        <version>7.4.1-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -61,7 +61,7 @@
        <studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.os}/${osgi.ws}/${osgi.arch}</studio.dir>
        <bom.out.dir>${project.build.directory}/products/${project.artifactId}-bom</bom.out.dir>
        <bom.final.name.prefix>${storage.prefix}-${product.timestamp}-V${product.version}-${revision.filename}</bom.final.name.prefix>
-        <bom.final.name>${bom.final.name.prefix}-bom.xlsx</bom.final.name>
+        <bom.final.name>${bom.final.name.prefix}-bom.xlsx</bom.final.name>
    </properties>

    <build>
@@ -134,7 +134,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-launcher-binaries</artifactId>
-                                    <version>4.4.1e</version>
+                                    <version>7.4.1</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
@@ -142,7 +142,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
-                                    <version>7.3.1</version>
+                                    <version>7.4.1</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
@@ -230,24 +230,24 @@
                    </execution>
                </executions>
            </plugin>
-            <plugin>
-                <groupId>org.talend.studio</groupId>
-                <artifactId>bomtool</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>genNotice</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <studioDirectory>${studio.dir}</studioDirectory>
+            <plugin>
+                <groupId>org.talend.studio</groupId>
+                <artifactId>bomtool</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>genNotice</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <studioDirectory>${studio.dir}</studioDirectory>
                    <outputDirectory>${bom.out.dir}</outputDirectory>
-                    <productVersion>${product.version}</productVersion>
-                </configuration>
-            </plugin>
+                    <productVersion>${product.version}</productVersion>
+                </configuration>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.4.1-M0</version>
+		<version>7.4.1-SNAPSHOT</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.4.1-M0</version>
+    <version>7.4.1-SNAPSHOT</version>
    <packaging>pom</packaging>

    <properties>
@@ -13,14 +13,15 @@
        <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.11</org.talend.daikon.crypto-utils.version>
+        <studio-utils.version>1.0.0-SNAPSHOT</studio-utils.version>
        <tycho.version>0.22.0</tycho.version>
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
        <base.version>7.4.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}.M0</osgi.compatible.version>
+        <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}-M0</maven.compatible.version>
-        <repo.type>Release</repo.type>
+        <maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
+        <repo.type>Snapshot</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>
@@ -37,11 +38,12 @@
        <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>
+        <eclipse-orbit-p2-repo.url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository/</eclipse-orbit-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>false</strictVersions>
+        <strictVersions>true</strictVersions>
    </properties>

    <distributionManagement>
@@ -60,6 +62,11 @@
    </distributionManagement>

    <repositories>
+        <repository>
+            <id>eclipse_orbit</id>
+            <url>${eclipse-orbit-p2-repo.url}</url>
+            <layout>p2</layout>
+        </repository>
        <repository>
            <id>tos-deps</id>
            <url>${tos-deps-p2-repo.url}</url>
@@ -160,12 +167,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>
@@ -175,22 +182,22 @@
                            </restrictTo>
                        </filter>

-                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
-				 <filter>
-					<type>java-package</type>
-					<id>javax.persistence</id>
-					<restrictTo>
-					   <type>eclipse-plugin</type>
-					   <id>javax.persistence</id>
-					</restrictTo>
-				 </filter>
+                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
+				 <filter>
+					<type>java-package</type>
+					<id>javax.persistence</id>
+					<restrictTo>
+					   <type>eclipse-plugin</type>
+					   <id>javax.persistence</id>
+					</restrictTo>
+				 </filter>
 -->
-                        <!-- example 3: work around Equinox bug 348045 
-				 <filter>
-					<type>p2-installable-unit</type>
-					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
-					<removeAll />
-				 </filter>
+                        <!-- example 3: work around Equinox bug 348045 
+				 <filter>
+					<type>p2-installable-unit</type>
+					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
+					<removeAll />
+				 </filter>
 -->				 
                    </filters>
                </configuration>
Author	SHA1	Message	Date
Oleksandr Zhelezniak	ba59819f49	chore(TDI-44671): bump tck components (#319 ) * bump version of TCK components [1.12.0-SNAPSHOT] -> [1.14.0-SNAPSHOT]	2020-09-11 12:53:38 +03:00
bhe-talendbj	8dad0f7c70	fix(TUP-27438): restore org.apache.commons.codec (#315 )	2020-09-08 15:26:27 +08:00
Oleksandr Zhelezniak	311822ac44	chore(TDI-44799): bump version of TCK components (#314 ) * bump version of TCK components from [1.11.0-SNAPSHOT] to [1.12.0-SNAPSHOT]	2020-09-03 12:26:18 +03:00
jzhao	416d854b2b	fix(TDI-44145):update common-codec for p2 (#311 )	2020-09-01 11:56:18 +08:00
bhe-talendbj	7a4af470a4	feat(TUP-27438): Add studio-utils to dependencies.p2.tos (#310 ) * feat(TUP-27438): Add studio-utils to dependencies.p2.tos * feat(TUP-27438): update groupId	2020-08-31 09:47:23 +08:00
jiezhang-tlnd	b83a21f72b	feat(TUP-28305)Update Talend logo for studio 7.4 launcher (#309 )	2020-08-25 16:00:29 +08:00