You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/02/08 22:59:12 UTC
[45/50] [abbrv] incubator-geode git commit: GEODE-14: Don't include
source and javadoc jars
GEODE-14: Don't include source and javadoc jars
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cea74ab1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cea74ab1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cea74ab1
Branch: refs/heads/feature/GEODE-773-2
Commit: cea74ab19588bc1fdb385dc62d98e15a72bed7f2
Parents: c3b91bc
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed Feb 3 10:37:01 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Mon Feb 8 07:06:27 2016 -0800
----------------------------------------------------------------------
.../gemfire-modules-assembly/build.gradle | 45 ++++++++++++--------
.../gemfire-modules-hibernate/build.gradle | 4 --
extensions/gemfire-modules-session/build.gradle | 2 -
extensions/gemfire-modules-tomcat7/build.gradle | 6 +--
extensions/gemfire-modules/build.gradle | 4 --
gradle/java.gradle | 6 +++
6 files changed, 34 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cea74ab1/extensions/gemfire-modules-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/build.gradle b/extensions/gemfire-modules-assembly/build.gradle
index 3936850..8bfdde9 100644
--- a/extensions/gemfire-modules-assembly/build.gradle
+++ b/extensions/gemfire-modules-assembly/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import org.apache.tools.ant.filters.ReplaceTokens
+
configurations {
slf4jDeps
}
@@ -34,13 +36,19 @@ dependencies {
jar.enabled = false
+def getJarArtifact(module) {
+ project(module).configurations.archives.artifacts.findAll {
+ it instanceof PublishArtifact && it.classifier == '' && it.type == 'jar'
+ }.collect { it.file }
+}
+
def configureTcServerAssembly = {
archiveName = "Apache_Geode_Modules-${version}-tcServer.zip"
// All client-server files
into('gemfire-cs/lib') {
- from project(':extensions/gemfire-modules').configurations.archives.allArtifacts.files
- from project(':extensions/gemfire-modules-tomcat7').configurations.archives.allArtifacts.files
+ from getJarArtifact(':extensions/gemfire-modules')
+ from getJarArtifact(':extensions/gemfire-modules-tomcat7')
from configurations.slf4jDeps
}
into('gemfire-cs/bin') {
@@ -50,7 +58,7 @@ def configureTcServerAssembly = {
from('release/tcserver/gemfire-cs') {
include 'modules.env'
}
- filter { it.replaceAll('@GEMFIRE_MODULES_VERSION@', version) }
+ filter(ReplaceTokens, tokens:['GEMFIRE_MODULES_VERSION': version])
}
into('gemfire-cs/conf') {
from('release/conf') {
@@ -65,7 +73,7 @@ def configureTcServerAssembly = {
from('release/tcserver/gemfire-cs') {
include 'configuration-prompts.properties'
include 'README.txt'
- filter { it.replaceAll('@VERSION@', version) }
+ filter(ReplaceTokens, tokens:['VERSION': version])
}
}
@@ -82,8 +90,8 @@ def configureTcServerAssembly = {
}
// All peer-to-peer files
into('gemfire-p2p/lib') {
- from project(':extensions/gemfire-modules').configurations.archives.allArtifacts.files
- from project(':extensions/gemfire-modules-tomcat7').configurations.archives.allArtifacts.files
+ from getJarArtifact(':extensions/gemfire-modules')
+ from getJarArtifact(':extensions/gemfire-modules-tomcat7')
from configurations.slf4jDeps
from('release/3rdparty_license') {
include "open_source_licenses*${version}.txt"
@@ -111,7 +119,7 @@ def configureTcServerAssembly = {
from('release/tcserver/gemfire-p2p') {
include 'configuration-prompts.properties'
include 'README.txt'
- filter { it.replaceAll('@VERSION@', version) }
+ filter(ReplaceTokens, tokens:['VERSION': version])
}
}
@@ -159,8 +167,8 @@ task distTomcat(type: Zip, dependsOn: ':extensions/gemfire-modules:build') {
// All client-server files
into('lib') {
- from project(':extensions/gemfire-modules').configurations.archives.allArtifacts.files
- from project(':extensions/gemfire-modules-tomcat7').configurations.archives.allArtifacts.files
+ from getJarArtifact(':extensions/gemfire-modules')
+ from getJarArtifact(':extensions/gemfire-modules-tomcat7')
from configurations.slf4jDeps
}
into('bin') {
@@ -180,7 +188,8 @@ task distHibernate(type: Zip, dependsOn: ':extensions/gemfire-modules-hibernate:
archiveName = "Apache_Geode_Modules-${version}-Hibernate.zip"
into('lib') {
- from project(':extensions/gemfire-modules-hibernate').configurations.archives.allArtifacts.files
+ from getJarArtifact(':extensions/gemfire-modules')
+ from getJarArtifact(':extensions/gemfire-modules-hibernate')
}
}
@@ -188,8 +197,8 @@ task distAppServer(type: Zip, dependsOn: ':extensions/gemfire-modules-session:bu
archiveName = "Apache_Geode_Modules-${version}-AppServer.zip"
into('lib') {
- from project(':extensions/gemfire-modules').configurations.archives.allArtifacts.files
- from project(':extensions/gemfire-modules-session').configurations.archives.allArtifacts.files
+ from getJarArtifact(':extensions/gemfire-modules')
+ from getJarArtifact(':extensions/gemfire-modules-session')
from configurations.slf4jDeps
from configurations.servletApiDeps
}
@@ -201,10 +210,10 @@ task distAppServer(type: Zip, dependsOn: ':extensions/gemfire-modules-session:bu
include 'cacheserver.*'
include 'gemfire.*'
- filter { it.replaceAll('@GEMFIRE_MODULES_VERSION@', version) }
- filter { it.replaceAll('@SLF4J_VERSION@', project.'slf4j-api.version') }
- filter { it.replaceAll('@SERVLET_API_VERSION@', project.'javax.servlet-api_version') }
- filter { it.replaceAll('@GEMFIRE_VERSION@', version) }
+ filter(ReplaceTokens, tokens:['GEMFIRE_MODULES_VERSION': version])
+ filter(ReplaceTokens, tokens:['SLF4J_VERSION': project.'slf4j-api.version'])
+ filter(ReplaceTokens, tokens:['SERVLET_API_VERSION': project.'javax.servlet-api.version'])
+ filter(ReplaceTokens, tokens:['GEMFIRE_VERSION': version])
}
}
@@ -213,11 +222,11 @@ task distAppServer(type: Zip, dependsOn: ':extensions/gemfire-modules-session:bu
}
}
-task distTcServer(type: Zip, dependsOn: ':extensions/gemfire-modules:build') {
+task distTcServer(type: Zip, dependsOn: [':extensions/gemfire-modules:build', ':extensions/gemfire-modules-tomcat7:build']) {
configure(configureTcServerAssembly)
}
-task distTcServer30(type: Zip, dependsOn: ':extensions/gemfire-modules:build') {
+task distTcServer30(type: Zip, dependsOn: [':extensions/gemfire-modules:build', ':extensions/gemfire-modules-tomcat7:build']) {
configure(configureTcServerAssembly)
configure(configureTcServer30Assembly)
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cea74ab1/extensions/gemfire-modules-hibernate/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-hibernate/build.gradle b/extensions/gemfire-modules-hibernate/build.gradle
index 7681301..56e9956 100644
--- a/extensions/gemfire-modules-hibernate/build.gradle
+++ b/extensions/gemfire-modules-hibernate/build.gradle
@@ -15,10 +15,6 @@
* limitations under the License.
*/
-jar {
- baseName = 'gemfire-modules-hibernate'
-}
-
dependencies {
compile project(':extensions/gemfire-modules')
compile 'org.hibernate:hibernate-core:' + project.'hibernate.version'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cea74ab1/extensions/gemfire-modules-session/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-session/build.gradle b/extensions/gemfire-modules-session/build.gradle
index 7435d37..9562e0f 100644
--- a/extensions/gemfire-modules-session/build.gradle
+++ b/extensions/gemfire-modules-session/build.gradle
@@ -26,7 +26,6 @@ dependencies {
}
testCompile(group: 'org.eclipse.jetty', name: 'jetty-http', version: project.'jetty.version', classifier: 'tests')
testCompile(group: 'org.eclipse.jetty', name: 'jetty-servlet', version: project.'jetty.version', classifier: 'tests')
-// testCompile 'org.apache.tomcat:jasper:6.0.29'
provided project(path: ':gemfire-junit')
}
@@ -35,7 +34,6 @@ jar {
include '**/session/filter/**/*'
include '**/session/installer/**/*'
includeEmptyDirs = false
- baseName = 'gemfire-modules-session-external'
manifest {
attributes 'Main-Class': 'com.gemstone.gemfire.modules.session.installer.Installer'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cea74ab1/extensions/gemfire-modules-tomcat7/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-tomcat7/build.gradle b/extensions/gemfire-modules-tomcat7/build.gradle
index fc08fc0..5a4c28e 100644
--- a/extensions/gemfire-modules-tomcat7/build.gradle
+++ b/extensions/gemfire-modules-tomcat7/build.gradle
@@ -24,10 +24,6 @@ test {
}
}
-jar {
- baseName = 'gemfire-modules-tomcat7'
-}
-
dependencies {
compile(project(':extensions/gemfire-modules')) {
// Remove everything related to Tomcat 6.x
@@ -53,5 +49,5 @@ dependencies {
exclude group: 'org.apache.tomcat', module: 'catalina-ha'
exclude group: 'org.apache.tomcat', module: 'juli'
}
- provided project(path: ':gemfire-junit', configuration: 'testOutput')
+ provided project(path: ':gemfire-junit')
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cea74ab1/extensions/gemfire-modules/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules/build.gradle b/extensions/gemfire-modules/build.gradle
index 5b452b7..68197bf 100644
--- a/extensions/gemfire-modules/build.gradle
+++ b/extensions/gemfire-modules/build.gradle
@@ -24,10 +24,6 @@ test {
}
}
-jar {
- baseName = 'gemfire-modules'
-}
-
dependencies {
compile project(':gemfire-core')
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cea74ab1/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 90179b8..015da2f 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -125,4 +125,10 @@ subprojects {
compile 'com.google.code.findbugs:jsr305:' + project.'jsr305.version'
compile 'javax.enterprise:cdi-api:' + project.'cdi-api.version'
}
+
+ jar {
+ // Intended to strip off 'extensions/' from the modules so that artifacts don't end up in libs/extensions/
+ def parts = project.name.split("/")
+ baseName = parts[parts.length - 1]
+ }
}