Merge branch 'master' into release

Author: YaroslawEkimov

JenkinsfileRelease

@@ -1,7 +1,10 @@
 parameters {		
 		string(name: 'version', defaultValue: '19.9.0', description: 'version of sdk')	
 		string(name: 'StartFromStep', defaultValue: '0', description: 'start step')	
-		string(name: 'testServerUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')		
+		string(name: 'testServerUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')
+		string(name: 'credentialsId', defaultValue: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', description: 'credentials id')
+		string(name: 'releaseCredentialsId', defaultValue: 'f0c4f9b6-8ffe-4ea8-8981-e99263fdb788', description: 'release credentials id')
+		string(name: 'serverToDeploy', defaultValue: '-DuseStageRepo=true', description: 'possible values are -DuseStageRepo=true or false')
 }
 node('words-linux') {         
     try {
@@ -23,15 +26,15 @@ node('words-linux') {
        stage('1:checkout'){
 		if (params.StartFromStep.toInteger() < 2) {
         	checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-java.git']]])
-            withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
+            withCredentials([usernamePassword(credentialsId: params.credentialsId, passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
 			  sh 'git checkout release'
               sh 'mkdir -p Settings'
               sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"https://auckland-words-cloud-staging.dynabic.com\\"}" > Settings/servercreds.json'
 			  sh "git config user.email \"[email protected]\""
 			  sh "git config user.name \"jenkins\""
            }
-		   	withCredentials([usernamePassword(credentialsId: 'f0c4f9b6-8ffe-4ea8-8981-e99263fdb788', passwordVariable: 'mavenPass', usernameVariable: 'mavenUser')]) {
-					sh 'echo "<settings xmlns=\\"http://maven.apache.org/SETTINGS/1.0.0\\" \\n xmlns:xsi=\\"http://www.w3.org/2001/XMLSchema-instance\\" \\n xsi:schemaLocation=\\"http://maven.apache.org/SETTINGS/1.0.0\\"> \\n<servers> \\n <server> \\n<id>aspose</id>\\n<username>${mavenUser}</username>\\n<password>${mavenPass}</password>\\n</server>\\n</servers>\\n</settings>" > wordsSettings.xml'
+		   	withCredentials([usernamePassword(credentialsId: params.releaseCredentialsId, passwordVariable: 'mavenPass', usernameVariable: 'mavenUser')]) {
+					sh 'echo "<settings xmlns=\\"http://maven.apache.org/SETTINGS/1.0.0\\" \\n xmlns:xsi=\\"http://www.w3.org/2001/XMLSchema-instance\\" \\n xsi:schemaLocation=\\"http://maven.apache.org/SETTINGS/1.0.0\\"> \\n<servers> \\n <server> \\n<id>params.serverToDeploy</id>\\n<username>${mavenUser}</username>\\n<password>${mavenPass}</password>\\n</server>\\n</servers>\\n</settings>" > wordsSettings.xml'
 				}
 			}
 		}
@@ -41,12 +44,12 @@ node('words-linux') {
 			withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
 					docker.image('maven:3.6.2-jdk-8').inside{
 						stage('deploy'){
-							withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
+							withCredentials([usernamePassword(credentialsId: params.credentialsId, passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
 								sh 'mkdir -p Settings'
 								sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
 							}
 							sh 'cat wordsSettings.xml'
-							sh "mvn --settings wordsSettings.xml deploy -Dmaven.javadoc.skip=true -DcheckModificationExcludeList=wordsSettings.xml,Settings/servercreds.json"
+							sh "mvn --settings wordsSettings.xml deploy -Dmaven.javadoc.skip=true -DcheckModificationExcludeList=wordsSettings.xml,Settings/servercreds.json -DuseStageRepo=true"
 						}
 					}
 				}

pom.xml

@@ -14,13 +14,6 @@
       <tag>HEAD</tag>
   </scm>
 
-    <distributionManagement>
-        <repository>
-            <id>aspose</id>
-            <url>https://repository.aspose.cloud/internal</url>
-        </repository>        
-    </distributionManagement>
-
     <licenses>
         <license>
             <name>MIT License</name>
@@ -39,6 +32,13 @@
     </developers>
 
     <build>
+		<extensions>
+			<extension>
+				<groupId>com.github.seahen</groupId>
+				<artifactId>maven-s3-wagon</artifactId>
+				<version>1.3.3</version>
+			</extension>
+		</extensions>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -215,6 +215,37 @@
     </build>
 
     <profiles>
+	<profile>
+            <id>stage-repository</id>
+            <activation>
+                <property>
+                    <name>useStageRepo</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <distributionManagement>
+                <repository>
+                    <id>aspose-cloud-s3-repo-ci-qa</id>
+                    <url>s3://data-qa.repository.aspose.cloud/repo</url>
+                </repository>
+            </distributionManagement>
+       </profile>
+
+        <profile>
+            <id>production-repository</id>
+            <activation>
+                <property>
+                    <name>useStageRepo</name>
+					<value>false</value>
+                </property>
+            </activation>
+            <distributionManagement>
+                <repository>
+                    <id>aspose-cloud-s3-repo-ci</id>
+                    <url>s3://data.repository.aspose.cloud/repo</url>
+                </repository>
+            </distributionManagement>
+        </profile>
         <profile>
             <id>sign-artifacts</id>
             <build>