Repository: geode Updated Branches: refs/heads/develop 5c434bc3a -> 8fa754586
GEODE-3109: Publish modules distribution artifacts to maven - Although the build will create local artifacts like Apache_Geode_Modules-1.3.0-SNAPSHOT-tcServer.zip, the published artifacts will be at co-ordinates: org.apache.geode:geode-modules-assembly:zip:tcServer:1.3.0-SNAPSHOT Signed-off-by: Dick Cavender <dcaven...@pivotal.io> Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/adab0c46 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/adab0c46 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/adab0c46 Branch: refs/heads/develop Commit: adab0c469053e9dad92c151a558fb383c5d00de7 Parents: 5039e62 Author: Jens Deppe <jde...@pivotal.io> Authored: Fri Jun 23 08:32:13 2017 -0700 Committer: Dick Cavender <dcaven...@pivotal.io> Committed: Fri Jun 23 08:32:13 2017 -0700 ---------------------------------------------------------------------- extensions/geode-modules-assembly/build.gradle | 28 +++++++++++++++----- .../geode-modules-session-internal/build.gradle | 4 ++- extensions/geode-modules-session/build.gradle | 2 ++ extensions/geode-modules-tomcat7/build.gradle | 2 ++ extensions/geode-modules-tomcat8/build.gradle | 2 ++ extensions/geode-modules/build.gradle | 2 ++ 6 files changed, 33 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/adab0c46/extensions/geode-modules-assembly/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle index 5604e12..ecb67a7 100644 --- a/extensions/geode-modules-assembly/build.gradle +++ b/extensions/geode-modules-assembly/build.gradle @@ -27,14 +27,13 @@ dependencies { slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version' } -jar.enabled = false +jar.enabled = true extraArchive { sources = false javadoc = false tests = false } -disableMavenPublishing() disableSigning() def getJarArtifact(module) { @@ -43,8 +42,11 @@ def getJarArtifact(module) { }.collect { it.file } } +def moduleBaseName = "${productName.replace(' ', '_')}_Modules" + def configureTcServerAssembly = { - archiveName = "Apache_Geode_Modules-${version}-tcServer.zip" + baseName = moduleBaseName + classifier = "tcServer" // All client-server files into('geode-cs/lib') { @@ -116,7 +118,8 @@ def configureTcServerAssembly = { } def configureTcServer30Assembly = { - archiveName = "Apache_Geode_Modules-${version}-tcServer30.zip" + baseName = moduleBaseName + classifier = "tcServer30" into('geode-cs-tomcat-8/conf') { from('release/tcserver/geode-cs-tomcat-8') { @@ -132,7 +135,8 @@ def configureTcServer30Assembly = { } task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') { - archiveName = "Apache_Geode_Modules-${version}-Tomcat.zip" + baseName = moduleBaseName + classifier = "Tomcat" // All client-server files into('lib') { @@ -155,7 +159,8 @@ task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') { } task distAppServer(type: Zip, dependsOn: ':extensions/geode-modules-session:assemble') { - archiveName = "Apache_Geode_Modules-${version}-AppServer.zip" + baseName = moduleBaseName + classifier = "AppServer" into('lib') { from getJarArtifact(':extensions/geode-modules-session') @@ -202,3 +207,14 @@ dependencies { task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 'distTomcat', 'distAppServer']) build.dependsOn dist + +install.dependsOn dist +uploadArchives.dependsOn dist + +artifacts { + archives distTcServer + archives distTcServer30 + archives distAppServer + archives distTomcat +} + http://git-wip-us.apache.org/repos/asf/geode/blob/adab0c46/extensions/geode-modules-session-internal/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-session-internal/build.gradle b/extensions/geode-modules-session-internal/build.gradle index 61c954b..39c6e55 100644 --- a/extensions/geode-modules-session-internal/build.gradle +++ b/extensions/geode-modules-session-internal/build.gradle @@ -22,4 +22,6 @@ dependencies { jar { baseName = 'geode-modules-session-internal' -} \ No newline at end of file +} + +disableMavenPublishing() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/geode/blob/adab0c46/extensions/geode-modules-session/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle index 3063772..0469070 100644 --- a/extensions/geode-modules-session/build.gradle +++ b/extensions/geode-modules-session/build.gradle @@ -40,3 +40,5 @@ jar { } baseName = 'geode-modules-session' } + +disableMavenPublishing() http://git-wip-us.apache.org/repos/asf/geode/blob/adab0c46/extensions/geode-modules-tomcat7/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle index 185bafd..21096f9 100644 --- a/extensions/geode-modules-tomcat7/build.gradle +++ b/extensions/geode-modules-tomcat7/build.gradle @@ -47,3 +47,5 @@ dependencies { } } } + +disableMavenPublishing() http://git-wip-us.apache.org/repos/asf/geode/blob/adab0c46/extensions/geode-modules-tomcat8/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle index c12288d..e26123f 100644 --- a/extensions/geode-modules-tomcat8/build.gradle +++ b/extensions/geode-modules-tomcat8/build.gradle @@ -48,3 +48,5 @@ dependencies { } } } + +disableMavenPublishing() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/geode/blob/adab0c46/extensions/geode-modules/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle index 55355fb..cfc2cd3 100644 --- a/extensions/geode-modules/build.gradle +++ b/extensions/geode-modules/build.gradle @@ -33,3 +33,5 @@ dependencies { testCompile project(path: ':geode-junit') testCompile files(project(':geode-core').sourceSets.test.output) } + +disableMavenPublishing() \ No newline at end of file
