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
3 changed files with 19 additions and 24 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -40,7 +40,7 @@
        <dependency>
            <groupId>org.talend.daikon</groupId>
            <artifactId>daikon</artifactId>
-            <version>0.4.0.BUILD-SNAPSHOT</version>
+            <version>0.5.0-SNAPSHOT</version>
            <classifier>bundle</classifier>
        </dependency>
        <!-- daikon dependencies-->
@@ -88,12 +88,12 @@
        <!-- Avro and dependencies                      -->
        <!-- To be replaced when avro will be available -->
        <!-- from servicemix with less dependencies     -->
-        <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro</artifactId>
-            <version>1.7.7</version>
-        </dependency>
-        <dependency>
+         <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>
@@ -103,11 +103,6 @@
            <artifactId>commons-compress</artifactId>
            <version>1.10</version>
        </dependency>
-        <dependency>
-            <groupId>com.github.livesense</groupId>
-            <artifactId>org.liveSense.fragment.sun.misc</artifactId>
-            <version>1.0.5</version>
-        </dependency>

        <!-- Keep version in sync with slf4j-api      -->
        <dependency>
@@ -122,25 +117,25 @@
        <dependency>
            <groupId>org.talend.components</groupId>
            <artifactId>components-api</artifactId>
-            <version>0.4.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.4.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.4.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.4.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 -->
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
@@ -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/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -11,10 +11,10 @@
        <tycho.version>0.22.0</tycho.version>
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
        <base.version>6.2.0</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>
+        <!-- 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>
@@ -28,8 +28,8 @@
        <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>
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