httpsgithu
diff --git a/‎Jenkinsfile‎
Lines changed: 3 additions & 3 deletions b/‎Jenkinsfile‎
Lines changed: 3 additions & 3 deletions
@@ -36,9 +36,9 @@ pipeline {
         }
 
         stage('upload-to-repo') {
-            // By default, only dev and master branches deploy to repo to avoid messing in the same SNAPSHOT version
-            // (e.g. this avoids integration tests to pick it up the version).
-            when { expression { return BRANCH_NAME == 'dev' || BRANCH_NAME == 'master' } }
+            // Note: to avoid conflicts between snapshot versions, add the branch name
+            // before '-SNAPSHOT' to the version string, like '1.2.3-branch-SNAPSHOT'
+            when { expression { return BRANCH_NAME != 'publish' } }
             steps {
                 sh './gradlew --stacktrace -PpreferedRepo=local uploadArchives'
             }
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ pipeline {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`stage('upload-to-repo') {`
`39`		`- // By default, only dev and master branches deploy to repo to avoid messing in the same SNAPSHOT version`
`40`		`- // (e.g. this avoids integration tests to pick it up the version).`
`41`		`- when { expression { return BRANCH_NAME == 'dev' \|\| BRANCH_NAME == 'master' } }`
	`39`	`+ // Note: to avoid conflicts between snapshot versions, add the branch name`
	`40`	`+ // before '-SNAPSHOT' to the version string, like '1.2.3-branch-SNAPSHOT'`
	`41`	`+ when { expression { return BRANCH_NAME != 'publish' } }`
`42`	`42`	`steps {`
`43`	`43`	`sh './gradlew --stacktrace -PpreferedRepo=local uploadArchives'`
`44`	`44`	`}`