DEVOPS-1729 Nexus migration: Update URLs

Freeze doc plugin version
TUP-3480: delete repository folder created during the build step
2017-03-01 17:11:48 +01:00 · 2015-09-18 11:02:21 +02:00 · 2015-09-07 17:58:38 +08:00 · 2015-09-02 10:19:38 +02:00 · 2015-09-01 01:02:28 +02:00 · 2015-08-31 11:46:47 +02:00
11 changed files with 157 additions and 103 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/pom.xml
+++ b/build/pom.xml
@@ -1,11 +1,11 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
-		<relativePath></relativePath>
+		<version>6.0.1</version>
+		<relativePath />
 	</parent>

 	<repositories>
@@ -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>

@@ -170,4 +170,4 @@
 			</modules>
 		</profile>
 	</profiles>
-</project> 
+</project>
--- a/build/talend.studio.tos.all.p2.product/pom.xml
+++ b/build/talend.studio.tos.all.p2.product/pom.xml
@@ -1,11 +1,11 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
-		<relativePath></relativePath>
+		<version>6.0.1</version>
+		<relativePath />
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
@@ -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>
@@ -146,4 +146,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project> 
+</project>
--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -1,13 +1,13 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
 	<packaging>eclipse-repository</packaging>
-</project> 
+</project>
--- a/build/talend.studio.tos.di.product/pom.xml
+++ b/build/talend.studio.tos.di.product/pom.xml
@@ -1,13 +1,13 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.di.product</artifactId>
 	<packaging>eclipse-repository</packaging>
-</project> 
+</project>
--- a/build/talend.studio.tos.dq.product/pom.xml
+++ b/build/talend.studio.tos.dq.product/pom.xml
@@ -1,10 +1,10 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

@@ -25,4 +25,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project> 
+</project>
--- a/build/talend.studio.tos.esb.product/pom.xml
+++ b/build/talend.studio.tos.esb.product/pom.xml
@@ -1,10 +1,10 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

@@ -25,4 +25,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project> 
+</project>
--- a/build/talend.studio.tos.mdm.product/pom.xml
+++ b/build/talend.studio.tos.mdm.product/pom.xml
@@ -1,10 +1,10 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

@@ -28,4 +28,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project> 
+</project>
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
@@ -1,11 +1,11 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
-		<relativePath></relativePath>
+		<version>6.0.1</version>
+		<relativePath />
 	</parent>

 	<artifactId>tos-products-parent-pom</artifactId>
@@ -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${unqualifiedVersion}${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,15 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>eclipse-launcher-binaries</artifactId>
-									<version>4.4.1</version>
+									<version>4.4.1a</version>
+									<type>zip</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>${studio.dir}</outputDirectory>
+								</artifactItem>
+								<artifactItem>
+									<groupId>${project.groupId}</groupId>
+									<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
+									<version>4.4.1a</version>
 									<type>zip</type>
 									<overWrite>true</overWrite>
 									<outputDirectory>${studio.dir}</outputDirectory>
@@ -294,13 +302,14 @@
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
 								<echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${unqualifiedVersion}*</echo>
 								<echo>product.timestamp=${product.timestamp}</echo>
+                                <echo>buildQualifier=${buildQualifier}</echo>
 								<echo>version.full=${version.full}</echo>
 								<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${unqualifiedVersion}*/about.mappings" id="aboutmappingspath_temp" />
 								<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />	
 								<echo>aboutmappingspath=${aboutmappingspath}</echo>
 								<loadfile property="about" srcFile="${aboutmappingspath}">
 									<filterchain>
-										<expandproperties/>
+										<expandproperties />
 									</filterchain>
 								</loadfile>
 								<echo file="${aboutmappingspath}">${about}</echo>
@@ -317,46 +326,37 @@
 						<configuration>
 							<target>
 								<echo>version.full=${version.full}</echo>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
-								<move file="${studio.dir}/launcher-macosx-cocoa.app" tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app"/>
-								<move todir="${studio.dir}">
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                                <move todir="${studio.dir}">
 									<fileset dir="${studio.dir}">
-										<include name="**/Contents/MacOS/*" />
 										<include name="*" />
 									</fileset>
 									<dirset dir="${studio.dir}">
-										<include name="*"/>
+										<include name="*" />
 									</dirset>
 									<mapper>
-										<mapper type="regexp"
-											from="(.*)launcher(.*)" to="\1${launcher.prefix}\2" />
+										<mapper type="regexp" from="(.*)launcher(.*)" to="\1${launcher.prefix}\2" />
 									</mapper>
 								</move>
 								<loadfile property="launcher_sh" srcFile="${studio.dir}/${launcher.prefix}-linux-gtk-x86.sh">
 									<filterchain>
-										<expandproperties/>
+										<expandproperties />
 									</filterchain>
 								</loadfile>
 								<echo file="${studio.dir}/${launcher.prefix}-linux-gtk-x86.sh">${launcher_sh}</echo>
-								<ac:for list="linux-gtk-ppc,linux-gtk-x86,solaris-gtk,solaris-gtk-x86,win32-wpf,win32-x86" param="platform" xmlns:ac="antlib:net.sf.antcontrib">
+								<ac:for xmlns:ac="antlib:net.sf.antcontrib" list="linux-gtk-ppc,linux-gtk-x86,solaris-gtk,solaris-gtk-x86,win32-x86" param="platform">
 									<sequential>
 										<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher.ini" />
 									</sequential>
 								</ac:for>
-								<ac:for list="linux-gtk-x86_64,win-x86_64" param="platform" xmlns:ac="antlib:net.sf.antcontrib">
+								<ac:for xmlns:ac="antlib:net.sf.antcontrib" list="linux-gtk-x86_64,win-x86_64" param="platform">
 									<sequential>
 										<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher_64.ini" />
 									</sequential>
 								</ac:for>
-								<copy tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/MacOS/${launcher.prefix}-macosx-cocoa.ini" file="${project.basedir}/launcher_macosx.ini" />
+								<copy tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.ini" file="${project.basedir}/launcher_macosx.ini" />
 								<property name="launcher.name" value="${product.name}" />
 								<property name="launcher.info" value="${mac.launcher.info}" />
-								<loadfile property="plist" srcFile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/Info.plist">
-									<filterchain>
-										<expandproperties/>
-									</filterchain>
-								</loadfile>
-								<echo file="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/Info.plist">${plist}</echo>
 								<chmod dir="${studio.dir}" perm="755" includes="${launcher.prefix}*" verbose="true" />
 							</target>
 						</configuration>
@@ -387,9 +387,9 @@
 						<phase>package</phase>
 						<configuration>
 							<target>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
 								<!-- Generate javajet -->
-								<java classname="org.eclipse.core.launcher.Main" dir="${studio.dir}" fork="true" failonerror="false" maxmemory="1536m" >
+								<java classname="org.eclipse.core.launcher.Main" dir="${studio.dir}" fork="true" failonerror="false" maxmemory="1536m">
 									<arg line="-application org.talend.designer.codegen.CodeGenInit -nosplash -consoleLog" />
 									<classpath>
 										<pathelement location="${studio.dir}/plugins/${equinox.build}" />
@@ -407,6 +407,11 @@
 								<delete dir="${studio.dir}/configuration/org.eclipse.equinox.app" includeemptydirs="true" />
 								<delete dir="${studio.dir}/configuration/org.eclipse.osgi" includeemptydirs="true" />
 								<delete dir="${studio.dir}/configuration/org.eclipse.update" includeemptydirs="true" />
+                                <delete dir="${studio.dir}/configuration/repository" includeemptydirs="true" />
+								<delete dir="${studio.dir}/configuration/maven_repository" includeemptydirs="true" />
+                                				<delete file="${studio.dir}/configuration/maven_user_settings.xml" />
+                                				<delete file="${studio.dir}/configuration/LibrariesIndex.xml" />
+                                				<delete file="${studio.dir}/configuration/MavenUriIndex.xml" />
 							</target>
 						</configuration>
 						<goals>
@@ -473,7 +478,7 @@
 								<addMavenDescriptor>false</addMavenDescriptor>
 								<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
 								<manifestEntries>
-									<Built-By></Built-By>
+									<Built-By />
 								</manifestEntries>
 							</archive>
 							<timestampProvider>default</timestampProvider>
@@ -497,7 +502,7 @@
 								<addMavenDescriptor>false</addMavenDescriptor>
 								<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
 								<manifestEntries>
-									<Built-By></Built-By>
+									<Built-By />
 								</manifestEntries>
 							</archive>
 							<timestampProvider>default</timestampProvider>
@@ -593,4 +598,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project> 
+</project>
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
-		<relativePath></relativePath>
+		<version>6.0.1</version>
+		<relativePath />
 	</parent>

-	<groupId>org.talend.studio</groupId>
+	
 	<artifactId>tos</artifactId>
 	<packaging>pom</packaging>

@@ -22,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>
@@ -32,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
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.1</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.0.0</base.version>
+        <base.version>6.0.1</base.version>
        <!-- osgi.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
-        <osgi.version>${project.version}</osgi.version>
+        <osgi.version>6.0.1</osgi.version>
        <!-- maven.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
-        <maven.version>${project.version}</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>
+        <maven.version>6.0.1</maven.version>
+        <repo.type>Release</repo.type>
+        <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/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-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.0.0-SNAPSHOT/talend-doc-p2-repo-6.0.0-SNAPSHOT.zip-unzip/</doc-repo.url>
+        <doc-repo.url>${opensourcerelease-unziprepo.url}/talend-doc-p2-repo/6.0.1/talend-doc-p2-repo-6.0.1.zip-unzip/</doc-repo.url>
        <bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/6.5.0/bonita-community-p2-repo-6.5.0.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>
@@ -34,7 +33,7 @@
        <osgi.ws>win32</osgi.ws>
        <osgi.os>win32</osgi.os>
        <osgi.arch>x86</osgi.arch>
-        <strictVersions>true</strictVersions>
+        <strictVersions>false</strictVersions>
    </properties>

    <distributionManagement>
@@ -117,19 +116,6 @@
                    <strictVersions>${strictVersions}</strictVersions>
                </configuration>
            </plugin>
-            <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-maven-plugin</artifactId>
@@ -213,6 +199,7 @@
            <properties>
                <release.suffix>-SNAPSHOT</release.suffix>
                <revision.filename>SNAPSHOT</revision.filename>
+                <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
            </properties>
            <repositories>
                <repository>
@@ -223,6 +210,19 @@
            </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>
@@ -241,7 +241,58 @@
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
                                <manifestEntries>
-                                    <Built-By></Built-By>
+                                    <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>tuj</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>
+                        <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>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>jgit</timestampProvider>
@@ -256,7 +307,6 @@
            <id>official</id>
            <properties>
                <talendtargetplatform.path>${buildRootDir}/../targetplatform</talendtargetplatform.path>
-                <unqualifiedVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</unqualifiedVersion>
                <talendtargetplatformversion.path>${talendtargetplatform.path}/${unqualifiedVersion}</talendtargetplatformversion.path>
            </properties>
            <build>
@@ -298,7 +348,7 @@
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
                                <manifestEntries>
-                                    <Built-By></Built-By>
+                                    <Built-By />
                                </manifestEntries>
                            </archive>
                        </configuration>
@@ -321,7 +371,7 @@
                                <configuration>
                                    <target>
                                        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                                        <ac:for param="jarFile" xmlns:ac="antlib:net.sf.antcontrib">
+                                        <ac:for xmlns:ac="antlib:net.sf.antcontrib" param="jarFile">
                                            <path>
                                                <fileset dir="${project.basedir}/target" includes="*.jar" />
                                            </path>
Author	SHA1	Message	Date
build-talend	07c8de77a1	DEVOPS-1729 Nexus migration: Update URLs	2017-03-01 17:11:48 +01:00
iwangtalend	841f921326	Freeze doc plugin version	2015-09-18 11:02:21 +02:00
nrousseau	f747b311fc	TUP-3480: delete repository folder created during the build step	2015-09-07 17:58:38 +08:00
iwangtalend	81a0719d44	TDI-33753: delete files generated by the studio, which should not be included in the final build	2015-09-02 10:19:38 +02:00
iwangtalend	d942694e98	Update pom.xml	2015-09-01 01:02:28 +02:00
Irene Wang	2a1bebbb02	Echo buildQualifier for about.mappings	2015-08-31 11:46:47 +02:00
Irene Wang	65dc23f323	Update versions for 6.0.1 GA	2015-08-27 16:40:59 +02:00
Irene Wang	42d6f1e7f7	Use newly signed Mac launchers	2015-08-27 10:46:31 +02:00
nrousseau	295bd35ed9	TDI-33753: delete files generated by the studio, which should not be included in the final build	2015-08-27 14:40:39 +08:00
Irene Wang	2c8a092392	Still need to rename non-Mac launchers	2015-08-26 15:21:16 +02:00
iwangtalend	169a497ccf	Update to 6.0.1 documentation	2015-08-26 15:16:25 +02:00
Irene Wang	2b915b92e5	Mac launchers cannot be modified after signing	2015-08-26 12:55:25 +02:00
iwangtalend	9779e9e850	Allow TUJ builds to be run before official TOS build finishes on a new branch	2015-08-12 16:15:37 +02:00
Irene Wang	31d479fc26	Set product.version for non-official builds	2015-08-11 10:43:24 +02:00
Irene Wang	b9c2ffaea5	project.version comes from child POM, not current POM	2015-07-20 15:44:57 +02:00
Irene Wang	e1e8ecd92a	Revert "Update pom.xml" This reverts commit `185eb5af99`.	2015-07-20 15:43:57 +02:00
iwangtalend	185eb5af99	Update pom.xml	2015-07-17 16:41:34 +02:00
Irene Wang	17da83fbee	Update versions to 6.0.1	2015-07-16 12:51:01 +02:00