Skip to content

Commit

Permalink
fixing pom issues that prevented publishing
Browse files Browse the repository at this point in the history
* fixing two issues that prevented us from publishing to maven central
  - fixing sourceJar typo -> sourcesJar
  - configure the pom for all artifact filters
* partial fix for #5212
  • Loading branch information
lbergelson committed Sep 25, 2018
1 parent f0dddbc commit 933970c
Showing 1 changed file with 41 additions and 32 deletions.
73 changes: 41 additions & 32 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,9 @@ task testUtilsJavadocJar(type: Jar, dependsOn: testUtilsJavadoc){
from "$docBuildDir/testUtilsJavadoc"
}

task testUtilsSourceJar(type: Jar){
task testUtilsSourcesJar(type: Jar){
baseName = "$project.name-test-utils"
classifier = 'source'
classifier = 'sources'
from sourceSets.testUtils.allSource
}

Expand Down Expand Up @@ -732,7 +732,7 @@ artifacts {
archives sourcesJar
archives testUtilsJar
archives testUtilsJavadocJar
archives testUtilsSourceJar
archives testUtilsSourcesJar

}
//remove zip and tar added by the application plugin
Expand All @@ -749,12 +749,44 @@ signing {

def gatkArtifactFilter = { artifact, file -> artifact.name == 'gatk' }
def gatkTestUtilsArtifactFilter = {artifact, file -> artifact.name == 'gatk-test-utils' }
def basePomConfiguration = {
packaging 'jar'
description 'Development on GATK 4'
url 'http://github.com/broadinstitute/gatk'

scm {
url 'scm:[email protected]:broadinstitute/gatk.git'
connection 'scm:[email protected]:broadinstitute/gatk.git'
developerConnection 'scm:[email protected]:broadinstitute/gatk.git'
}

developers {
developer {
id = "gatkdev"
name = "GATK Development Team"
email = "[email protected]"
}
}

licenses {
license {
name 'BSD 3-Clause'
url 'https://github.com/broadinstitute/gatk/blob/master/LICENSE.TXT'
distribution 'repo'
}
}
}

install {
install {
repositories.mavenInstaller {
addFilter('gatk', gatkArtifactFilter)
.project(basePomConfiguration)
.project{ name "GATK4"}

addFilter('gatk-test-utils', gatkTestUtilsArtifactFilter)
.project(basePomConfiguration)
.project{ name "GATK4 Test Utilities" }
}
}
}
Expand All @@ -780,37 +812,14 @@ uploadArchives {
authentication(userName: System.env.ARTIFACTORY_USERNAME, password: System.env.ARTIFACTORY_PASSWORD)
}

addFilter('gatk', gatkArtifactFilter)
addFilter('gatk-test-utils', gatkTestUtilsArtifactFilter)
.project(basePomConfiguration)
.project{ name "GATK4 Test Utilities" }

addFilter('gatk', gatkArtifactFilter)
.project(basePomConfiguration)
.project{ name "GATK4"}

pom.project {
name 'GATK4'
packaging 'jar'
description 'Development on GATK 4'
url 'http://github.com/broadinstitute/gatk'

scm {
url 'scm:[email protected]:broadinstitute/gatk.git'
connection 'scm:[email protected]:broadinstitute/gatk.git'
developerConnection 'scm:[email protected]:broadinstitute/gatk.git'
}

developers {
developer {
id = "gatkdev"
name = "GATK Development Team"
email = "[email protected]"
}
}

licenses {
license {
name 'BSD 3-Clause'
url 'https://github.com/broadinstitute/gatk/blob/master/LICENSE.TXT'
distribution 'repo'
}
}
}
}
}
}
Expand Down

0 comments on commit 933970c

Please sign in to comment.