DEVOPS-13537 - Sign Studio launchers for 7.4.1 (Windows)

chore(TUP-30992)CVE: junit-4.11,4.13 (#392 )
* chore(TUP-30992)CVE: junit-4.11,4.13 * remove classifier bundle * Update pom.xml * switch the place of eclipse_orbit
2021-04-30 15:45:34 +02:00 · 2021-04-15 16:15:22 +08:00 · 2021-04-13 13:35:02 +03:00 · 2021-04-12 10:10:43 +08:00 · 2021-04-08 14:24:58 +08:00 · 2021-04-02 18:19:22 +08:00
5 changed files with 22 additions and 10 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -387,6 +387,18 @@
            <version>${studio-utils.version}</version>
            <classifier>bundle</classifier>
        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov</artifactId>
+            <version>1.68.0</version>
+            <classifier>bundle</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+	    <classifier>bundle</classifier>
+        </dependency>
 	</dependencies>

 </project>
--- a/build/talend.studio.tos.all.p2.product/talend.product
+++ b/build/talend.studio.tos.all.p2.product/talend.product
@@ -43,7 +43,6 @@
      <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"/>
--- 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.20.0-SNAPSHOT,org.talend.components:cosmosDB:1.20.0-SNAPSHOT
+component.java.coordinates = org.talend.components:couchbase:1.21.0-SNAPSHOT,org.talend.components:cosmosDB:1.21.0-SNAPSHOT
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
@@ -134,7 +134,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-launcher-binaries</artifactId>
-                                    <version>7.4.1</version>
+                                    <version>7.4.1a</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -8,12 +8,12 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <components.version>0.30.0-SNAPSHOT</components.version>
+        <components.version>0.30.2-SNAPSHOT</components.version>
        <daikon.version>0.31.11</daikon.version>
        <daikon-ee.format.verison>3.2.0</daikon-ee.format.verison>
        <daikon.audit.version>1.16.1</daikon.audit.version>
        <org.talend.daikon.crypto-utils.version>0.31.11</org.talend.daikon.crypto-utils.version>
-        <studio-utils.version>1.0.1-SNAPSHOT</studio-utils.version>
+        <studio-utils.version>1.0.1</studio-utils.version>
        <tycho.version>1.7.0</tycho.version>
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
        <base.version>7.4.1</base.version>
@@ -62,16 +62,17 @@
    </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>
            <layout>p2</layout>
        </repository>
+        <repository>
+            <id>eclipse_orbit</id>
+            <url>${eclipse-orbit-p2-repo.url}</url>
+            <layout>p2</layout>
+        </repository>
        <repository>
            <id>eclipse_repo</id>
            <url>${eclipse-repo.url}</url>
Author	SHA1	Message	Date
Irene Wang	5403b66cd4	DEVOPS-13537 - Sign Studio launchers for 7.4.1 (Windows)	2021-04-30 15:45:34 +02:00
jiezhang-tlnd	fb547ac3f8	chore(TUP-30992)CVE: junit-4.11,4.13 (#392 ) * chore(TUP-30992)CVE: junit-4.11,4.13 * remove classifier bundle * Update pom.xml * switch the place of eclipse_orbit	2021-04-15 16:15:22 +08:00
mbasiuk-talend	87e2aebfd2	chore(TDI-45894): prepare the next connectors iteration (#394 )	2021-04-13 13:35:02 +03:00
wang wei	ea24fc1bc5	fix(TDI-45896): upgrade tcompv0 connectors for studio (#396 )	2021-04-12 10:10:43 +08:00
Chao MENG	dfb55aa4fe	feat(TUP-30475): Test of lite studio (#391 )	2021-04-08 14:24:58 +08:00
bhe-talendbj	f282b61182	bugfix(TUP-26813): upgrade org.bouncycastle.bcprov to 1.68 (#387 ) * fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68 * fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68 * fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68 * fix(TUP-26813): deploy org.bouncycastle 1.68 * fix(TUP-26813): deploy org.bouncycastle 1.68 * fix(TUP-26813): update studio-utils	2021-04-02 18:19:22 +08:00
wang wei	0f1379f4ff	fix(TDI-45748): use 0.30.1snapshot tcompv0 for studio master branch (#384 )	2021-03-24 18:00:14 +08:00