You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2015/12/07 18:06:31 UTC
[49/50] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-17
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/build.gradle
----------------------------------------------------------------------
diff --cc build.gradle
index 44be620,b5465b8..395d543
--- a/build.gradle
+++ b/build.gradle
@@@ -372,11 -407,13 +407,11 @@@ subprojects
}
maxHeapSize '768m'
- jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError', '-XX:MaxPermSize=256M', '-ea']
+ jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError', '-ea']
- systemProperties = [
- 'gemfire.DEFAULT_MAX_OPLOG_SIZE' : '10',
- 'gemfire.disallowMcastDefaults' : 'true',
- 'jline.terminal' : 'jline.UnsupportedTerminal',
- ]
+ systemProperty 'gemfire.DEFAULT_MAX_OPLOG_SIZE', '10'
+ systemProperty 'gemfire.disallowMcastDefaults', 'true'
+ systemProperty 'jline.terminal', 'jline.UnsupportedTerminal'
def eol = System.getProperty('line.separator')
def progress = new File(resultsDir, "$test.name-progress.txt")
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --cc gemfire-assembly/build.gradle
index c4d9581,8de6d4e..84d9209
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@@ -21,13 -21,13 +21,14 @@@ configurations
dependencies {
provided project(':gemfire-core')
+ archives project(':gemfire-common')
archives project(':gemfire-json')
archives project(':gemfire-joptsimple')
- archives project(':gemfire-jgroups')
archives project(':gemfire-core')
+ archives project(':gemfire-lucene')
archives project(':gemfire-web')
archives project(':gemfire-web-api')
+ archives project(':pulse')
testCompile project(path: ':gemfire-junit', configuration: 'testOutput')
testCompile project(path: ':gemfire-core', configuration: 'testOutput')
@@@ -183,9 -191,12 +192,12 @@@ distributions
}
from project(":gemfire-core").configurations.archives.allArtifacts.files
+ from project(":gemfire-lucene").configurations.runtime
+ from project(":gemfire-lucene").configurations.archives.allArtifacts.files
+
// include this jar
from project(":gemfire-web-api").jar.outputs.files.getFiles()
-
+
// dependency jars
from depsJar
from gfshDepsJar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------