replaced junit-dep dependency with junit because junit-dep doesn not …

…exist any more and junit dependency is now corrected and updated default junit version to 4.12
TNG · Jul 14, 2015 · 2859c7b · 2859c7b
1 parent 244dfb5
commit 2859c7b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,11 @@
 language: java
 
 script:
+  - ./gradlew build -PjunitVersion=4.8.2 -PskipFindBugs
+  - ./gradlew build -PjunitVersion=4.9   -PskipFindBugs
+  - ./gradlew build -PjunitVersion=4.10  -PskipFindBugs
+  - ./gradlew build -PjunitVersion=4.11  -PskipFindBugs
   - ./gradlew build
-  - ./gradlew build -PjunitVersion=4.9  -PskipFindBugs
-  - ./gradlew build -PjunitVersion=4.10 -PskipFindBugs
-  - ./gradlew build -PjunitVersion=4.11 -PskipFindBugs
   - mvn test
   - ant test
 

diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ ext {
     isBuildOnJenkins = System.env['BUILD_TAG']?.startsWith('jenkins-') ?: false
 }
 if (!hasProperty('junitVersion')) { // set default junit version if not set via command line
-    ext.junitVersion = '4.8.2'
+    ext.junitVersion = '4.12'
 }
 ext.skipFindBugs = hasProperty('skipFindBugs')
 println "Using junit version ${junitVersion} for current build (skipFindBugs = ${skipFindBugs})."
@@ -29,7 +29,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'junit', name: 'junit-dep', version: junitVersion
+    compile group: 'junit', name: 'junit', version: junitVersion
     compile group: 'com.google.code.findbugs', name: 'annotations', version: '2.0.1'
 
     testCompile group: 'org.codehaus.groovy', name: 'groovy', version: '2.0.8'
@@ -182,8 +182,8 @@ uploadArchives {
                     }
                 }
                 whenConfigured { pom ->
-                    pom.dependencies.find{ dep -> dep.groupId == 'junit' && dep.artifactId == 'junit-dep' }.with {
-                        version = '[4.8.2,4.11]'
+                    pom.dependencies.find{ dep -> dep.groupId == 'junit' && dep.artifactId == 'junit' }.with {
+                        version = '[4.8.2,4.12]'
                         scope = 'provided'
                     }
                     pom.dependencies.removeAll(pom.dependencies.findAll{ dep -> dep.scope in [ 'compile', 'test' ] })

diff --git a/build.xml b/build.xml
@@ -21,7 +21,7 @@
         <include name="**/asm-*.jar" />
         <include name="**/groovy-*.jar" />
         <include name="**/hamcrest-*.jar" />
-        <include name="**/junit-*.jar" />
+        <include name="**/junit-4.12.jar" />
     </fileset>
 
     <!-- Targets -->
@@ -40,7 +40,6 @@
     </target>
 
     <target name="test" depends="init, check-libs.fileset-is-not-empty">
-
         <delete dir="${test.reports.dir}" />
         <mkdir dir="${test.reports.dir}" />
 
@@ -67,7 +66,6 @@
             <!-- single test method -->
             <test name="com.tngtech.test.java.junit.dataprovider.DataProviderJavaAcceptanceTest"
                   methods="testIsStringLengthGreaterThanTwo" />
-
         </junit>
     </target>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.12</version>
             <scope>provided</scope>
         </dependency>