TUP-4243 : used servicemix.avro instead of avro.

TDM-5017 Move common jars out of TDM into a shared p2 repo (downgrade back to avro to 1.7.7 - need more time to fix all issues)
TDM-5017 Move common jars out of TDM into a shared p2 repo (upgrade avro to 1.8.0)
2016-03-22 18:29:12 +01:00 · 2016-03-21 16:54:26 +01:00 · 2016-03-21 11:20:33 +01:00 · 2016-03-18 09:55:31 +01:00 · 2016-03-17 10:54:32 +01:00 · 2016-03-09 15:05:22 +01:00
12 changed files with 124 additions and 36 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -5,60 +5,137 @@
    <parent>
        <groupId>org.talend.repo</groupId>
        <artifactId>dependencies.p2</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
    </parent>

    <artifactId>dependencies.p2.tos</artifactId>
    <packaging>pom</packaging>

    <dependencies>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>2.4.5-Talend</version>
+        </dependency>
        <dependency>
            <groupId>org.talend.dataquality</groupId>
            <artifactId>org.talend.dataquality.common</artifactId>
-            <version>1.3.3</version>
+            <version>1.4.3-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.talend.dataquality</groupId>
            <artifactId>org.talend.dataquality.record.linkage</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.talend.dataquality</groupId>
            <artifactId>org.talend.dataquality.standardization</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.3-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.talend.dataquality</groupId>
            <artifactId>org.talend.dataquality.sampling</artifactId>
-            <version>2.1.4</version>
+            <version>2.1.6-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.talend.daikon</groupId>
            <artifactId>daikon</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
+            <classifier>bundle</classifier>
        </dependency>
+        <!-- daikon dependencies-->
+        <dependency>
+            <groupId>com.cedarsoftware</groupId>
+            <artifactId>json-io</artifactId>
+            <version>4.1.10</version>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+          <version>2.5.3</version><!-- version matches the studio org.talend.libraries.jackson-->
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+          <version>2.5.3</version><!-- version matches the studio org.talend.libraries.jackson-->
+        </dependency>
+        <dependency>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+          <version>1.6</version>
+        </dependency>
+        <dependency>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+          <version>2.4</version>
+        </dependency>
+        <!-- end of daikon dependencies-->
+
+        <!-- ========================= -->
+        <!-- Added by TDM                  -->
+ 
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        
+        <!-- Avro and dependencies                      -->
+        <!-- To be replaced when avro will be available -->
+        <!-- from servicemix with less dependencies     -->
+         <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.avro</artifactId>
+            <version>1.8.0_1</version>
+         </dependency>
+         <dependency>
+            <groupId>com.thoughtworks.paranamer</groupId>
+            <artifactId>paranamer</artifactId>
+            <version>2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.10</version>
+        </dependency>
+
+        <!-- Keep version in sync with slf4j-api      -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+        <!-- End added by TDM              -->
+        <!-- ========================= -->
+        
        <dependency>
            <groupId>org.talend.components</groupId>
            <artifactId>components-api</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
            <classifier>bundle</classifier>
        </dependency>
        <dependency>
            <groupId>org.talend.components</groupId>
            <artifactId>components-common</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
            <classifier>bundle</classifier>
        </dependency>
        <dependency>
            <groupId>org.talend.components</groupId>
            <artifactId>components-common-oauth</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
            <classifier>bundle</classifier>
        </dependency>
        <dependency>
            <groupId>org.talend.components</groupId>
            <artifactId>components-salesforce</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
            <classifier>bundle</classifier>
        </dependency>
        <!-- to avoid updatin the complete eclipse target platform we add these single dependencies -->
@@ -67,5 +144,16 @@
            <artifactId>commons-logging</artifactId>
            <version>1.2</version>
        </dependency>
+       <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.10</version>
+        </dependency>
    </dependencies>
+
 </project>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -5,7 +5,7 @@

    <groupId>org.talend.repo</groupId>
    <artifactId>dependencies.p2</artifactId>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>6.2.0-SNAPSHOT</version>
    <packaging>pom</packaging>

    <distributionManagement>
@@ -61,7 +61,7 @@
                        </goals>
                        <configuration>
                            <outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
-<!--                            <excludeTransitive>true</excludeTransitive>-->
+                            <excludeTransitive>true</excludeTransitive>
                        </configuration>
                    </execution>
                </executions>
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>6.2.0-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.1.1-SNAPSHOT</version>
+		<version>6.2.0-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.1.1-SNAPSHOT</version>
+		<version>6.2.0-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.1.1-SNAPSHOT</version>
+		<version>6.2.0-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.1.1-SNAPSHOT</version>
+		<version>6.2.0-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.1.1-SNAPSHOT</version>
+		<version>6.2.0-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.1.1-SNAPSHOT</version>
+		<version>6.2.0-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.1.1-SNAPSHOT</version>
+		<version>6.2.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -153,7 +153,7 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>${product.branding.platform}</artifactId>
-									<version>${maven.version}</version>
+									<version>${maven.compatible.version}</version>
 									<type>txt</type>
 									<classifier>license</classifier>
 									<overWrite>true</overWrite>
@@ -174,7 +174,7 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>${product.branding.platform}</artifactId>
-									<version>${maven.version}</version>
+									<version>${maven.compatible.version}</version>
 									<type>txt</type>
 									<classifier>notice</classifier>
 									<overWrite>true</overWrite>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>6.2.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -3,18 +3,18 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>6.2.0-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.1.1</base.version>
-        <!-- osgi.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
-        <osgi.version>${base.version}-SNAPSHOT</osgi.version>
-        <!-- maven.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
-        <maven.version>${base.version}-SNAPSHOT</maven.version>
+        <base.version>6.2.0</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)-->
+        <maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
        <repo.type>Snapshot</repo.type>
        <talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
        <talend.nexus.url>http://${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
@@ -23,13 +23,13 @@
        <opensourcerelease-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceRelease/org/talend/repo</opensourcerelease-unziprepo.url>
        <eclipse-repo.url>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.1.0-SNAPSHOT/talend-eclipse-p2-repo-6.1.0-SNAPSHOT.zip-unzip</eclipse-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.1.1-SNAPSHOT/talend-doc-p2-repo-6.1.1-SNAPSHOT.zip-unzip/</doc-repo.url>
+        <doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.2.0-SNAPSHOT/talend-doc-p2-repo-6.2.0-SNAPSHOT.zip-unzip/</doc-repo.url>
        <bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/6.5.0a/bonita-community-p2-repo-6.5.0a.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>
        <opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url>
-        <tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.version}/talend-tos-p2-repo-${osgi.version}.zip-unzip/</tos-p2-repo.url>
-        <tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.version}/dependencies.p2.tos-${maven.version}.zip-unzip/</tos-deps-p2-repo.url>
+        <tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}/talend-tos-p2-repo-${osgi.compatible.version}.zip-unzip/</tos-p2-repo.url>
+        <tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/</tos-deps-p2-repo.url>
        <jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
        <osgi.ws>win32</osgi.ws>
        <osgi.os>win32</osgi.os>
@@ -138,7 +138,7 @@
                <artifactId>target-platform-configuration</artifactId>
                <version>${tycho.version}</version>
                <configuration>
-                    <executionEnvironmentDefault>JavaSE-1.7</executionEnvironmentDefault>
+                    <executionEnvironmentDefault>JavaSE-1.8</executionEnvironmentDefault>
                    <environments>
                        <environment>
                            <os>${osgi.os}</os>
@@ -189,9 +189,9 @@
                <version>${tycho.version}</version>
                <configuration>
                    <compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
-                    <compilerVersion>1.7</compilerVersion>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <compilerVersion>1.8</compilerVersion>
+                    <source>1.8</source>
+                    <target>1.8</target>
                </configuration>
            </plugin>
        </plugins>
Author	SHA1	Message	Date
Sebastien Gandon	03799a4d4c	TUP-4243 : used servicemix.avro instead of avro.	2016-03-22 18:29:12 +01:00
fady@legsem.com	f787026708	TDM-5017 Move common jars out of TDM into a shared p2 repo (downgrade back to avro to 1.7.7 - need more time to fix all issues)	2016-03-21 16:54:26 +01:00
fady@legsem.com	10e634fbcd	TDM-5017 Move common jars out of TDM into a shared p2 repo (upgrade avro to 1.8.0)	2016-03-21 11:20:33 +01:00
Sebastien Gandon	5558bf1e67	updated daikon and component version to tos deps.	2016-03-18 09:55:31 +01:00
Irene Wang	257db4c95b	Rename properties to osgi.compatible.version and maven.compatible.version	2016-03-17 10:54:32 +01:00
Sebastien Gandon	5af92fb269	updated daikon and components versions in tos deps.	2016-03-09 15:05:22 +01:00
iwangtalend	7feaa9cbc5	Reference doc 6.2.0-SNAPSHOT	2016-03-02 16:52:30 +01:00
iwangtalend	af8c598b21	DEVOPS-160 Build with Java 8	2016-02-25 11:01:38 +01:00
iwang	cdc9203eb6	Add commons-configuration for org.talend.mdm.commmon	2016-02-16 21:50:50 +01:00
Sebastien Gandon	3fffa234c5	Updated jackson version in tos deps to fix a studio issue.	2016-02-09 19:48:36 +01:00
Sebastien Gandon	7339347382	update tos dependencies with json-io artifact	2016-02-04 13:40:19 +01:00
sizhaoliu	51c4f2f333	bump DQ library version to 1.4.3-SNAPSHOT	2016-01-27 16:17:48 +01:00
fady@legsem.com	03df29ee5c	TDM-5017 Move common jars out of TDM into a shared p2 repo (align slf4j version with studio)	2016-01-23 11:13:48 +01:00
Sebastien Gandon	de76aaceb6	Fixed a tos dependency pom.xml encoding/formating issue.	2016-01-22 14:44:43 +01:00
fady@legsem.com	d4fe953cbd	TDM-5017 Move common jars out of TDM into a shared p2 repo (more Avro dependencies)	2016-01-22 09:14:11 +01:00
fady@legsem.com	9291346017	TDM-5017 Move common jars out of TDM into a shared p2 repo (Adds Avro and dependencies)	2016-01-20 18:59:27 +01:00
iwangtalend	9589ae8785	Add slf4j for AMC	2016-01-18 18:39:12 +01:00
Sebastien Gandon	0aed6ad7e5	added pax.url 2.4.5-Talend to the dynamic target platform	2016-01-13 12:43:12 +01:00
sizhaoliu	a93e354860	TDQ-8970 bump record linkage library version for T-Swoosh support in tMatchGroup component	2016-01-12 15:50:02 +01:00
fady@legsem.com	e249a19463	TDM-5017 Move common jars out of TDM into a shared p2 repo	2016-01-11 17:31:48 +01:00
sizhaoliu	0e58fd9d05	TDQ-11448 bump DQ library versions	2016-01-08 15:12:38 +01:00
sizhaoliu	a08363ca2c	bump version for DQ library 1.4.0	2015-12-21 18:26:20 +01:00
Sebastien Gandon	58d5f2ef66	made tos p2 dep not use transitive deps and add complete set of deps in pom.	2015-12-09 12:20:34 +01:00
Sebastien Gandon	63eea05636	update component and daikon studio deps to version to 0.3.0.BUILD-SNAPSHOT on master	2015-12-08 15:26:58 +01:00
Sebastien Gandon	88822d74b2	update daikon and componet deps version to 0.2.0.RELEASE	2015-12-08 14:32:56 +01:00
Irene Wang	4d83f9f46f	Update versions to 6.2.0-SNAPSHOT	2015-12-08 11:00:24 +01:00
Irene Wang	f1557728ad	Update versions for 6.1.2-SNAPSHOT	2015-12-07 18:56:13 +01:00