geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prhomb...@apache.org
Subject [geode] branch develop updated: GEODE-5937: Made dependencies explicit in geode-protobuf modules. (#2722)
Date Mon, 05 Nov 2018 19:57:36 GMT
This is an automated email from the ASF dual-hosted git repository.

prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 7babb27  GEODE-5937: Made dependencies explicit in geode-protobuf modules. (#2722)
7babb27 is described below

commit 7babb27f3639d9ab170509fe6c51a1a193c31a7e
Author: Patrick Rhomberg <prhomberg@pivotal.io>
AuthorDate: Mon Nov 5 11:57:26 2018 -0800

    GEODE-5937: Made dependencies explicit in geode-protobuf modules. (#2722)
---
 geode-protobuf/build.gradle                        | 20 +++++++++++++++++-
 geode-protobuf/geode-protobuf-test/build.gradle    |  2 +-
 geode-protobuf/src/test/resources/expected-pom.xml | 24 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index a88de53..9981171 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -16,8 +16,9 @@
  */
 
 dependencies {
+  compile(project(':geode-common'))
+  compile(project(':geode-core'))
   compile(project(':geode-protobuf-messages'))
-  compileOnly(project(':geode-core'))
   testCompile(project(':geode-core'))
   testCompile(project(':geode-junit')) {
     exclude module: 'geode-core'
@@ -26,8 +27,25 @@ dependencies {
   integrationTestCompile(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
+  integrationTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile(project(':geode-protobuf:geode-protobuf-test'))
+  distributedTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   distributedTestCompile(project(':geode-protobuf:geode-protobuf-test'))
 
   compile('com.google.protobuf:protobuf-java:' + project.'protobuf-java.version')
+  compile('org.apache.logging.log4j:log4j-api:' + project.'log4j.version')
+  compile('org.apache.shiro:shiro-core:' + project.'shiro.version')
+
+  integrationTestCompile('com.github.stefanbirkner:system-rules:' + project.'system-rules.version')
{
+    exclude module: 'junit-dep'
+  }
+  integrationTestCompile('junit:junit:' + project.'junit.version')
+  integrationTestCompile('org.awaitility:awaitility:' + project.'awaitility.version')
+
+  distributedTestCompile('junit:junit:' + project.'junit.version')
+  distributedTestCompile('org.awaitility:awaitility:' + project.'awaitility.version')
 }
diff --git a/geode-protobuf/geode-protobuf-test/build.gradle b/geode-protobuf/geode-protobuf-test/build.gradle
old mode 100755
new mode 100644
index dbbf0bc..ea7b38e
--- a/geode-protobuf/geode-protobuf-test/build.gradle
+++ b/geode-protobuf/geode-protobuf-test/build.gradle
@@ -18,7 +18,7 @@
 
 dependencies {
   compile(project(':geode-common'))
-  compileOnly(project(':geode-core'))
+  compile(project(':geode-core'))
   compileOnly(project(':geode-protobuf'))
 
   compile('junit:junit:' + project.'junit.version')
diff --git a/geode-protobuf/src/test/resources/expected-pom.xml b/geode-protobuf/src/test/resources/expected-pom.xml
index 6a60525..9568ee9 100644
--- a/geode-protobuf/src/test/resources/expected-pom.xml
+++ b/geode-protobuf/src/test/resources/expected-pom.xml
@@ -36,12 +36,36 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>org.apache.shiro</groupId>
+      <artifactId>shiro-core</artifactId>
+      <version>1.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>2.11.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-protobuf-messages</artifactId>
       <version>1.8.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.geode</groupId>
+      <artifactId>geode-core</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geode</groupId>
+      <artifactId>geode-common</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
       <version>3.6.0</version>


Mime
View raw message