Test Java 11

chore(TDI-46267): bump connectors to 1.23.0-SNAPSHOT (#420 )
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>
2021-06-15 17:28:11 +02:00 · 2021-06-09 14:13:55 +03:00 · 2021-06-09 11:13:01 +08:00 · 2021-05-10 18:14:07 +08:00 · 2021-05-08 17:09:37 +08:00 · 2021-05-08 17:03:14 +08:00
4 changed files with 28 additions and 22 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -157,12 +157,12 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.15-TALEND</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.15-TALEND</version>
 		</dependency>

 		<!-- Avro with minimum depdencies -->
@@ -393,6 +393,12 @@
            <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.23.0-SNAPSHOT,org.talend.components:cosmosDB:1.23.0-SNAPSHOT
--- 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.1-SNAPSHOT</components.version>
+        <components.version>0.33.0-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</studio-utils.version>
+        <studio-utils.version>1.0.2</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>
@@ -117,7 +118,7 @@
            </snapshots>
            <url>${opensourcesnapshot-repo.url}</url>
        </repository>
-    </repositories>  
+    </repositories>

    <build>
        <pluginManagement>
@@ -146,12 +147,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>
@@ -182,7 +183,7 @@
                            </restrictTo>
                        </filter>

-                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
+                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
 				 <filter>
 					<type>java-package</type>
 					<id>javax.persistence</id>
@@ -192,13 +193,13 @@
 					</restrictTo>
 				 </filter>
 -->
-                        <!-- example 3: work around Equinox bug 348045 
+                        <!-- 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>
@@ -211,9 +212,9 @@
 			<arg>-err:+discouraged,forbidden</arg>
 			<arg>-warn:+discouraged,forbidden</arg>
 		    </compilerArgs>
-                    <compilerVersion>1.8</compilerVersion>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <compilerVersion>11</compilerVersion>
+                    <source>11</source>
+                    <target>11</target>
                </configuration>
            </plugin>
        </plugins>
@@ -452,7 +453,7 @@
                                    </files>
                                </configuration>
                            </execution>
-                        </executions>      
+                        </executions>
                    </plugin>
                    <plugin>
                        <groupId>org.eclipse.tycho</groupId>
@@ -505,7 +506,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
Irene Wang	34a2d1725e	Test Java 11	2021-06-15 17:28:11 +02:00
chmyga	848c8c958d	chore(TDI-46267): bump connectors to 1.23.0-SNAPSHOT (#420 ) Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>	2021-06-09 14:13:55 +03:00
pyzhou	17f5d98efa	fix(TDI-46260): bump tcompv0 connectors to 0.33.0-SNAPSHOT (#418 )	2021-06-09 11:13:01 +08:00
hzhao-talendbj	53ee776d01	chore(TUP-30255): upgrade studio-util version (#404 )	2021-05-10 18:14:07 +08:00
mbasiuk-talend	40762313c2	chore(TDI-46032): bump connectors version to 1.22.0-SNAPSHOT (#407 )	2021-05-08 17:09:37 +08:00
jzhao	eba2b2d52b	fix(TDI-46033): bump tcompv0 connectors to 0.32.0-SNAPSHOT (#410 )	2021-05-08 17:03:14 +08:00
jiezhang-tlnd	5e4c564fa6	fix(TUP-30960)CVE: jackson-mapper-1.9.14.TALEND (#402 ) * fix(TUP-30960)CVE: jackson-mapper-1.9.14.TALEND * plan deploy p2 * test p2 * test p2 * test p2 * test p2 * test p2 * test p2 * test p2 * change back temp p2	2021-05-06 11:47:29 +08: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