PredefinedVersionCreator handling main branch name

allegro · May 23, 2022 · b1183fc · b1183fc
1 parent 2117759
commit b1183fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 34 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/build.gradle b/build.gradle
@@ -17,8 +17,6 @@ scmVersion {
         pre 'fileUpdate', [files: ['README.md', 'mkdocs.yml'], pattern: { v, p -> /'$v'/ }, replacement: { v, p -> "'$v'" }]
         pre 'commit'
     }
-
-    versionCreator 'versionWithBranch'
 }
 
 group = 'pl.allegro.tech.build'
@@ -133,8 +131,6 @@ publishing {
     publications {
         sonatype(MavenPublication) {
             from components.java
-            artifact sourcesJar
-            artifact javadocJar
             pom {
                 name = project.name
                 description = 'Gradle release and version management plugin'
@@ -143,7 +139,7 @@ publishing {
                 licenses {
                     license {
                         name = 'The Apache License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
                 developers {

diff --git a/src/main/groovy/pl/allegro/tech/build/axion/release/domain/PredefinedVersionCreator.groovy b/src/main/groovy/pl/allegro/tech/build/axion/release/domain/PredefinedVersionCreator.groovy
@@ -9,7 +9,7 @@ enum PredefinedVersionCreator {
     }),
 
     VERSION_WITH_BRANCH('versionWithBranch', { String versionFromTag, ScmPosition position ->
-        if (position.branch != 'master' && position.branch != 'HEAD') {
+        if ((position.branch != 'master' && position.branch != 'main') && position.branch != 'HEAD') {
             return "$versionFromTag-$position.branch".toString()
         }
         return versionFromTag