Преглед изворни кода

Externalize powermock dependencies for reuse

Rob Winch пре 12 година
родитељ
комит
30780baf24
3 измењених фајлова са 11 додато и 12 уклоњено
  1. 1 6
      config/config.gradle
  2. 9 0
      gradle/javaprojects.gradle
  3. 1 6
      web/web.gradle

+ 1 - 6
config/config.gradle

@@ -35,12 +35,7 @@ dependencies {
                 "org.springframework:spring-tx:$springVersion",
                 'org.spockframework:spock-core:0.6-groovy-1.8',
                 "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-                "org.powermock:powermock-core:$powerMockVersion",
-                "org.powermock:powermock-api-support:$powerMockVersion",
-                "org.powermock:powermock-module-junit4-common:$powerMockVersion",
-                "org.powermock:powermock-module-junit4:$powerMockVersion",
-                "org.powermock:powermock-api-mockito:$powerMockVersion",
-                "org.powermock:powermock-reflect:$powerMockVersion"
+                powerMockDependencies
     testCompile('org.openid4java:openid4java-nodeps:0.9.6') {
        exclude group: 'com.google.code.guice', module: 'guice'
     }

+ 9 - 0
gradle/javaprojects.gradle

@@ -17,6 +17,15 @@ ext.logbackVersion = '0.9.29'
 ext.cglibVersion = '2.2'
 ext.powerMockVersion = '1.4.12'
 
+ext.powerMockDependencies = [
+    "org.powermock:powermock-core:$powerMockVersion",
+    "org.powermock:powermock-api-support:$powerMockVersion",
+    "org.powermock:powermock-module-junit4-common:$powerMockVersion",
+    "org.powermock:powermock-module-junit4:$powerMockVersion",
+    "org.powermock:powermock-api-mockito:$powerMockVersion",
+    "org.powermock:powermock-reflect:$powerMockVersion"
+]
+
 ext.bundlorProperties = [
     version: version,
     secRange: "[$version, 3.2.0)",

+ 1 - 6
web/web.gradle

@@ -15,12 +15,7 @@ dependencies {
                 'commons-codec:commons-codec:1.3',
                 "org.slf4j:jcl-over-slf4j:$slf4jVersion",
                 "org.springframework:spring-test:$springVersion",
-                "org.powermock:powermock-core:$powerMockVersion",
-                "org.powermock:powermock-api-support:$powerMockVersion",
-                "org.powermock:powermock-module-junit4-common:$powerMockVersion",
-                "org.powermock:powermock-module-junit4:$powerMockVersion",
-                "org.powermock:powermock-api-mockito:$powerMockVersion",
-                "org.powermock:powermock-reflect:$powerMockVersion"
+                powerMockDependencies
 
     testRuntime "hsqldb:hsqldb:$hsqlVersion"
 }