Merge pull request ReactiveX#266 from benjchristensen/junit-dep

benjchristensen · benjchristensen · commit e00cd997eb8b · 2013-05-07T15:06:11.000-07:00
change from junit to junit-dep
diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'osgi'
 dependencies {
     compile project(':rxjava-core')
     provided 'org.clojure:clojure:1.4.+'
-    provided 'junit:junit:4.10'
+    provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
     
     // clojure
diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'osgi'
 dependencies {
     compile project(':rxjava-core')
     groovy 'org.codehaus.groovy:groovy-all:2.+'
-    provided 'junit:junit:4.10'
+    provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }
 
diff --git a/language-adaptors/rxjava-jruby/build.gradle b/language-adaptors/rxjava-jruby/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'osgi'
 dependencies {
     compile project(':rxjava-core')
     provided 'org.jruby:jruby:1.6+'
-    provided 'junit:junit:4.10'
+    provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }
 
diff --git a/language-adaptors/rxjava-scala/build.gradle b/language-adaptors/rxjava-scala/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     provided 'org.scalatest:scalatest_2.10:1.9.1'
 
     compile project(':rxjava-core')
-    provided 'junit:junit:4.10'
+    provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 
     testCompile 'org.scalatest:scalatest_2.10:1.9.1'
diff --git a/rxjava-contrib/rxjava-swing/build.gradle b/rxjava-contrib/rxjava-swing/build.gradle
@@ -8,7 +8,7 @@ targetCompatibility = JavaVersion.VERSION_1_6
 
 dependencies {
     compile project(':rxjava-core')
-    provided 'junit:junit:4.10'
+    provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }
 
diff --git a/rxjava-core/build.gradle b/rxjava-core/build.gradle
@@ -8,7 +8,7 @@ targetCompatibility = JavaVersion.VERSION_1_6
 
 dependencies {
     compile 'org.slf4j:slf4j-api:1.7.0'
-    provided 'junit:junit:4.10'
+    provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ apply plugin: 'osgi'`
`7`	`7`	`dependencies {`
`8`	`8`	`compile project(':rxjava-core')`
`9`	`9`	`groovy 'org.codehaus.groovy:groovy-all:2.+'`
`10`		`- provided 'junit:junit:4.10'`
	`10`	`+ provided 'junit:junit-dep:4.10'`
`11`	`11`	`provided 'org.mockito:mockito-core:1.8.5'`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ apply plugin: 'osgi'`
`6`	`6`	`dependencies {`
`7`	`7`	`compile project(':rxjava-core')`
`8`	`8`	`provided 'org.jruby:jruby:1.6+'`
`9`		`- provided 'junit:junit:4.10'`
	`9`	`+ provided 'junit:junit-dep:4.10'`
`10`	`10`	`provided 'org.mockito:mockito-core:1.8.5'`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ targetCompatibility = JavaVersion.VERSION_1_6`
`8`	`8`
`9`	`9`	`dependencies {`
`10`	`10`	`compile project(':rxjava-core')`
`11`		`- provided 'junit:junit:4.10'`
	`11`	`+ provided 'junit:junit-dep:4.10'`
`12`	`12`	`provided 'org.mockito:mockito-core:1.8.5'`
`13`	`13`	`}`
`14`	`14`