You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/03/18 21:44:21 UTC
[6/7] incubator-geode git commit: GEODE-27: Moving findbugs
annotations to geode-core
GEODE-27: Moving findbugs annotations to geode-core
These annotations should not be required to run geode. They are only
used by the findbugs tool. Moving them to the geode-core project to
remove the list of dependencies that we add to all projects.
Changing jsr-305.jar to provided because it's only there to avoid
javadoc warnings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/163046f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/163046f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/163046f2
Branch: refs/heads/develop
Commit: 163046f22a3d70699a930f33613161e87dd3e26a
Parents: db17e38
Author: Dan Smith <up...@apache.org>
Authored: Wed Mar 2 14:44:54 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Fri Mar 18 13:43:55 2016 -0700
----------------------------------------------------------------------
geode-assembly/build.gradle | 8 +++++---
geode-core/build.gradle | 3 +++
gradle/java.gradle | 5 -----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/163046f2/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 186590e..c393cd8 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -316,9 +316,11 @@ distributions {
from configurations.bundled
from project(":geode-core").configurations.archives.allArtifacts.files
- from project(":geode-core").webJar
- from project(":geode-core").raJar
- from project(":geode-core").jcaJar
+ //These tasks are included as closures (wrapped in {}) because gradle may evaluate
+ //this CopySpec before it evaluates the geode-core build file.
+ from { project(":geode-core").webJar }
+ from { project(":geode-core").raJar }
+ from { project(":geode-core").jcaJar }
from project(":geode-lucene").configurations.runtime
from project(":geode-lucene").configurations.archives.allArtifacts.files
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/163046f2/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 9aa008e..3f4a671 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -31,6 +31,7 @@ dependencies {
// Source Dependencies
// External
provided files("${System.getProperty('java.home')}/../lib/tools.jar")
+ compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'
compile 'org.jgroups:jgroups:3.6.7.Final'
compile 'antlr:antlr:' + project.'antlr.version'
compile 'com.fasterxml.jackson.core:jackson-databind:' + project.'jackson.version'
@@ -80,6 +81,8 @@ dependencies {
}
compile 'com.google.guava:guava:' + project.'guava.version'
+ //jsr305 is included only to prevent javadoc warnings about missing annotations in the guava jar
+ provided 'com.google.code.findbugs:jsr305:' + project.'jsr305.version'
compile 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version'
compile 'org.apache.logging.log4j:log4j-core:' + project.'log4j.version'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/163046f2/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 9f0ff25..85e18d8 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -92,11 +92,6 @@ subprojects {
options.addStringOption('Xdoclint:none', '-quiet')
options.encoding='UTF-8'
}
-
- dependencies {
- compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'
- compile 'com.google.code.findbugs:jsr305:' + project.'jsr305.version'
- }
}