diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11e52a8..1303d6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: publish: needs: [ test, integration-test ] runs-on: ubuntu-latest - if: ${{ startsWith(github.ref, 'refs/tags/') }} + if: ${{ startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/') }} steps: - uses: actions/checkout@v2 with: diff --git a/alfresco-zipkin-core/build.gradle b/alfresco-zipkin-core/build.gradle index ac77f22..c48a9e3 100644 --- a/alfresco-zipkin-core/build.gradle +++ b/alfresco-zipkin-core/build.gradle @@ -23,6 +23,8 @@ task javadocJar(type: Jar, dependsOn: javadoc) { apply from: "../publish.gradle" +project.description = "Alfresco core AMP with Zipkin Instrumentation" + publishing { publications { mavenJava(MavenPublication) { diff --git a/build.gradle b/build.gradle index 7eb4185..37258b7 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,7 @@ allprojects { sourceCompatibility = 1.8 targetCompatibility = 1.8 - group = 'eu.xenit.alfresco' - version = '1.1.1' + group = 'eu.xenit.alfresco.zipkin' ext { alfresco_version = '5.2.f' diff --git a/publish.gradle b/publish.gradle index 469a5ac..341c412 100644 --- a/publish.gradle +++ b/publish.gradle @@ -6,6 +6,8 @@ publishing { all { pom { url = 'https://github.com/xenit-eu/alfresco-zipkin' + name = project.name + description = project.description scm { connection = 'scm:git:git@github.com:xenit-eu/alfresco-zipkin.git' @@ -34,7 +36,7 @@ publishing { maven { def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" - url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl + url = version.toString().endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl credentials { username = project.hasProperty('sonatype_username') ? project.sonatype_username : ''