This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 439a38d62561792eb34394f88273223fd391fceb
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
AuthorDate: Mon Apr 16 15:25:31 2018 -0700
WIP updating rebase with develop
---
build.gradle | 2 +-
extensions/geode-modules-assembly/build.gradle | 273 +++++++++++++------------
2 files changed, 138 insertions(+), 137 deletions(-)
diff --git a/build.gradle b/build.gradle
index 65ddf55..db21bba 100755
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1"
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1'
- classpath "com.diffplug.gradle.spotless:spotless:3.10.0"
+ classpath "com.diffplug.gradle.spotless:spotless-plugin-gradle:3.10.0"
classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.6-SNAPSHOT"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index 78f2f5e..f83303d 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -24,9 +24,9 @@ configurations {
jar.enabled = true
extraArchive {
- sources = false
- javadoc = false
- tests = false
+ sources = false
+ javadoc = false
+ tests = false
}
disableMavenPublishing()
@@ -36,89 +36,89 @@ project.configurations.create('slf4jDeps')
project.configurations.create('moduleDistOutputs')
def getJarArtifact(module) {
- project(module).configurations.archives.artifacts.findAll {
- it instanceof PublishArtifact && it.type == 'jar' && it.classifier == ''
- }.collect { it.file }
+ project(module).configurations.archives.artifacts.findAll {
+ it instanceof PublishArtifact && it.type == 'jar' && it.classifier ==
''
+ }.collect { it.file }
}
def moduleBaseName = "Apache_Geode_Modules"
def configureTcServerAssembly = {
- baseName = moduleBaseName
- classifier = "tcServer"
-
- // All client-server files
- into('geode-cs/lib') {
- from getJarArtifact(':extensions:geode-modules')
- from getJarArtifact(':extensions:geode-modules-tomcat7')
- from getJarArtifact(':extensions:geode-modules-tomcat8')
- from configurations.slf4jDeps
- }
- into('geode-cs/bin') {
- from('release/scripts') {
- include '*'
- }
- }
- into('geode-cs/conf') {
- from('release/conf') {
- exclude 'cache-peer.xml'
- }
- from('release/tcserver/geode-cs') {
- include 'context-fragment.xml'
- include 'server-fragment.xml'
+ baseName = moduleBaseName
+ classifier = "tcServer"
+
+ // All client-server files
+ into('geode-cs/lib') {
+ from getJarArtifact(':extensions:geode-modules')
+ from getJarArtifact(':extensions:geode-modules-tomcat7')
+ from getJarArtifact(':extensions:geode-modules-tomcat8')
+ from configurations.slf4jDeps
+ }
+ into('geode-cs/bin') {
+ from('release/scripts') {
+ include '*'
+ }
+ }
+ into('geode-cs/conf') {
+ from('release/conf') {
+ exclude 'cache-peer.xml'
+ }
+ from('release/tcserver/geode-cs') {
+ include 'context-fragment.xml'
+ include 'server-fragment.xml'
+ }
+ }
+ into('geode-cs') {
+ from('release/tcserver/geode-cs') {
+ include 'configuration-prompts.properties'
+ }
+ }
+
+ // Tomncat 7 specifics
+ into('geode-cs-tomcat-7/conf') {
+ from('release/tcserver/geode-cs-tomcat-7') {
+ include 'context-fragment.xml'
+ }
+ }
+ // All peer-to-peer files
+ into('geode-p2p/lib') {
+ from getJarArtifact(':extensions:geode-modules')
+ from getJarArtifact(':extensions:geode-modules-tomcat7')
+ from getJarArtifact(':extensions:geode-modules-tomcat8')
+ from configurations.slf4jDeps
+ }
+ into('geode-p2p/bin') {
+ from('release/scripts') {
+ include 'gemfire.*'
+ include 'setenv.properties'
+ }
+ }
+ into('geode-p2p/conf') {
+ from('release/conf') {
+ include 'cache-peer.xml'
+ }
+ from('release/tcserver/geode-p2p') {
+ include 'context-fragment.xml'
+ include 'server-fragment.xml'
+ }
+ }
+ into('geode-p2p') {
+ from('release/tcserver/geode-p2p') {
+ include 'configuration-prompts.properties'
+ }
+ }
+
+ // Tomncat 7 specifics
+ into('geode-p2p-tomcat-7/conf') {
+ from('release/tcserver/geode-p2p-tomcat-7') {
+ include 'context-fragment.xml'
+ }
}
- }
- into('geode-cs') {
- from('release/tcserver/geode-cs') {
- include 'configuration-prompts.properties'
- }
- }
-
- // Tomncat 7 specifics
- into('geode-cs-tomcat-7/conf') {
- from('release/tcserver/geode-cs-tomcat-7') {
- include 'context-fragment.xml'
- }
- }
- // All peer-to-peer files
- into('geode-p2p/lib') {
- from getJarArtifact(':extensions:geode-modules')
- from getJarArtifact(':extensions:geode-modules-tomcat7')
- from getJarArtifact(':extensions:geode-modules-tomcat8')
- from configurations.slf4jDeps
- }
- into('geode-p2p/bin') {
- from('release/scripts') {
- include 'gemfire.*'
- include 'setenv.properties'
- }
- }
- into('geode-p2p/conf') {
- from('release/conf') {
- include 'cache-peer.xml'
- }
- from('release/tcserver/geode-p2p') {
- include 'context-fragment.xml'
- include 'server-fragment.xml'
- }
- }
- into('geode-p2p') {
- from('release/tcserver/geode-p2p') {
- include 'configuration-prompts.properties'
- }
- }
-
- // Tomncat 7 specifics
- into('geode-p2p-tomcat-7/conf') {
- from('release/tcserver/geode-p2p-tomcat-7') {
- include 'context-fragment.xml'
- }
- }
}
def configureTcServer30Assembly = {
- baseName = moduleBaseName
- classifier = "tcServer30"
+ baseName = moduleBaseName
+ classifier = "tcServer30"
into('geode-cs-tomcat-8/conf') {
from('release/tcserver/geode-cs-tomcat-8') {
@@ -146,91 +146,92 @@ def configureTcServer30Assembly = {
}
task distTomcat(type: Zip, dependsOn: ':extensions:geode-modules:assemble') {
- baseName = moduleBaseName
- classifier = "Tomcat"
-
- // All client-server files
- into('lib') {
- from getJarArtifact(':extensions:geode-modules')
- from getJarArtifact(':extensions:geode-modules-tomcat7')
- from getJarArtifact(':extensions:geode-modules-tomcat8')
- from configurations.slf4jDeps
- }
- into('bin') {
- from('release/scripts') {
- include '*'
- exclude 'setenv.properties'
- }
- }
- into('conf') {
- from('release/conf') {
- include '*'
+ baseName = moduleBaseName
+ classifier = "Tomcat"
+
+ // All client-server files
+ into('lib') {
+ from getJarArtifact(':extensions:geode-modules')
+ from getJarArtifact(':extensions:geode-modules-tomcat7')
+ from getJarArtifact(':extensions:geode-modules-tomcat8')
+ from configurations.slf4jDeps
+ }
+ into('bin') {
+ from('release/scripts') {
+ include '*'
+ exclude 'setenv.properties'
+ }
+ }
+ into('conf') {
+ from('release/conf') {
+ include '*'
+ }
}
- }
}
task distAppServer(type: Zip, dependsOn:
':extensions:geode-modules-session:assemble') {
- baseName = moduleBaseName
- classifier = "AppServer"
-
- into('lib') {
- from getJarArtifact(':extensions:geode-modules-session')
- from getJarArtifact(':extensions:geode-modules-session-internal')
- from getJarArtifact(':extensions:geode-modules')
- from configurations.slf4jDeps
- }
+ baseName = moduleBaseName
+ classifier = "AppServer"
- into('bin') {
- from('release/session/bin/') {
- include 'modify_war'
-
- filter(ReplaceTokens, tokens:['GEODE_VERSION': version])
- filter(ReplaceTokens, tokens:['SLF4J_VERSION':
project.'slf4j-api.version'])
- filter(ReplaceTokens, tokens:['LOG4J_VERSION': project.'log4j.version'])
- filter(ReplaceTokens, tokens:['FASTUTIL_VERSION':
project.'fastutil.version'])
- filter(ReplaceTokens, tokens:['ANTLR_VERSION': project.'antlr.version'])
- filter(ReplaceTokens, tokens:['TX_VERSION':
project.'javax.transaction-api.version'])
- filter(ReplaceTokens, tokens:['JGROUPS_VERSION':
project.'jgroups.version'])
- filter(ReplaceTokens, tokens:['SHIRO_VERSION': project.'shiro.version'])
- filter(ReplaceTokens, tokens:['COMMONS_LANG_VERSION':
project.'commons-lang.version'])
- filter(ReplaceTokens, tokens:['COMMONS_VALIDATOR_VERSION':
project.'commons-validator.version'])
+ into('lib') {
+ from getJarArtifact(':extensions:geode-modules-session')
+ from getJarArtifact(':extensions:geode-modules-session-internal')
+ from getJarArtifact(':extensions:geode-modules')
+ from configurations.slf4jDeps
}
- }
- into('conf') {
- from('release/conf')
- }
+ into('bin') {
+ from('release/session/bin/') {
+ include 'modify_war'
+
+ filter(ReplaceTokens, tokens: ['GEODE_VERSION': version])
+ filter(ReplaceTokens, tokens: ['SLF4J_VERSION':
project.'slf4j-api.version'])
+ filter(ReplaceTokens, tokens: ['LOG4J_VERSION':
project.'log4j.version'])
+ filter(ReplaceTokens, tokens: ['FASTUTIL_VERSION':
project.'fastutil.version'])
+ filter(ReplaceTokens, tokens: ['ANTLR_VERSION':
project.'antlr.version'])
+ filter(ReplaceTokens, tokens: ['TX_VERSION':
project.'javax.transaction-api.version'])
+ filter(ReplaceTokens, tokens: ['JGROUPS_VERSION':
project.'jgroups.version'])
+ filter(ReplaceTokens, tokens: ['SHIRO_VERSION':
project.'shiro.version'])
+ filter(ReplaceTokens, tokens: ['COMMONS_LANG_VERSION':
project.'commons-lang.version'])
+ filter(ReplaceTokens, tokens: ['COMMONS_VALIDATOR_VERSION':
project.'commons-validator.version'])
+ }
+ }
+
+ into('conf') {
+ from('release/conf')
+ }
}
-task distTcServer(type: Zip, dependsOn: [':extensions:geode-modules:assemble',
':extensions:geode-modules-tomcat7:assemble',
':extensions:geode-modules-tomcat8:assemble'] ) {
- configure(configureTcServerAssembly)
+task distTcServer(type: Zip, dependsOn: [':extensions:geode-modules:assemble',
':extensions:geode-modules-tomcat7:assemble',
':extensions:geode-modules-tomcat8:assemble']) {
+ configure(configureTcServerAssembly)
}
task distTcServer30(type: Zip, dependsOn:
[':extensions:geode-modules:assemble',
':extensions:geode-modules-tomcat7:assemble',
':extensions:geode-modules-tomcat8:assemble']) {
- configure(configureTcServerAssembly)
- configure(configureTcServer30Assembly)
+ configure(configureTcServerAssembly)
+ configure(configureTcServer30Assembly)
}
dependencies {
slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
- moduleDistOutputs distTcServer.outputs.files
- moduleDistOutputs distTcServer30.outputs.files
- moduleDistOutputs distAppServer.outputs.files
- moduleDistOutputs distTomcat.outputs.files
+ moduleDistOutputs distTcServer.outputs.files
+ moduleDistOutputs distTcServer30.outputs.files
+ moduleDistOutputs distAppServer.outputs.files
+ moduleDistOutputs distTomcat.outputs.files
}
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
+ archives distTcServer
+ archives distTcServer30
+ archives distAppServer
+ archives distTomcat
}
--
To stop receiving notification emails like this one, please contact
u...@apache.org.
