chore(Jenkins): Update DQ libs to 7.4.2-SNAPSHOT (#224 )

* chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT * use DQ lib SE 7.4.2-SNAPSHOT
feat(TUP-24717):Activate/Deactivate plugins when install patch/update (#217 )
2019-12-12 07:39:20 +01:00 · 2019-12-11 16:05:26 +08:00 · 2019-12-11 11:06:08 +08:00 · 2019-12-09 14:32:25 +08:00 · 2019-12-09 13:58:13 +08:00 · 2019-12-09 10:55:57 +08:00
5 changed files with 85 additions and 12 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -189,7 +189,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.10</version>
+			<version>1.19</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.livesense</groupId>
@@ -314,7 +314,7 @@
 			<artifactId>commons-codec</artifactId>
 			<version>1.10</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>
@@ -344,32 +344,42 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-yaml</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-csv</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-smile</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
-			<version>${fasterxml.jackson.version}</version>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-		    <version>1.23</version>
+			<version>1.25</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.woodstox</groupId>
+			<artifactId>stax2-api</artifactId>
+			<version>4.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.woodstox</groupId>
+			<artifactId>woodstox-core</artifactId>
+			<version>5.3.0</version>
 		</dependency>
 	</dependencies>

--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -8,8 +8,10 @@
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
        <components.version>0.28.0-SNAPSHOT</components.version>
-        <dataquality.lib.version>7.2.1-SNAPSHOT</dataquality.lib.version>
-        <fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
+        <dataquality.lib.version>7.4.2-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-SNAPSHOT</daikon.version>
    </properties>

--- 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.3.0-SNAPSHOT
+component.java.coordinates = org.talend.components:couchbase:1.3.2-SNAPSHOT
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
@@ -174,7 +174,7 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>studio-add-conf</artifactId>
-									<version>7.2.1-SNAPSHOT</version>
+									<version>7.3.1-SNAPSHOT</version>
 									<type>zip</type>
 									<classifier />
 									<overWrite>true</overWrite>
--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -204,6 +204,67 @@
        </plugins>
    </build>
    <profiles>
+	 <profile>
+		<id>patch</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
+                <timestamp>${maven.build.timestamp}</timestamp>
+                <maven.build.timestamp.format>yyyyMMdd'_'HHmm</maven.build.timestamp.format>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>talend_open_p2</id>
+                    <url>${tos-p2-repo.url}</url>
+                    <layout>p2</layout>
+                </repository>
+            </repositories>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>1.8</version>
+                        <executions>
+                            <execution>
+                                <id>parse-version</id>
+                                <goals>
+                                    <goal>parse-version</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.eclipse.tycho</groupId>
+                        <artifactId>tycho-packaging-plugin</artifactId>
+                        <version>${tycho.version}</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.eclipse.tycho.extras</groupId>
+                                <artifactId>tycho-buildtimestamp-jgit</artifactId>
+                                <version>${tycho-extras.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <strictBinIncludes>false</strictBinIncludes>
+                            <format>${timestamp}'-patch'</format>
+                            <archive>
+                                <addMavenDescriptor>false</addMavenDescriptor>
+                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
+                                <manifestEntries>
+                                    <Built-By />
+                                </manifestEntries>
+                            </archive>
+                            <timestampProvider>jgit</timestampProvider>
+                            <jgit.ignore>pom.xml</jgit.ignore>
+                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
        <profile>
            <id>nonofficial</id>
            <activation>
Author	SHA1	Message	Date
build-talend	8f9f871822	chore(Jenkins): Update DQ libs to 7.4.2-SNAPSHOT (#224 ) * chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT * use DQ lib SE 7.4.2-SNAPSHOT	2019-12-12 07:39:20 +01:00
Zhiwei Xue	e8ef341670	feat(TUP-24717):Activate/Deactivate plugins when install patch/update (#217 ) * feat(TUP-24717):Activate/Deactivate plugins when install patch/update * feat(TUP-25187): add test case. * feat(TUP-25187): remove testing repository.	2019-12-11 16:05:26 +08:00
Chao MENG	4de7a06af0	fix(TUP-24026): update jackson to 2.10.0 (#223 ) * fix(TUP-24026): update jackson to 2.10.0 make studio compatible with bonita plugins * fix(TUP-24026): update jackson to 2.10.0 make studio compatible with bonita plugins	2019-12-11 11:06:08 +08:00
nrousseau	b00f29c951	fix(TUP-24026): update jackson to 2.10.1	2019-12-09 14:32:25 +08:00
nrousseau	e23c04ab2a	fix(TUP-24026): update jackson to 2.10.1	2019-12-09 13:58:13 +08:00
Chao MENG	ad0c723115	fix(TUP-24026): update jackson to 2.10.0 (#215 ) * fix(TUP-24026): update jackson to 2.10.0 https://jira.talendforge.org/browse/TUP-24026 * fix(TUP-24026): update jackson to 2.10.1 https://jira.talendforge.org/browse/TUP-24026	2019-12-09 10:55:57 +08:00
Emmanuel GALLOIS	ddebe7e96a	fix(TDI-43300): fix tacokit component jar clash with locales (#222 )	2019-12-02 21:34:51 +08:00
nrousseau	25836f9d3e	Revert "chore(TUP-21116) upgrade tycho version to 1.5.1" This reverts commit `fc4e9b6159`.	2019-12-02 14:47:54 +08:00
Nicolas Rousseau	fc4e9b6159	chore(TUP-21116) upgrade tycho version to 1.5.1	2019-12-02 14:45:54 +08:00
build-talend	32733397a5	chore(Jenkins): Update DQ libs to 7.4.1-SNAPSHOT (#216 )	2019-10-31 16:42:14 +01:00
build-talend	405a0c1960	chore(Jenkins): Update DQ libs to 7.4.0-SNAPSHOT (#214 )	2019-10-22 11:09:27 +02:00
nrousseau	3157c8dbdf	Update studio configuration for 7.3.1	2019-10-18 10:23:58 +08:00
mbasiuk-talend	2d9e2e0dd8	fix(TDI-42834): update commons-compress lib version (#205 ) * fix(TDI-42834): update commons-compress lib version * fix(TDI-42834): upgrade commons-compress to latest version	2019-10-09 02:00:33 +02:00
build-talend	9bdd384b29	chore(Jenkins): Update DQ libs to 7.3.0-SNAPSHOT (#212 )	2019-09-24 17:26:45 +02:00
build-talend	61d9cec36c	chore(Jenkins): Update DQ libs to 7.2.2-SNAPSHOT (#209 )	2019-09-16 19:22:13 +02:00
build-talend	345a7c6491	chore(Jenkins): Update DQ libs to 7.2.1 (#208 )	2019-09-16 17:42:17 +02:00