DEVOPS-2322 Fix Linux script

Merge pull request #43 from Talend/feature/DEVOPS-1729/maintenance/6.1_nexus
DEVOPS-1729 Nexus migration: Update URLs [maintenance/6.1]
2017-04-18 11:08:14 +02:00 · 2017-02-28 15:28:07 +01:00 · 2017-02-28 15:25:35 +01:00 · 2017-02-27 22:18:17 +01:00 · 2017-02-27 17:23:14 +01:00 · 2016-11-10 15:16:43 +01:00
30 changed files with 151 additions and 51 deletions
--- a/build/Target_Platform_for_Talend_Studio_and_Luna/readme.txt
+++ b/build/Target_Platform_for_Talend_Studio_and_Luna/readme.txt
@@ -3,5 +3,5 @@
 3) eclipse export fails to update the content.xml and artifact so we need to regenerate the p2 repository with the following command 
        Applications/java/eclipse/4.2/eclipse/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -metadataRepository file:/Applications/java/talend/TargetPlatformE44/p2site/ -artifactRepository file:/Applications/java/talend/TargetPlatformE44/p2site/ -source /Applications/java/talend/TargetPlatformE44 -config ANY -publishArtifacts 
 4) Deploy ZIP of target to Nexus (features/, plugins/, artifacts.jar, contents.jar at the root):
-        mvn deploy:deploy-file -Dfile=/Applications/java/talend/TargetPlatformE44/p2site/TargetPlatformE44.zip -DgroupId=org.talend.repo -DartifactId=talend-eclipse-p2-repo -Dversion=4.4.1-SNAPSHOT -Dpackaging=zip -Durl=http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot -DrepositoryId=talend_nexus_deployment
-        Nexus p2 repository will be available at http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/talend-eclipse-p2-repo/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-SNAPSHOT.zip-unzip/plugins/
+        mvn deploy:deploy-file -Dfile=/Applications/java/talend/TargetPlatformE44/p2site/TargetPlatformE44.zip -DgroupId=org.talend.repo -DartifactId=talend-eclipse-p2-repo -Dversion=4.4.1-SNAPSHOT -Dpackaging=zip -Durl=https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot -DrepositoryId=talend_nexus_deployment
+        Nexus p2 repository will be available at https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/talend-eclipse-p2-repo/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-SNAPSHOT.zip-unzip/plugins/
--- a/build/dependencies.p2/composite.p2/compositeArtifacts.xml
+++ b/build/dependencies.p2/composite.p2/compositeArtifacts.xml
@@ -4,6 +4,6 @@
    <properties size='0'>
    </properties>
    <children size='1'>
-        <child location='http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
+        <child location='https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
    </children>
 </repository>
--- a/build/dependencies.p2/composite.p2/compositeContent.xml
+++ b/build/dependencies.p2/composite.p2/compositeContent.xml
@@ -5,6 +5,6 @@
        <property name='p2.atomic.composite.loading' value='true'/>
    </properties>
    <children size='1'>
-        <child location='http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
+        <child location='https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
    </children>
 </repository>
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -5,60 +5,88 @@
    <parent>
        <groupId>org.talend.repo</groupId>
        <artifactId>dependencies.p2</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>6.1.3-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.1</version>
        </dependency>
        <dependency>
            <groupId>org.talend.dataquality</groupId>
            <artifactId>org.talend.dataquality.record.linkage</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.4</version>
        </dependency>
        <dependency>
            <groupId>org.talend.dataquality</groupId>
            <artifactId>org.talend.dataquality.standardization</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
        </dependency>
        <dependency>
            <groupId>org.talend.dataquality</groupId>
            <artifactId>org.talend.dataquality.sampling</artifactId>
-            <version>2.1.4</version>
+            <version>2.1.5</version>
        </dependency>
        <dependency>
            <groupId>org.talend.daikon</groupId>
            <artifactId>daikon</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.2.0.RELEASE</version>
        </dependency>
+        <!-- daikon dependencies-->
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+          <version>2.4.5</version>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+          <version>2.4.6</version>
+        </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-->
        <dependency>
            <groupId>org.talend.components</groupId>
            <artifactId>components-api</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.2.1.RELEASE</version>
            <classifier>bundle</classifier>
        </dependency>
        <dependency>
            <groupId>org.talend.components</groupId>
            <artifactId>components-common</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.2.0.RELEASE</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.2.0.RELEASE</version>
            <classifier>bundle</classifier>
        </dependency>
        <dependency>
            <groupId>org.talend.components</groupId>
            <artifactId>components-salesforce</artifactId>
-            <version>0.2.0.BUILD-SNAPSHOT</version>
+            <version>0.2.0.RELEASE</version>
            <classifier>bundle</classifier>
        </dependency>
        <!-- to avoid updatin the complete eclipse target platform we add these single dependencies -->
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -5,19 +5,19 @@

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

    <distributionManagement>
        <snapshotRepository>
            <id>talend_nexus_deployment</id>
-            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
            <snapshots><enabled>true</enabled></snapshots>
            <releases><enabled>false</enabled></releases>
        </snapshotRepository>
        <repository>
            <id>talend_nexus_deployment</id>
-            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
            <snapshots><enabled>false</enabled></snapshots>
            <releases><enabled>true</enabled></releases>
        </repository>
@@ -32,7 +32,7 @@
            <snapshots>
                <enabled>false</enabled>
            </snapshots>
-            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
        </repository>
        <repository>
            <id>talend_open_snapshots</id>
@@ -42,7 +42,7 @@
            <snapshots>
                <enabled>true</enabled>
            </snapshots>
-            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
        </repository>
    </repositories>

@@ -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.1.3-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -17,7 +17,7 @@
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
 		</repository>
 		<repository>
 			<id>talend_open_snapshots</id>
@@ -27,7 +27,7 @@
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
 		</repository>
 	</repositories>

--- 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.1.3-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -24,7 +24,7 @@
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
 		</repository>
 		<repository>
 			<id>talend_open_snapshots</id>
@@ -34,7 +34,7 @@
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
 		</repository>
 	</repositories>
 	<profiles>
--- a/build/talend.studio.tos.bd.product/launcher.ini
+++ b/build/talend.studio.tos.bd.product/launcher.ini
@@ -3,3 +3,5 @@
 -Xmx768m
 -XX:MaxPermSize=256m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.bd.product/launcher_64.ini
+++ b/build/talend.studio.tos.bd.product/launcher_64.ini
@@ -3,3 +3,5 @@
 -Xmx1536m
 -XX:MaxPermSize=512m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.bd.product/launcher_macosx.ini
+++ b/build/talend.studio.tos.bd.product/launcher_macosx.ini
@@ -7,4 +7,6 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- 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.1.3-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.di.product/launcher.ini
+++ b/build/talend.studio.tos.di.product/launcher.ini
@@ -3,3 +3,5 @@
 -Xmx768m
 -XX:MaxPermSize=256m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.di.product/launcher_64.ini
+++ b/build/talend.studio.tos.di.product/launcher_64.ini
@@ -3,3 +3,5 @@
 -Xmx1536m
 -XX:MaxPermSize=512m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.di.product/launcher_macosx.ini
+++ b/build/talend.studio.tos.di.product/launcher_macosx.ini
@@ -7,4 +7,6 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- 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.1.3-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.dq.product/launcher.ini
+++ b/build/talend.studio.tos.dq.product/launcher.ini
@@ -3,3 +3,5 @@
 -Xmx768m
 -XX:MaxPermSize=256m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.dq.product/launcher_64.ini
+++ b/build/talend.studio.tos.dq.product/launcher_64.ini
@@ -3,3 +3,5 @@
 -Xmx1536m
 -XX:MaxPermSize=512m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.dq.product/launcher_macosx.ini
+++ b/build/talend.studio.tos.dq.product/launcher_macosx.ini
@@ -7,4 +7,6 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- 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.1.3-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.esb.product/launcher.ini
+++ b/build/talend.studio.tos.esb.product/launcher.ini
@@ -3,3 +3,5 @@
 -Xmx768m
 -XX:MaxPermSize=256m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.esb.product/launcher_64.ini
+++ b/build/talend.studio.tos.esb.product/launcher_64.ini
@@ -3,3 +3,5 @@
 -Xmx1536m
 -XX:MaxPermSize=512m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.esb.product/launcher_macosx.ini
+++ b/build/talend.studio.tos.esb.product/launcher_macosx.ini
@@ -7,4 +7,6 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- 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.1.3-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.mdm.product/launcher.ini
+++ b/build/talend.studio.tos.mdm.product/launcher.ini
@@ -3,3 +3,5 @@
 -Xmx768m
 -XX:MaxPermSize=256m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.mdm.product/launcher_64.ini
+++ b/build/talend.studio.tos.mdm.product/launcher_64.ini
@@ -3,3 +3,5 @@
 -Xmx1536m
 -XX:MaxPermSize=512m
 -Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- a/build/talend.studio.tos.mdm.product/launcher_macosx.ini
+++ b/build/talend.studio.tos.mdm.product/launcher_macosx.ini
@@ -7,4 +7,6 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
--- 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.1.3-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.1.3-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -20,7 +20,7 @@
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-			<url>http://${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
 		</repository>
 		<repository>
 			<id>talend_open_snapshots</id>
@@ -30,12 +30,12 @@
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
-			<url>http://${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
 		</repository>
 	</repositories>

 	<properties>
-		<talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
+		<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
 		<product.final.name>${launcher.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>
 	</properties>
@@ -110,7 +110,7 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>eclipse-launcher-binaries</artifactId>
-									<version>4.4.1a</version>
+									<version>4.4.1c</version>
 									<type>zip</type>
 									<overWrite>true</overWrite>
 									<outputDirectory>${studio.dir}</outputDirectory>
@@ -344,7 +344,7 @@
 									</filterchain>
 								</loadfile>
 								<echo file="${studio.dir}/${launcher.prefix}-linux-gtk-x86.sh">${launcher_sh}</echo>
-								<ac:for xmlns:ac="antlib:net.sf.antcontrib" list="linux-gtk-ppc,linux-gtk-x86,solaris-gtk,solaris-gtk-x86,win32-x86" param="platform">
+								<ac:for xmlns:ac="antlib:net.sf.antcontrib" list="linux-gtk-ppc,linux-gtk-x86,solaris-gtk-sparc,solaris-gtk-x86,win32-x86" param="platform">
 									<sequential>
 										<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher.ini" />
 									</sequential>
--- 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.1.3-SNAPSHOT</version>
 		<relativePath />
 	</parent>

@@ -21,7 +21,7 @@
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
 		</repository>
 		<repository>
 			<id>talend_open_snapshots</id>
@@ -31,7 +31,7 @@
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
 		</repository>
 	</repositories>
 	
--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -3,22 +3,22 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>6.1.3-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>
+        <base.version>6.1.3</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>
        <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>
-        <talend.nexus.p2unzip.url>http://${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
+        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
+        <talend.nexus.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
+        <talend.nexus.p2unzip.url>${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
        <opensourcesnapshot-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceSnapshot/org/talend/repo</opensourcesnapshot-unziprepo.url>
        <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>
@@ -34,7 +34,7 @@
        <osgi.ws>win32</osgi.ws>
        <osgi.os>win32</osgi.os>
        <osgi.arch>x86</osgi.arch>
-        <strictVersions>false</strictVersions>
+        <strictVersions>true</strictVersions>
    </properties>

    <distributionManagement>
@@ -258,6 +258,48 @@
                </plugins>
            </build>
        </profile>
+        <profile>
+            <id>junit.product</id>
+            <properties>
+                <release.suffix>-SNAPSHOT</release.suffix>
+                <revision.filename>SNAPSHOT</revision.filename>
+                <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
+            </properties>
+            <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>
+                        <configuration>
+                            <strictBinIncludes>false</strictBinIncludes>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</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>default</timestampProvider>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
        <profile>
            <id>tuj</id>
            <properties>
Author	SHA1	Message	Date
iwangtalend	62d02f9bd8	DEVOPS-2322 Fix Linux script	2017-04-18 11:08:14 +02:00
iwangtalend	7ebba3685a	Merge pull request #43 from Talend/feature/DEVOPS-1729/maintenance/6.1_nexus DEVOPS-1729 Nexus migration: Update URLs [maintenance/6.1]	2017-02-28 15:28:07 +01:00
build-talend	19d7164149	DEVOPS-1729 Nexus migration: Update URLs	2017-02-28 15:25:35 +01:00
iwangtalend	c1f4bd98f2	Merge pull request #32 from Talend/feature/DEVOPS-1729/maintenance/6.1_nexus DEVOPS-1729 Nexus migration: Update URLs [maintenance/6.1]	2017-02-27 22:18:17 +01:00
build-talend	ed5d36f289	DEVOPS-1729 Nexus migration: Update URLs	2017-02-27 17:23:14 +01:00
iwangtalend	d0dcc7fddd	Update to 6.1.3 launchers	2016-11-10 15:16:43 +01:00
nrousseau	b264d41fc3	TUP-15864: update launcher binaries	2016-11-10 11:51:17 +08:00
iwangtalend	01e1572c96	Temporarily use 6.1.2 Mac Eclipse launchers	2016-11-03 11:17:17 +01:00
Erwan SEITE	aec9ed4bc2	Set versions for 6.1.3-SNAPSHOT	2016-10-11 15:15:33 +02:00
Sizhao Liu	d3ee9475a9	TDQ-12502 bump record-linkage lib version to 3.0.4	2016-09-06 12:55:53 +02:00
nrousseau	42b04738c8	TUP-5025: update ini of TOS products	2016-08-10 18:54:02 +08:00
nrousseau	d73f405dce	TUP-5056: update name of ini file	2016-08-10 17:20:04 +08:00
nrousseau	3864af4c80	update the junit.product, to avoid to get the timestamp from jgit	2016-07-20 18:21:15 +08:00
sizhaoliu	59aafbf670	TDQ-11951 use fixed version of DQ libraries in Studio 6.1	2016-04-26 15:57:18 +02:00
sizhaoliu	72495b1714	TDQ-11536 update dataquality dependency version for the bugfix	2016-03-01 15:59:55 +08:00
Sebastien Gandon	4641214b41	TDI-34925 : updated paxurl artifact.	2016-02-04 15:19:55 +01:00
sizhaoliu	5ffe80b487	TDQ-8970 bump record linkage library version for T-Swoosh support in tMatchGroup component	2016-01-14 10:52:32 +01:00
sizhaoliu	f8ee2efabd	TDQ-11448 bump DQ library versions	2016-01-08 16:31:34 +01:00
Irene Wang	3733c3e03c	Update versions for 6.1.2-SNAPSHOT	2015-12-16 18:03:39 +01:00
Sebastien Gandon	e1273a2ae7	update the component-api version to use the 0.2.1.RELEASE	2015-12-10 21:18:38 +01:00
Sebastien Gandon	3fb5386145	update daikon and componet deps version to 0.2.0.RELEASE	2015-12-09 12:48:33 +01:00
Sebastien Gandon	e642506a2a	made tos p2 dep not use transitive deps and add complete set of deps in pom.	2015-12-09 12:41:27 +01:00
Sebastien Gandon	64d20c0b5e	Revert "update daikon and componet deps version to 0.2.0.RELEASE" This reverts commit `f1b156bb90`.	2015-12-08 20:06:34 +01:00
Sebastien Gandon	f1b156bb90	update daikon and componet deps version to 0.2.0.RELEASE	2015-12-08 14:34:40 +01:00
Irene Wang	e74cebe5aa	Set versions for 6.1.1	2015-12-04 15:16:12 +01:00