DEVOPS-1729 Nexus migration: Update URLs

Use OSGi compatible verson for repos
2017-03-01 17:13:45 +01:00 · 2015-01-14 23:32:02 -08:00 · 2015-01-14 23:09:07 -08:00 · 2015-01-14 23:06:40 -08:00 · 2015-01-14 18:45:55 +01:00
11 changed files with 41 additions and 30 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/talend-eclipse-p2-repo/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-SNAPSHOT.zip-unzip
+        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/talend-eclipse-p2-repo/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-SNAPSHOT.zip-unzip
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-M1</version>
 		<relativePath></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,11 +4,12 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-M1</version>
 		<relativePath></relativePath>
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
+	<version>6.0.0.M1</version>
 	<packaging>eclipse-repository</packaging>

 	<properties>
@@ -24,7 +25,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 +35,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>
@@ -165,4 +166,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project> 
+</project> 
--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -4,10 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0.M1</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
@@ -4,10 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0.M1</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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0.M1</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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0.M1</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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0.M1</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
@@ -4,11 +4,12 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-M1</version>
 		<relativePath></relativePath>
 	</parent>

 	<artifactId>tos-products-parent-pom</artifactId>
+	<version>6.0.0.M1</version>
 	<packaging>pom</packaging>

 	<repositories>
@@ -20,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>
@@ -30,13 +31,14 @@
 			<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>

 	<properties>
 		<product.final.name>${launcher.prefix}-${product.timestamp}-V${unqualifiedVersion}${revision.filename}</product.final.name>
 		<studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.ws}/${osgi.os}/${osgi.arch}</studio.dir>
+		<maven.version>6.0.0-M1</maven.version>
 	</properties>

 	<build>
@@ -133,7 +135,7 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>${product.branding.platform}</artifactId>
-									<version>${project.version}</version>
+									<version>${maven.version}</version>
 									<type>txt</type>
 									<classifier>license</classifier>
 									<overWrite>true</overWrite>
@@ -154,7 +156,7 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>${product.branding.platform}</artifactId>
-									<version>${project.version}</version>
+									<version>${maven.version}</version>
 									<type>txt</type>
 									<classifier>notice</classifier>
 									<overWrite>true</overWrite>
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-M1</version>
 		<relativePath></relativePath>
 	</parent>

@@ -22,7 +22,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 +32,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
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.studio</groupId>
 	<artifactId>parent-pom</artifactId>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-M1</version>
 	<packaging>pom</packaging>

 	<properties>
@@ -12,8 +12,8 @@
 		<tycho.version>0.22.0</tycho.version>
 		<tycho-extras.version>0.22.0</tycho-extras.version>
 		<base.version>6.0.0</base.version>
-		<talend.nexus.url>http://newbuild.talend.com:8081/nexus/content/repositories</talend.nexus.url>
-		<talend.nexus.p2unzip.url>http://newbuild.talend.com:8081/nexus/content/unzip</talend.nexus.p2unzip.url>
+		<talend.nexus.url>https://artifacts-zl.talend.com/nexus/content/repositories</talend.nexus.url>
+		<talend.nexus.p2unzip.url>https://artifacts-zl.talend.com/nexus/content/unzip</talend.nexus.p2unzip.url>
 		<talendtargetplatform.url>http://newbuild.talend.com/targetplatform</talendtargetplatform.url>
 		<talendtargetplatformversion.url>${talendtargetplatform.url}/${base.version}</talendtargetplatformversion.url>
 		<opensourcesnapshot-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceSnapshot/org/talend/repo</opensourcesnapshot-unziprepo.url>
@@ -86,6 +86,14 @@

 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<strictVersions>false</strictVersions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
Author	SHA1	Message	Date
build-talend	e00760e341	DEVOPS-1729 Nexus migration: Update URLs	2017-03-01 17:13:45 +01:00
newbuild.talend.com	d58cff85c6	Use OSGi compatible verson for repos	2015-01-14 23:32:02 -08:00
newbuild.talend.com	3f9f6bec00	Use OSGi compatible verson for repos	2015-01-14 23:09:07 -08:00
newbuild.talend.com	a06d180fa1	Use OSGi compatible verson for repos	2015-01-14 23:06:40 -08:00
Irene Wang	b68e8ec4e1	Update version to 6.0.0-M1	2015-01-14 18:45:55 +01:00