fix: tychoversion

chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#304 )
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2020-07-20 17:35:02 +08:00 · 2020-07-20 14:19:57 +08:00 · 2020-07-19 09:22:51 +08:00 · 2020-07-17 16:05:40 +08:00 · 2020-07-17 15:40:13 +08:00 · 2020-07-14 12:14:40 +08:00
13 changed files with 129 additions and 76 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.4.1-SNAPSHOT</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -137,7 +137,7 @@
 		<dependency>
            <groupId>commons-beanutils</groupId>
            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.3</version>
+            <version>1.9.4</version>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
@@ -329,7 +329,7 @@
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.3</version>
+			<version>1.9.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</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.4.1-SNAPSHOT</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.3.1-SNAPSHOT</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.4.1-SNAPSHOT</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,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-SNAPSHOT</version>
+		<version>7.4.1-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- 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.11.0-SNAPSHOT,org.talend.components:cosmosDB:1.11.0-SNAPSHOT
--- 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.4.1-SNAPSHOT</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.4.1-SNAPSHOT</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.4.1-SNAPSHOT</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.4.1-SNAPSHOT</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.4.1-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -33,11 +33,35 @@
            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
        </repository>
    </repositories>
-
+    <pluginRepositories>
+        <pluginRepository>
+            <id>releases</id>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>snapshots</id>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+        </pluginRepository>
+    </pluginRepositories>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
        <product.final.name>${storage.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
        <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>
    </properties>

    <build>
@@ -206,6 +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>
+                    <outputDirectory>${bom.out.dir}</outputDirectory>
+                    <productVersion>${product.version}</productVersion>
+                </configuration>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
@@ -456,29 +498,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>
@@ -497,6 +539,19 @@
                                        <mkdir dir="${product.dir}" />
                                        <echo>Moving product ZIP ${project.build.directory}/products/${product.final.name}.zip to ${product.dir}</echo>
                                        <move todir="${product.dir}" file="${project.build.directory}/products/${product.final.name}.zip" />
+                                        
+                                        <!-- Copy bom -->
+                                        <property name="bom.build.path" value="${product.build.id}/BOMS" />
+                                        <property name="bom.dir" value="${storage}/${bom.build.path}" />
+                                        <mkdir dir="${bom.dir}" />
+                                        <echo>Copying ${bom.out.dir}/BOM.xlsx to ${bom.dir}/${bom.final.name}</echo>
+                                        <copy tofile="${bom.dir}/${bom.final.name}" file="${bom.out.dir}/BOM.xlsx" />
+                                        <echo>Copying ${bom.out.dir}/jarlist.json to ${bom.dir}/${bom.final.name.prefix}-jarlist.json</echo>
+                                        <copy tofile="${bom.dir}/${bom.final.name.prefix}-jarlist.json" file="${bom.out.dir}/jarlist.json" />
+                                        <echo>Copying ${bom.out.dir}/NOTICE.txt to ${bom.dir}/${bom.final.name.prefix}-NOTICE.txt</echo>
+                                        <copy tofile="${bom.dir}/${bom.final.name.prefix}-NOTICE.txt" file="${bom.out.dir}/NOTICE.txt" />
+                                        <echo>Copying ${bom.out.dir}/report.txt to ${bom.dir}/${bom.final.name.prefix}-report.txt</echo>
+                                        <copy tofile="${bom.dir}/${bom.final.name.prefix}-report.txt" file="${bom.out.dir}/report.txt" />
                                        <if>
                                            <and>
                                                <equals arg1="${env.HUDSON_URL}" arg2="http://newbuild.talend.com:8180/" />
@@ -504,6 +559,10 @@
                                            </and>
                                            <then>
                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
+                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name}${line.separator}</echo>
+                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-jarlist.json${line.separator}</echo>
+                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-NOTICE.txt${line.separator}</echo>
+                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-report.txt${line.separator}</echo>
                                            </then>
                                        </if>
                                        <exec executable="openssl" dir="${product.dir}" outputproperty="sha256">
--- 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.4.1-SNAPSHOT</version>
 		<relativePath />
 	</parent>

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

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho.version>0.22.0</tycho.version>
+        <components.version>0.29.0-SNAPSHOT</components.version>
+        <daikon.version>0.31.11</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.11</org.talend.daikon.crypto-utils.version>
+        <tycho.version>1.7.0</tycho.version>
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
-        <base.version>7.3.1</base.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}-SNAPSHOT</osgi.compatible.version>
        <!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
@@ -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>
Author	SHA1	Message	Date
bhe-talendbj	8d713d444f	fix: tychoversion	2020-07-20 17:35:02 +08:00
build-talend-tdq	0d3e289820	chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#304 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-07-20 14:19:57 +08:00
build-talend-tdq	d5a3675f25	chore(Jenkins): Update DQ libs to 8.1.1-SNAPSHOT (#303 )	2020-07-19 09:22:51 +08:00
build-talend-tdq	81648c0cc8	chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#302 )	2020-07-17 16:05:40 +08:00
build-talend-tdq	056fc2d811	chore(Jenkins): Update DQ libs to 8.3.0 (#301 )	2020-07-17 15:40:13 +08:00
hzhao-talendbj	429db0187b	TUP-27154 - Update BeanUtils to 1.9.4 (#269 ) (#297 ) Co-authored-by: Colm O hEigeartaigh <coheigea@users.noreply.github.com>	2020-07-14 12:14:40 +08:00
nrousseau	7474f094f2	Revert "TUP-27154 - Update BeanUtils to 1.9.4 (#269 )" (#295 ) This reverts commit `d8c10ea4a3`.	2020-07-13 18:11:27 +08:00
Colm O hEigeartaigh	d8c10ea4a3	TUP-27154 - Update BeanUtils to 1.9.4 (#269 )	2020-07-03 12:26:12 +08:00
pyzhou	79db3f9919	fix(TDI-44402):update tacokit version studio (#287 )	2020-06-19 11:50:07 +08:00
wang wei	9a81eaa34d	fix(TDI-44306): adjust the audit event log integration in studio (#282 )	2020-06-10 16:30:12 +08:00
bhe-talendbj	c7bfcae92b	bugfix(TUP-27224): Upgrade crypto-utils and daikon to 0.31.11 (#279 ) * fix(TUP-27224): Upgrade crypto-utils to 2.1.0 * fix(TUP-27224): Upgrade daikon version to 2.1.0 * fix(TUP-27224): Upgrade daikon version to 0.31.11	2020-05-26 19:56:32 +08:00
pyzhou	06e0945fa3	fix(TDI-44203):upgrade tacokit version to 1.10.0-SNAPSHOT for studio (#271 )	2020-05-15 09:38:04 +08:00
Roman	8637c51f88	fix(TDI-44125): Bump daikon-ee.format version (#270 )	2020-05-13 13:17:17 +03:00
bhe-talendbj	99dcdfb0db	feat(TUP-26303): Copy jarlist and notice,report to bom folder (#267 )	2020-04-14 10:58:44 +08:00
pyzhou	00780637ba	feat(TDI-43717):integrate cosmosDB into studio (#266 )	2020-04-14 10:04:01 +08:00
bhe-talendbj	d69a3c8a88	feat(TUP-26303): Integrate bom tool plugin (#261 ) * feat(TUP-26303): Integrate cve tool plugin * feat(TUP-26303): Add bom outputs * feat(TUP-26303): Correct artifact id * feat(TUP-26303): Copy bom only * feat(TUP-26303): Fix unintentional changes * feat(TUP-26303): Update directory of bom * feat(TUP-26303): Add pluginRepository for bomtool * feat(TUP-26303): Update echo message	2020-04-08 18:06:58 +08:00
Zhiwei Xue	d8f17f42f8	feat(TUP-26304):Have a root studio bom for SE/EE product (#251 )	2020-04-01 15:06:52 +08:00
build-talend-tdq	05c09ee985	chore(Jenkins): Update DQ libs to 8.1.1-SNAPSHOT (#254 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-03-14 22:17:06 +01:00
Roman	51b442c2b4	chore: bump tacokit version for studio (#253 )	2020-03-11 23:26:23 +08:00
mbasiuk-talend	9f9394fa0f	chore: bump components-version to 0.29.0-SNAPSHOT (#250 ) * chore: bump components-version to 0.29.0-SNAPSHOT	2020-03-04 18:22:49 +08:00
build-talend-tdq	cad210df20	chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#248 )	2020-02-25 15:17:06 +01:00
Jenkins Continuous Build server	69dfab2bf6	Set version to 7.4.1 SNAPSHOT	2020-02-21 15:34:46 +01:00
Roman	878d4211db	chore: bump Components version to 0.28.2 (#245 )	2020-02-14 22:02:43 +08:00