geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [6/6] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-805
Date Mon, 01 Feb 2016 18:08:09 GMT
Merge remote-tracking branch 'origin/develop' into feature/GEODE-805


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/122e10f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/122e10f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/122e10f0

Branch: refs/heads/feature/GEODE-805
Commit: 122e10f0a47510dec530859d282afd149a6af4b9
Parents: 4f0d877 d22176b
Author: Kirk Lund <klund@pivotal.io>
Authored: Mon Feb 1 09:34:06 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Mon Feb 1 09:34:06 2016 -0800

----------------------------------------------------------------------
 build.gradle                                    | 529 +------------------
 gemfire-assembly/build.gradle                   |   8 +-
 .../membership/gms/fd/GMSHealthMonitor.java     |   3 +-
 .../internal/tcpserver/TcpClient.java           |  15 +-
 .../internal/tcpserver/TcpServer.java           |  17 +-
 .../internal/cache/AbstractRegionMap.java       | 133 +----
 .../region/entry/RegionEntryFactoryBuilder.java | 103 ++++
 .../RegionEntryFactoryBuilderJUnitTest.java     |  85 +++
 gemfire-site/website/layouts/footer.html        |   2 +-
 gradle/code-analysis.gradle                     | 113 ++++
 gradle/ide.gradle                               |  53 ++
 gradle/java.gradle                              | 108 ++++
 gradle/publish.gradle                           |  83 +++
 gradle/rat.gradle                               |   4 +
 gradle/test.gradle                              | 243 +++++++++
 15 files changed, 825 insertions(+), 674 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/122e10f0/gradle/java.gradle
----------------------------------------------------------------------
diff --cc gradle/java.gradle
index 0000000,3ec105d..d166fca
mode 000000,100644..100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@@ -1,0 -1,106 +1,108 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one or more
+  * contributor license agreements.  See the NOTICE file distributed with
+  * this work for additional information regarding copyright ownership.
+  * The ASF licenses this file to You under the Apache License, Version 2.0
+  * (the "License"); you may not use this file except in compliance with
+  * the License.  You may obtain a copy of the License at
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ subprojects {
+   apply plugin: 'java'
+   
+   // apply compiler options
+   gradle.taskGraph.whenReady( { graph ->
+     tasks.withType(JavaCompile).each { javac ->
+       javac.configure {
+         sourceCompatibility '1.8'
+         targetCompatibility '1.8'
+         options.encoding = 'UTF-8'
+       }
+     }
+   })
+   
+   // apply default manifest
+   gradle.taskGraph.whenReady( { graph ->
+     tasks.withType(Jar).each { jar ->
+       jar.doFirst {
+         manifest {
+           attributes(
+             "Manifest-Version"  : "1.0",
+             "Created-By"        : System.getProperty("user.name"),
+             "Title"             : rootProject.name,
+             "Version"           : version,
+             "Organization"      : "Apache Software Foundation (ASF)"
+           )
+         }
+       }
+     }
+   })
+ 
+   configurations {
+     provided {
+       description 'a dependency that is provided externally at runtime'
+       visible true
+     }
+     
+     testOutput {
+       extendsFrom testCompile
+       description  'a dependency that exposes test artifacts'
+     }
+   }
+ 
+   // Here we want to disable all transitive dependencies on external artifacts.  This
+   // allows us to lock down library versions.  However, we want project dependencies to
+   // be transitive such that the libraries of a dependent project are automatically included.
+   configurations.all {
+     dependencies.all { dep ->
+       if (dep instanceof ModuleDependency && !(dep instanceof ProjectDependency))
{
+         dep.transitive = false
+       }
+     }
+   }
+  
+   task jarTest (type: Jar, dependsOn: testClasses) {
+     description 'Assembles a jar archive of test classes.'
+     from sourceSets.test.output
+     classifier 'test'
+   }
+ 
+   artifacts {
+     testOutput jarTest
+   }
+ 
+   sourceSets {
+     main.compileClasspath += configurations.provided
+     main.runtimeClasspath -= configurations.provided
+     test.compileClasspath += configurations.provided
+     test.runtimeClasspath += configurations.provided
+   }
+ 
+   javadoc.classpath += configurations.provided
+ 
+   javadoc {
+     options.addStringOption('Xdoclint:none', '-quiet')
+     options.encoding='UTF-8'
+   }
+ 
+   dependencies {
+     compile 'org.springframework:spring-aop:' + project.'springframework.version'
+     compile 'org.springframework:spring-beans:' + project.'springframework.version'
+     compile 'org.springframework:spring-context:' + project.'springframework.version'
+     compile 'org.springframework:spring-context-support:' + project.'springframework.version'
+     compile 'org.springframework:spring-core:' + project.'springframework.version'
+     compile 'org.springframework:spring-expression:' + project.'springframework.version'
+     compile 'org.springframework:spring-web:' + project.'springframework.version'
+     compile 'org.springframework:spring-webmvc:' + project.'springframework.version'
+     compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'
++    compile 'com.google.code.findbugs:jsr305:' + project.'jsr305.version'
++    compile 'javax.enterprise:cdi-api:' + project.'cdi-api.version'
+   }
+ }


Mime
View raw message