GEODE-5931: Make dependencies explicit in geode-pulse, geode-pulse-te…

…st. (apache#2714)
b-xiang · Nov 8, 2018 · ff55509 · ff55509
1 parent 728eceb
commit ff55509
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 2 deletions.
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
@@ -17,6 +17,24 @@
 apply plugin: 'war'
 
 dependencies {
+  compile('org.springframework.security:spring-security-core:' + project.'spring-security.version')
+  compile('javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version')
+  compile('mx4j:mx4j:' + project.'mx4j.version') {
+    ext.optional = true 
+  }
+  compile('mx4j:mx4j-remote:' + project.'mx4j-remote.version') {
+    ext.optional = true
+  }
+  integrationTestCompile('junit:junit:' + project.'junit.version')
+  uiTestCompile('junit:junit:' + project.'junit.version')
+  integrationTestCompile('org.hamcrest:hamcrest-core:' + project.'hamcrest-all.version')
+  integrationTestCompile('org.hamcrest:hamcrest-library:' + project.'hamcrest-all.version')
+  integrationTestCompile('org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version')
+  uiTestCompile('org.apache.httpcomponents:httpcore:' + project.'httpcore.version')
+  uiTestCompile('org.seleniumhq.selenium:selenium-api:' + project.'selenium.version')
+  uiTestCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
+  uiTestCompile('org.apache.httpcomponents:httpclient:' + project.'httpclient.version')
+  uiTestCompile('org.seleniumhq.selenium:selenium-support:' + project.'selenium.version')
   compile('org.springframework:spring-beans:' + project.'springframework.version')
 
   // Needed to fully use log4j instead of commons-logging.

diff --git a/geode-pulse/geode-pulse-test/build.gradle b/geode-pulse/geode-pulse-test/build.gradle
@@ -17,8 +17,18 @@
 
 
 dependencies {
-  compileOnly(project(':geode-core'))
-  compileOnly(project(':geode-junit')) {
+  compile('org.awaitility:awaitility:' + project.'awaitility.version')
+  compile('junit:junit:' + project.'junit.version')
+  compile('org.eclipse.jetty:jetty-server:' + project.'jetty.version')
+  compile('commons-io:commons-io:' + project.'commons-io.version')
+  compile('commons-lang:commons-lang:' + project.'commons-lang.version')
+  compile('mx4j:mx4j:' + project.'mx4j.version')
+  compile('mx4j:mx4j-remote:' + project.'mx4j-remote.version') {
+    ext.optional = true
+  }
+
+  compile(project(':geode-core'))
+  compile(project(':geode-junit')) {
     exclude module: 'geode-core'
   }
   compileOnly(project(':geode-pulse'))

diff --git a/geode-pulse/src/test/resources/expected-pom.xml b/geode-pulse/src/test/resources/expected-pom.xml
@@ -35,6 +35,32 @@
     <url>https://github.com/apache/geode</url>
   </scm>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.2.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j</artifactId>
+      <version>3.0.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-remote</artifactId>
+      <version>3.0.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>