DEVOPS-3841 Add profile to unpack all plugins for Black Duck scans

chore(Jenkins): update DQ libs to 1.6.6-SNAPSHOT (#85 )
Set version to 6.5.2 SNAPSHOT
2018-02-21 16:13:05 +01:00 · 2018-02-12 17:28:32 +01:00 · 2018-01-10 16:37:46 +01:00 · 2018-01-10 16:31:41 +01:00 · 2018-01-10 09:50:00 +08:00 · 2018-01-07 12:18:56 +08:00
12 changed files with 120 additions and 95 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>6.4.2-SNAPSHOT</version>
+		<version>6.5.2-SNAPSHOT</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -20,37 +20,37 @@
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-common</artifactId>
-			<version>1.6.5-SNAPSHOT</version>
+			<version>1.6.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic-model</artifactId>
-			<version>1.6.5-SNAPSHOT</version>
+			<version>1.6.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic</artifactId>
-			<version>1.6.5-SNAPSHOT</version>
+			<version>1.6.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-statistics</artifactId>
-			<version>1.6.5-SNAPSHOT</version>
+			<version>1.6.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-record-linkage</artifactId>
-			<version>3.3.5-SNAPSHOT</version>
+			<version>3.3.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-standardization</artifactId>
-			<version>3.3.5-SNAPSHOT</version>
+			<version>3.3.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-sampling</artifactId>
-			<version>2.4.5-SNAPSHOT</version>
+			<version>2.4.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
@@ -182,6 +182,12 @@
 			<version>${components.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-couchbase</artifactId>
+			<version>${components.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
 			<artifactId>components-snowflake</artifactId>
@@ -202,7 +208,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
-			<artifactId>components-marketo</artifactId>
+			<artifactId>components-marketo-definition</artifactId>
 			<version>${components.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
@@ -217,7 +223,7 @@
 			<version>${components.version}</version>
 			<classifier>bundle</classifier>
 		</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
@@ -5,11 +5,11 @@

    <groupId>org.talend.repo</groupId>
    <artifactId>dependencies.p2</artifactId>
-    <version>6.4.2-SNAPSHOT</version>
+    <version>6.5.2-SNAPSHOT</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.19-SNAPSHOT</components.version>
+        <components.version>0.19.9</components.version>
        <daikon.version>0.17.2</daikon.version>
    </properties>

--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.4.2-SNAPSHOT</version>
+		<version>6.5.2-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,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.4.2-SNAPSHOT</version>
+		<version>6.5.2-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- 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>6.4.2-SNAPSHOT</version>
+		<version>6.5.2-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>6.4.2-SNAPSHOT</version>
+		<version>6.5.2-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>6.4.2-SNAPSHOT</version>
+		<version>6.5.2-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>6.4.2-SNAPSHOT</version>
+        <version>6.5.2-SNAPSHOT</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

--- a/build/talend.studio.tos.mdm.product/pom.xml
+++ b/build/talend.studio.tos.mdm.product/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>6.4.2-SNAPSHOT</version>
+        <version>6.5.2-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>6.4.2-SNAPSHOT</version>
+        <version>6.5.2-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -235,35 +235,35 @@
                    </execution>
                </executions>
            </plugin>
-            <!--    <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.3.2</version>
-                <executions>
-                    <execution>
-                        <id>generate-javajet</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>java</executable>
-                    <workingDirectory>${studio.dir}</workingDirectory>
-                    <arguments>
-                        <argument>-Xmx1536m</argument>
-                        <argument>-XX:MaxPermSize=512m</argument>
-                        <argument>-classpath</argument>
-                        <argument>${studio.dir}/plugins/${equinox.build}</argument>
-                        <argument>org.eclipse.core.launcher.Main</argument>
-                        <argument>-application</argument>
-                        <argument>org.talend.designer.codegen.CodeGenInit</argument>
-                        <argument>-nosplash</argument>
-                        <argument>-consoleLog</argument>
-                        <argument>-Dtalend.licence.path=${studio.dir}/license</argument>
-                    </arguments>
-                </configuration>
+            <!--    <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <id>generate-javajet</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>java</executable>
+                    <workingDirectory>${studio.dir}</workingDirectory>
+                    <arguments>
+                        <argument>-Xmx1536m</argument>
+                        <argument>-XX:MaxPermSize=512m</argument>
+                        <argument>-classpath</argument>
+                        <argument>${studio.dir}/plugins/${equinox.build}</argument>
+                        <argument>org.eclipse.core.launcher.Main</argument>
+                        <argument>-application</argument>
+                        <argument>org.talend.designer.codegen.CodeGenInit</argument>
+                        <argument>-nosplash</argument>
+                        <argument>-consoleLog</argument>
+                        <argument>-Dtalend.licence.path=${studio.dir}/license</argument>
+                    </arguments>
+                </configuration>
            </plugin>-->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -503,29 +503,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>6.4.2-SNAPSHOT</version>
+		<version>6.5.2-SNAPSHOT</version>
 		<relativePath />
 	</parent>

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

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <tycho.version>0.22.0</tycho.version>
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
-        <base.version>6.4.2</base.version>
+        <base.version>6.5.2</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)-->
@@ -24,7 +24,7 @@
        <eclipse-repo.url>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.4.1-SNAPSHOT/talend-eclipse-p2-repo-6.4.1-SNAPSHOT.zip-unzip</eclipse-repo.url>
        <eclipse-emf-repo.url>${opensourcesnapshot-unziprepo.url}/emf-compare-update/3.0.1-SNAPSHOT/emf-compare-update-3.0.1-SNAPSHOT.zip-unzip</eclipse-emf-repo.url>
        <babel-repo.url>${opensourcesnapshot-unziprepo.url}/talend-babel-p2-repo/4.4.1-SNAPSHOT/talend-babel-p2-repo-4.4.1-SNAPSHOT.zip-unzip</babel-repo.url>
-        <doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.4.1-SNAPSHOT/talend-doc-p2-repo-6.4.1-SNAPSHOT.zip-unzip/</doc-repo.url>
+        <doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.5.1-SNAPSHOT/talend-doc-p2-repo-6.5.1-SNAPSHOT.zip-unzip/</doc-repo.url>
        <bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.2.3a/bonita-community-p2-repo-7.2.3a.zip-unzip/</bonita-open-repo.url>
        <equinox.build>org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar</equinox.build>
        <opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
@@ -149,12 +149,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>
@@ -164,22 +164,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>
@@ -453,5 +453,24 @@
                </plugins>
            </build>
        </profile>
+        <profile>
+            <id>unpacked.plugins</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.eclipse.tycho</groupId>
+                        <artifactId>tycho-packaging-plugin</artifactId>
+                        <version>${tycho.version}</version>
+                        <configuration>
+                            <archive>
+                                <manifestEntries>
+                                    <Eclipse-BundleShape>dir</Eclipse-BundleShape>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
    </profiles>
 </project>
Author	SHA1	Message	Date
Irene Wang	4a77587157	DEVOPS-3841 Add profile to unpack all plugins for Black Duck scans	2018-02-21 16:13:05 +01:00
build-talend	39d1f2aed0	chore(Jenkins): update DQ libs to 1.6.6-SNAPSHOT (#85 )	2018-02-12 17:28:32 +01:00
Jenkins Continuous Build server	00e9844ef2	Set version to 6.5.2 SNAPSHOT	2018-01-10 16:37:46 +01:00
Jenkins Continuous Build server	24f51a3df4	Set version to 6.5.1 SNAPSHOT	2018-01-10 16:31:41 +01:00
nrousseau	26771aa33b	chore(TDI-39885) Update tcomp version to 0.19.9	2018-01-10 09:50:00 +08:00
nrousseau	40cc036f32	Update tcomp version to 0.19.8 (#89 )	2018-01-07 12:18:56 +08:00
build-talend	f4763bd058	chore(Jenkins): Release DQ libraries 1.6.5 (#84 )	2017-12-07 11:41:17 +01:00
Pierre Teyssier	7aaa5ad537	feat(TDI-39100): integrate partner couchbase components	2017-12-05 15:41:39 +08:00
Emmanuel GALLOIS	c98402390b	feat(TDI-38416): Marketo backport to 651 (#82 )	2017-11-01 16:44:48 +08:00
Irene Wang	75aa9cba76	Update doc version to 6.5.1-SNAPSHOT	2017-10-25 16:43:52 +02:00
Jenkins Continuous Build server	08834c600a	Set version to 6.5.1 SNAPSHOT	2017-10-20 10:54:23 +02:00