DEVOPS-1729 Nexus migration: Update URLs

Do not include NOTICE for MDM
Update pom.xml
2017-03-01 17:07:56 +01:00 · 2016-07-06 14:13:54 +02:00 · 2016-07-05 14:58:49 +02:00 · 2016-07-05 14:58:16 +02:00 · 2016-07-05 12:15:15 +02:00 · 2016-07-04 18:45:21 +08:00
15 changed files with 79 additions and 95 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
@@ -1,20 +1,19 @@
 <?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">
+<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.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>6.2.1-SNAPSHOT</version>
+		<version>6.2.1</version>
 	</parent>

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

 	<properties>
-		<components.version>0.13.0</components.version>
-		<daikon.version>0.12.0</daikon.version>
+		<components.version>0.13.1</components.version>
+		<daikon.version>0.12.1</daikon.version>
 	</properties>

 	<dependencies>
@@ -26,22 +25,22 @@
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>org.talend.dataquality.common</artifactId>
-			<version>1.4.5-SNAPSHOT</version>
+			<version>1.4.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>org.talend.dataquality.record.linkage</artifactId>
-			<version>3.1.3-SNAPSHOT</version>
+			<version>3.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>org.talend.dataquality.standardization</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>org.talend.dataquality.sampling</artifactId>
-			<version>2.2.2-SNAPSHOT</version>
+			<version>2.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
@@ -159,13 +158,13 @@
 		<dependency>
 			<groupId>org.talend.components</groupId>
 			<artifactId>components-salesforce</artifactId>
-			<version>${components.version}</version>
+			<version>0.13.2</version>
 			<classifier>bundle</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
 			<artifactId>components-dataprep</artifactId>
-			<version>${components.version}</version>
+			<version>0.13.3</version>
 			<classifier>bundle</classifier>
 		</dependency>
 		<dependency>
--- 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.2.1-SNAPSHOT</version>
+    <version>6.2.1</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>

--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.2.1-SNAPSHOT</version>
+		<version>6.2.1</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.2.1-SNAPSHOT</version>
+		<version>6.2.1</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/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.2.1-SNAPSHOT</version>
+		<version>6.2.1</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.2.1-SNAPSHOT</version>
+		<version>6.2.1</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.2.1-SNAPSHOT</version>
+		<version>6.2.1</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
@@ -1,28 +1,13 @@
 <?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.2.1-SNAPSHOT</version>
-		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
-	</parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.talend.studio</groupId>
+        <artifactId>tos-products-parent-pom</artifactId>
+        <version>6.2.1</version>
+        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
+    </parent>

-	<artifactId>org.talend.studio.tos.esb.product</artifactId>
-	<packaging>eclipse-repository</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.8</version>
-				<executions>
-					<execution>
-						<id>copy-notice-txt</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <artifactId>org.talend.studio.tos.esb.product</artifactId>
+    <packaging>eclipse-repository</packaging>
 </project>
--- a/build/talend.studio.tos.mdm.product/pom.xml
+++ b/build/talend.studio.tos.mdm.product/pom.xml
@@ -1,31 +1,31 @@
 <?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.2.1-SNAPSHOT</version>
-		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
-	</parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.talend.studio</groupId>
+        <artifactId>tos-products-parent-pom</artifactId>
+        <version>6.2.1</version>
+        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
+    </parent>

-	<artifactId>org.talend.studio.tos.mdm.product</artifactId>
-	<packaging>eclipse-repository</packaging>
-	<properties>
-		<product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.8</version>
-				<executions>
-					<execution>
-						<id>copy-notice-txt</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <artifactId>org.talend.studio.tos.mdm.product</artifactId>
+    <packaging>eclipse-repository</packaging>
+    <properties>
+        <product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
+                <executions>
+                    <execution>
+                        <id>copy-notice-txt</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
--- 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.2.1-SNAPSHOT</version>
+		<version>6.2.1</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>
@@ -179,7 +179,7 @@
 									<classifier>notice</classifier>
 									<overWrite>true</overWrite>
 									<outputDirectory>${studio.dir}</outputDirectory>
-									<destFileName>license.txt</destFileName>
+									<destFileName>NOTICE.txt</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.2.1-SNAPSHOT</version>
+		<version>6.2.1</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,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
    <packaging>pom</packaging>

    <properties>
@@ -12,13 +12,13 @@
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
        <base.version>6.2.1</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>
+        <osgi.compatible.version>6.2.1</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>
-        <talend.nexus.p2unzip.url>http://${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
+        <maven.compatible.version>6.2.1</maven.compatible.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/6.1.0-SNAPSHOT/talend-eclipse-p2-repo-6.1.0-SNAPSHOT.zip-unzip</eclipse-repo.url>
Author	SHA1	Message	Date
build-talend	9262ced9c1	DEVOPS-1729 Nexus migration: Update URLs	2017-03-01 17:07:56 +01:00
Irene Wang	766b52cb8d	Do not include NOTICE for MDM	2016-07-06 14:13:54 +02:00
iwangtalend	9982a9bc2c	Update pom.xml	2016-07-05 14:58:49 +02:00
iwangtalend	bbd009c009	Update pom.xml	2016-07-05 14:58:16 +02:00
Irene Wang	909016cb1a	DEVOPS-667 Add NOTICE files for TOS MDM and ESB	2016-07-05 12:15:15 +02:00
nrousseau	365a100dd9	update components version	2016-07-04 18:45:21 +08:00
nrousseau	974b9eb7ec	update components version	2016-07-01 19:56:13 +08:00
nrousseau	852ac23bcb	update components version	2016-06-30 20:37:42 +08:00
nhaumont	cce658d1cf	Set versions for 6.2.1	2016-06-27 16:12:28 +02:00