diff --git a/basiclti/basiclti-common/pom.xml b/basiclti/basiclti-common/pom.xml index 68e0b55e33ff..4053c5537acb 100644 --- a/basiclti/basiclti-common/pom.xml +++ b/basiclti/basiclti-common/pom.xml @@ -78,13 +78,6 @@ javax.servlet servlet-api - - junit - junit - 4.5 - jar - test - diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml index 6b516e0765fe..fcada1951581 100644 --- a/basiclti/basiclti-impl/pom.xml +++ b/basiclti/basiclti-impl/pom.xml @@ -77,22 +77,6 @@ org.quartz-scheduler quartz - - - junit - junit - 4.5 - jar - test - - @@ -114,16 +98,6 @@ org.apache.maven.plugins maven-surefire-plugin - diff --git a/basiclti/pom.xml b/basiclti/pom.xml index cb6a43a519ea..26854b26e9de 100644 --- a/basiclti/pom.xml +++ b/basiclti/pom.xml @@ -167,13 +167,6 @@ profile2-api ${project.version} - - junit - junit - 4.5 - jar - test - diff --git a/basiclti/tsugi-util/pom-tsugi.xml b/basiclti/tsugi-util/pom-tsugi.xml index 623e9d9a3c2d..1a88abb6edc9 100644 --- a/basiclti/tsugi-util/pom-tsugi.xml +++ b/basiclti/tsugi-util/pom-tsugi.xml @@ -64,13 +64,6 @@ org.sakaiproject.kernel sakai-component-manager - - junit - junit - 4.5 - jar - test - diff --git a/basiclti/tsugi-util/pom.xml b/basiclti/tsugi-util/pom.xml index 3837065f3a57..dbdeb4d5494a 100644 --- a/basiclti/tsugi-util/pom.xml +++ b/basiclti/tsugi-util/pom.xml @@ -48,13 +48,6 @@ org.sakaiproject.kernel sakai-component-manager - - junit - junit - 4.5 - jar - test - diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml index f531d4a83910..7e6efd0b7527 100644 --- a/calendar/calendar-impl/impl/pom.xml +++ b/calendar/calendar-impl/impl/pom.xml @@ -110,12 +110,6 @@ net.sf.ehcache ehcache-core - - junit - junit - 4.9 - test - diff --git a/cloud-content/impl/pom.xml b/cloud-content/impl/pom.xml index 72a8aed44c40..9185f73d665b 100644 --- a/cloud-content/impl/pom.xml +++ b/cloud-content/impl/pom.xml @@ -65,14 +65,6 @@ aws-s3 ${jclouds.version} - - - - junit - junit - 4.10 - test - diff --git a/common/import-parsers/blackboard_5-5/pom.xml b/common/import-parsers/blackboard_5-5/pom.xml index 0d34feac90b0..685eddaa83ad 100644 --- a/common/import-parsers/blackboard_5-5/pom.xml +++ b/common/import-parsers/blackboard_5-5/pom.xml @@ -23,39 +23,21 @@ org.sakaiproject.common import-impl - - org.sakaiproject.common archive-api - - - - junit - junit - 3.8.1 - - jaxen jaxen 1.0-FCS-full - saxpath saxpath 1.0-FCS - @@ -69,6 +51,4 @@ - - diff --git a/common/import-parsers/blackboard_6/impl/pom.xml b/common/import-parsers/blackboard_6/impl/pom.xml index da275f924d29..b4f69bc90ba1 100644 --- a/common/import-parsers/blackboard_6/impl/pom.xml +++ b/common/import-parsers/blackboard_6/impl/pom.xml @@ -24,30 +24,10 @@ org.sakaiproject.common import-impl - org.sakaiproject.common archive-api - - org.sakaiproject.kernel sakai-kernel-util @@ -70,18 +50,11 @@ jaxen 1.0-FCS-full - saxpath saxpath 1.0-FCS - - - junit - junit - 3.8.1 - @@ -95,6 +68,4 @@ - - diff --git a/common/import-parsers/common-cartridge/pom.xml b/common/import-parsers/common-cartridge/pom.xml index eb40b0cdcd3c..1f67fed6134a 100644 --- a/common/import-parsers/common-cartridge/pom.xml +++ b/common/import-parsers/common-cartridge/pom.xml @@ -4,7 +4,7 @@ common org.sakaiproject.common - 12-SNAPSHOT + 12-SNAPSHOT ../../pom.xml Sakai Import Common Cartridge @@ -28,11 +28,6 @@ org.sakaiproject.common archive-api - - junit - junit - 3.8.1 - jaxen jaxen @@ -54,6 +49,7 @@ + src/test/java diff --git a/common/import-parsers/common-cartridge/src/java/org/sakaiproject/importer/impl/CommonCartridgeTest.java b/common/import-parsers/common-cartridge/src/test/java/org/sakaiproject/importer/impl/CommonCartridgeTest.java similarity index 78% rename from common/import-parsers/common-cartridge/src/java/org/sakaiproject/importer/impl/CommonCartridgeTest.java rename to common/import-parsers/common-cartridge/src/test/java/org/sakaiproject/importer/impl/CommonCartridgeTest.java index 05d8452c0abb..d86c25401496 100644 --- a/common/import-parsers/common-cartridge/src/java/org/sakaiproject/importer/impl/CommonCartridgeTest.java +++ b/common/import-parsers/common-cartridge/src/test/java/org/sakaiproject/importer/impl/CommonCartridgeTest.java @@ -28,35 +28,39 @@ import java.util.Collection; import java.util.Iterator; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; import org.sakaiproject.importer.api.ImportDataSource; import org.sakaiproject.importer.api.ImportFileParser; import org.sakaiproject.importer.impl.importables.Assessment; import org.sakaiproject.importer.impl.importables.HtmlDocument; -import junit.framework.TestCase; +public class CommonCartridgeTest { + private static ImportFileParser parser = null; + private InputStream archiveStream = null; -public class CommonCartridgeTest extends TestCase { - private static ImportFileParser parser; - private InputStream archiveStream; - + @Before public void setUp() { - System.out.println("doing setUp()"); try { parser = new CommonCartridgeFileParser(); - FileInputStream archiveStream = new FileInputStream(new File("/Users/zach/psychology.zip")); -// archiveData = new byte[archiveStream.available()]; -// archiveStream.read(archiveData,0,archiveStream.available()); -// archiveStream.close(); + FileInputStream archiveStream = new FileInputStream(new File("psychology.zip")); } catch (IOException e) { - + e.printStackTrace(); } } + + @Ignore + @Test public void testIsValidArchive() { - assertTrue(parser.isValidArchive(archiveStream)); + Assert.assertTrue(parser.isValidArchive(archiveStream)); } - + + @Ignore + @Test public void testCanGetQti() { - ImportDataSource ids = parser.parse(archiveStream, "/Users/zach/Desktop/psychology"); + ImportDataSource ids = parser.parse(archiveStream, "psychology"); Collection importables = ids.getItemsForCategories(ids.getItemCategories()); int numberOfAssessments = 0; int numberOfWebContent = 0; @@ -72,7 +76,7 @@ public void testCanGetQti() { System.out.println(importables.size() + " importables"); System.out.println(numberOfAssessments + " assessments"); System.out.println(numberOfWebContent + " webcontent"); - assertTrue("Why no assessments?", numberOfAssessments > 0); + Assert.assertTrue("Why no assessments?", numberOfAssessments > 0); } } diff --git a/common/import-parsers/sakai-archive/pom.xml b/common/import-parsers/sakai-archive/pom.xml index c0b613c3dacf..48d48121464d 100644 --- a/common/import-parsers/sakai-archive/pom.xml +++ b/common/import-parsers/sakai-archive/pom.xml @@ -28,12 +28,6 @@ org.sakaiproject.common archive-api - - junit - junit - 3.8.1 - - @@ -45,6 +39,7 @@ + src/test/java diff --git a/common/import-parsers/sakai-archive/src/java/org/sakaiproject/importer/impl/SakaiArchiveTest.java b/common/import-parsers/sakai-archive/src/test/java/org/sakaiproject/importer/impl/SakaiArchiveTest.java similarity index 68% rename from common/import-parsers/sakai-archive/src/java/org/sakaiproject/importer/impl/SakaiArchiveTest.java rename to common/import-parsers/sakai-archive/src/test/java/org/sakaiproject/importer/impl/SakaiArchiveTest.java index 5a9e749afc1a..0b9a8e766ddd 100644 --- a/common/import-parsers/sakai-archive/src/java/org/sakaiproject/importer/impl/SakaiArchiveTest.java +++ b/common/import-parsers/sakai-archive/src/test/java/org/sakaiproject/importer/impl/SakaiArchiveTest.java @@ -21,41 +21,40 @@ package org.sakaiproject.importer.impl; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.sakaiproject.importer.api.ImportDataSource; +import org.sakaiproject.importer.api.ImportFileParser; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -import org.sakaiproject.importer.api.ImportDataSource; -import org.sakaiproject.importer.api.ImportFileParser; -import org.sakaiproject.importer.api.Importable; -import org.sakaiproject.importer.impl.importables.FileResource; -import org.sakaiproject.importer.impl.importables.Folder; -import junit.framework.TestCase; +public class SakaiArchiveTest { + private static ImportFileParser parser = null; + private FileInputStream archiveStream = null; -public class SakaiArchiveTest extends TestCase { - private static ImportFileParser parser; - //private byte[] archiveData; - private FileInputStream archiveStream; - + @Before public void setUp() throws IOException { - System.out.println("doing setUp()"); parser = new SakaiArchiveFileParser(); - archiveStream = new FileInputStream(new File("/Users/zach/Downloads/sakai_course_export.zip")); + archiveStream = new FileInputStream(new File("sakai_course_export.zip")); } + + @Ignore + @Test public void testCanGetDataSource() { - ImportDataSource dataSource = (ImportDataSource) parser.parse(archiveStream, "/Users/zach/Desktop"); - assertNotNull(dataSource); + ImportDataSource dataSource = (ImportDataSource) parser.parse(archiveStream, "Desktop"); + Assert.assertNotNull(dataSource); System.out.println("There are " + dataSource.getItemCategories().size() + " categories in this archive."); ((SakaiArchiveDataSource)dataSource).buildSourceFolder(dataSource.getItemCategories()); } - + + @Ignore + @Test public void testArchiveIsValid() { - assertTrue(parser.isValidArchive(archiveStream)); + Assert.assertTrue(parser.isValidArchive(archiveStream)); } diff --git a/common/pom.xml b/common/pom.xml index 34587931f81a..c02c7b0c198c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -160,34 +160,4 @@ - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - http://download.oracle.com/javase/6/docs/api/ - - true - false - true - 168m - 1024m - -J-Xmx1024m -J-XX:MaxPermSize=128m - - org.sakaiproject.api.common.edu.person:org.sakaiproject.api.common.type - - - - true - org.apache.maven.plugins - maven-surefire-report-plugin - 2.11 - - - - diff --git a/common/privacy-integration-test/pom.xml b/common/privacy-integration-test/pom.xml index ea97e4b30aea..f347c2b59a8d 100644 --- a/common/privacy-integration-test/pom.xml +++ b/common/privacy-integration-test/pom.xml @@ -20,15 +20,6 @@ org.sakaiproject.common sakai-privacy-hbm - - org.sakaiproject.kernel - test-harness - - - junit - junit - 3.8.1 - diff --git a/content-review/impl/turnitin/pom.xml b/content-review/impl/turnitin/pom.xml index fe5c3f6825d6..2efee7dad739 100644 --- a/content-review/impl/turnitin/pom.xml +++ b/content-review/impl/turnitin/pom.xml @@ -81,10 +81,6 @@ commons-io - - junit - junit - easymock easymock diff --git a/content-review/impl/vericite/pom.xml b/content-review/impl/vericite/pom.xml index 6339f12bd0a2..6205d1e789e7 100644 --- a/content-review/impl/vericite/pom.xml +++ b/content-review/impl/vericite/pom.xml @@ -17,7 +17,6 @@ 1.5.4 1.18 1.0.0 - 4.8.1 diff --git a/content/content-cleanup/content-cleanup-impl/pom.xml b/content/content-cleanup/content-cleanup-impl/pom.xml index 1f6ba43cabda..78da37ad7573 100644 --- a/content/content-cleanup/content-cleanup-impl/pom.xml +++ b/content/content-cleanup/content-cleanup-impl/pom.xml @@ -29,10 +29,5 @@ org.quartz-scheduler quartz - - junit - junit - test - diff --git a/content/content-metadata/impl/pom.xml b/content/content-metadata/impl/pom.xml index d148ec0480d3..bf64c2600153 100644 --- a/content/content-metadata/impl/pom.xml +++ b/content/content-metadata/impl/pom.xml @@ -42,11 +42,5 @@ commons-lang commons-lang - - junit - junit - 4.10 - test - diff --git a/edu-services/sections-service/sections-impl/integration-test/pom.xml b/edu-services/sections-service/sections-impl/integration-test/pom.xml index 89bb34506b28..6bd81359efa4 100644 --- a/edu-services/sections-service/sections-impl/integration-test/pom.xml +++ b/edu-services/sections-service/sections-impl/integration-test/pom.xml @@ -22,11 +22,6 @@ org.sakaiproject.kernel test-harness - - junit - junit - 3.8.1 - org.sakaiproject.edu-services.sections diff --git a/emailtemplateservice/pom.xml b/emailtemplateservice/pom.xml index fd13049bf004..ad3fdc163b43 100644 --- a/emailtemplateservice/pom.xml +++ b/emailtemplateservice/pom.xml @@ -61,33 +61,4 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - aggregate - - UTF-8 - - http://download.oracle.com/javase/6/docs/api/ - http://docs.oracle.com/javaee/5/api/ - http://junit.sourceforge.net/javadoc/ - - true - false - 512m - -J-Xmx512m -J-XX:MaxPermSize=160m - - - aggregate - - - - - - - diff --git a/entitybroker/core-providers/pom.xml b/entitybroker/core-providers/pom.xml index 4ca2a0c44969..f69b78963bcb 100644 --- a/entitybroker/core-providers/pom.xml +++ b/entitybroker/core-providers/pom.xml @@ -57,10 +57,6 @@ jackson-jaxrs-json-provider 2.1.0 - - junit - junit - org.mockito mockito-all diff --git a/entitybroker/impl/pom.xml b/entitybroker/impl/pom.xml index c38471e0e0c3..ffc4be6abf7e 100644 --- a/entitybroker/impl/pom.xml +++ b/entitybroker/impl/pom.xml @@ -77,10 +77,6 @@ jetty-servlet-tester test - - junit - junit - org.springframework spring-test diff --git a/entitybroker/rest/pom.xml b/entitybroker/rest/pom.xml index e7f71a2e9c71..d26d91c91dc7 100644 --- a/entitybroker/rest/pom.xml +++ b/entitybroker/rest/pom.xml @@ -64,10 +64,6 @@ jetty-servlet-tester test - - junit - junit - diff --git a/entitybroker/utils/pom.xml b/entitybroker/utils/pom.xml index c34070291987..f6db58a90481 100644 --- a/entitybroker/utils/pom.xml +++ b/entitybroker/utils/pom.xml @@ -62,11 +62,6 @@ javax.servlet servlet-api - - - junit - junit - diff --git a/external-calendaring-service/impl/pom.xml b/external-calendaring-service/impl/pom.xml index 7da8ab9cc47a..cbe4cddaef7e 100644 --- a/external-calendaring-service/impl/pom.xml +++ b/external-calendaring-service/impl/pom.xml @@ -72,10 +72,6 @@ - - junit - junit - org.springframework spring-test diff --git a/gradebookng/tool/pom.xml b/gradebookng/tool/pom.xml index dc8d4a714fb6..a762c5f05613 100644 --- a/gradebookng/tool/pom.xml +++ b/gradebookng/tool/pom.xml @@ -90,12 +90,6 @@ poi-ooxml 3.8 - - junit - junit - 4.11 - test - org.mockito mockito-all diff --git a/jobscheduler/scheduler-component-shared/pom.xml b/jobscheduler/scheduler-component-shared/pom.xml index 3ae7e08c4729..5650b2c7ca8e 100644 --- a/jobscheduler/scheduler-component-shared/pom.xml +++ b/jobscheduler/scheduler-component-shared/pom.xml @@ -45,12 +45,6 @@ org.sakaiproject.edu-services.course-management coursemanagement-api - - junit - junit - 4.7 - test - org.quartz-scheduler quartz diff --git a/login/login-tool/tool/pom.xml b/login/login-tool/tool/pom.xml index e25196f3ee2a..6546f6a15d1f 100644 --- a/login/login-tool/tool/pom.xml +++ b/login/login-tool/tool/pom.xml @@ -52,13 +52,6 @@ as the findbugs annotations aren't needed at runtime. --> provided - - junit - junit - 4.8.2 - jar - test - org.mockito mockito-all diff --git a/mailsender/api/pom.xml b/mailsender/api/pom.xml index 9b0c882c01e8..4e98eed08527 100644 --- a/mailsender/api/pom.xml +++ b/mailsender/api/pom.xml @@ -45,12 +45,6 @@ org.springframework spring-core - - junit - junit - 4.8.1 - test - org.mockito mockito-core diff --git a/mailsender/impl/pom.xml b/mailsender/impl/pom.xml index 356748eb235b..568c605a84a9 100644 --- a/mailsender/impl/pom.xml +++ b/mailsender/impl/pom.xml @@ -97,12 +97,6 @@ 1.2 test - - junit - junit - 4.8.1 - test - org.mockito mockito-core diff --git a/master/pom.xml b/master/pom.xml index 33a478d8b4dd..1a828c9b7362 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -1596,6 +1596,7 @@ junit junit 4.11 + test org.projectlombok diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml index 357c0c40f569..f8331601c09c 100644 --- a/polls/impl/pom.xml +++ b/polls/impl/pom.xml @@ -86,10 +86,6 @@ h2.1.8 provided - - junit - junit - org.hibernate hibernate-core diff --git a/portal/portal-impl/impl/pom.xml b/portal/portal-impl/impl/pom.xml index 2830e505932f..12a5365568e9 100644 --- a/portal/portal-impl/impl/pom.xml +++ b/portal/portal-impl/impl/pom.xml @@ -96,12 +96,6 @@ test - - junit - junit - 4.8.1 - test - org.apache.velocity velocity diff --git a/portal/portal-render-engine-impl/impl/pom.xml b/portal/portal-render-engine-impl/impl/pom.xml index d5a95f3a9720..e6251064a27e 100644 --- a/portal/portal-render-engine-impl/impl/pom.xml +++ b/portal/portal-render-engine-impl/impl/pom.xml @@ -68,12 +68,6 @@ jtidy jtidy - - junit - junit - 3.8.1 - test - diff --git a/providers/cm-authz-provider/pom.xml b/providers/cm-authz-provider/pom.xml index e718db0848f6..dea6d9d3f156 100644 --- a/providers/cm-authz-provider/pom.xml +++ b/providers/cm-authz-provider/pom.xml @@ -34,12 +34,6 @@ 1.9.5 test - - junit - junit - 4.11 - test - diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml index 1669e27e3843..ff8f4ef47cba 100644 --- a/reset-pass/account-validator-impl/pom.xml +++ b/reset-pass/account-validator-impl/pom.xml @@ -148,11 +148,6 @@ 1.2_Java1.3 test - - junit - junit - 3.8.1 - commons-validator commons-validator diff --git a/reset-pass/account-validator-tool/pom.xml b/reset-pass/account-validator-tool/pom.xml index 9c397be5bd68..bd7eee6efcd7 100644 --- a/reset-pass/account-validator-tool/pom.xml +++ b/reset-pass/account-validator-tool/pom.xml @@ -80,12 +80,6 @@ ${project.version} war - - junit - junit - 3.8.1 - test - javax.servlet servlet-api diff --git a/rwiki/rwiki-util/radeox/pom.xml b/rwiki/rwiki-util/radeox/pom.xml index 830a368d8c0f..5cc9fdc30f23 100644 --- a/rwiki/rwiki-util/radeox/pom.xml +++ b/rwiki/rwiki-util/radeox/pom.xml @@ -28,20 +28,18 @@ false - - - src/tests - - - ${basedir}/src/bundle - - **/*.* - - false - - - + src/test/java + + + org.apache.maven.plugins + maven-surefire-plugin + + + + true + + + @@ -52,12 +50,6 @@ org.sakaiproject.kernel sakai-kernel-api - - junit - junit - 3.8.1 - compile - org.sakaiproject sakai-rwiki-api diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/AllTests.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/AllTests.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/AllTests.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/AllTests.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/BaseRenderEngineTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/BaseRenderEngineTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/BaseRenderEngineTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/BaseRenderEngineTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/PerformanceTests.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/PerformanceTests.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/PerformanceTests.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/PerformanceTests.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/RegexpTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/RegexpTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/RegexpTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/RegexpTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/RenderEnginePerformanceTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/RenderEnginePerformanceTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/RenderEnginePerformanceTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/RenderEnginePerformanceTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/AllFilterTests.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/AllFilterTests.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/AllFilterTests.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/AllFilterTests.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/BasicRegexTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/BasicRegexTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/BasicRegexTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/BasicRegexTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/BoldFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/BoldFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/BoldFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/BoldFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/EscapeFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/EscapeFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/EscapeFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/EscapeFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/FilterPipeTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/FilterPipeTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/FilterPipeTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/FilterPipeTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/FilterTestSupport.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/FilterTestSupport.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/FilterTestSupport.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/FilterTestSupport.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/HeadingFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/HeadingFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/HeadingFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/HeadingFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/HtmlRemoveFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/HtmlRemoveFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/HtmlRemoveFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/HtmlRemoveFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/InterWikiTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/InterWikiTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/InterWikiTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/InterWikiTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/ItalicFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/ItalicFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/ItalicFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/ItalicFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/KeyFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/KeyFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/KeyFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/KeyFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/LineFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/LineFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/LineFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/LineFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/LinkTestFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/LinkTestFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/LinkTestFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/LinkTestFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/ListFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/ListFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/ListFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/ListFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/NewlineFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/NewlineFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/NewlineFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/NewlineFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/ParagraphFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/ParagraphFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/ParagraphFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/ParagraphFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/ParamFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/ParamFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/ParamFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/ParamFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/SmileyFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/SmileyFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/SmileyFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/SmileyFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/StrikeThroughFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/StrikeThroughFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/StrikeThroughFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/StrikeThroughFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/TypographyFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/TypographyFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/TypographyFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/TypographyFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/UrlFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/UrlFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/UrlFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/UrlFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/WikiLinkFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/WikiLinkFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/WikiLinkFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/WikiLinkFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/XHTMLFilterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/XHTMLFilterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/XHTMLFilterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/XHTMLFilterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/balance/BalanceTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/balance/BalanceTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/balance/BalanceTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/balance/BalanceTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/balance/SAK12828.html b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/balance/SAK12828.html similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/balance/SAK12828.html rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/balance/SAK12828.html diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockInterWikiRenderEngine.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockInterWikiRenderEngine.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockInterWikiRenderEngine.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockInterWikiRenderEngine.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockOldWikiRenderEngine.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockOldWikiRenderEngine.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockOldWikiRenderEngine.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockOldWikiRenderEngine.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockReplacedFilter.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockReplacedFilter.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockReplacedFilter.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockReplacedFilter.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockReplacesFilter.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockReplacesFilter.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockReplacesFilter.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockReplacesFilter.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockWikiRenderEngine.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockWikiRenderEngine.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/mock/MockWikiRenderEngine.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/filter/mock/MockWikiRenderEngine.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/groovy/AllGroovyTests.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/groovy/AllGroovyTests.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/groovy/AllGroovyTests.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/groovy/AllGroovyTests.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/groovy/RadeoxTemplateEngineTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/groovy/RadeoxTemplateEngineTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/groovy/RadeoxTemplateEngineTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/groovy/RadeoxTemplateEngineTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/AllMacroTests.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/AllMacroTests.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/AllMacroTests.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/AllMacroTests.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/ApiDocMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/ApiDocMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/ApiDocMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/ApiDocMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/ApiMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/ApiMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/ApiMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/ApiMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/AsinMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/AsinMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/AsinMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/AsinMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/FilePathMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/FilePathMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/FilePathMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/FilePathMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/IsbnMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/IsbnMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/IsbnMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/IsbnMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/LinkMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/LinkMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/LinkMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/LinkMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/MacroTestSupport.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/MacroTestSupport.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/MacroTestSupport.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/MacroTestSupport.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/MailToMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/MailToMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/MailToMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/MailToMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/ParamMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/ParamMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/ParamMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/ParamMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/RfcMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/RfcMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/RfcMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/RfcMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/TableMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/TableMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/TableMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/TableMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/XrefMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/XrefMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/XrefMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/XrefMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/YipeeTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/YipeeTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/YipeeTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/YipeeTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/code/AllCodeMacroTests.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/code/AllCodeMacroTests.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/code/AllCodeMacroTests.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/code/AllCodeMacroTests.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/code/XmlCodeMacroTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/code/XmlCodeMacroTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/code/XmlCodeMacroTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/code/XmlCodeMacroTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/AllListTests.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/AllListTests.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/AllListTests.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/AllListTests.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/AtoZListFormatterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/AtoZListFormatterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/AtoZListFormatterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/AtoZListFormatterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/ExampleListFormatterTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/ExampleListFormatterTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/ExampleListFormatterTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/ExampleListFormatterTest.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/ListFormatterSupport.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/ListFormatterSupport.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/ListFormatterSupport.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/ListFormatterSupport.java diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/SimpleListTest.java b/rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/SimpleListTest.java similarity index 100% rename from rwiki/rwiki-util/radeox/src/java/org/radeox/test/macro/list/SimpleListTest.java rename to rwiki/rwiki-util/radeox/src/test/java/org/radeox/test/macro/list/SimpleListTest.java diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml index cf3b535bdc80..7556680a8942 100644 --- a/samigo/samigo-app/pom.xml +++ b/samigo/samigo-app/pom.xml @@ -246,11 +246,6 @@ spring-context test - - junit - junit - 3.8.2 - joda-time joda-time diff --git a/search/elasticsearch/impl/pom.xml b/search/elasticsearch/impl/pom.xml index 8221271f432b..120ceff4a8e0 100644 --- a/search/elasticsearch/impl/pom.xml +++ b/search/elasticsearch/impl/pom.xml @@ -68,10 +68,6 @@ org.mockito mockito-core - - junit - junit - javax.servlet servlet-api diff --git a/search/search-tool/tool/pom.xml b/search/search-tool/tool/pom.xml index 53533447c995..80605e2ba1c4 100644 --- a/search/search-tool/tool/pom.xml +++ b/search/search-tool/tool/pom.xml @@ -94,13 +94,6 @@ commons-collections jar - - junit - junit - 3.8.1 - jar - test - jmock jmock diff --git a/signup/impl/pom.xml b/signup/impl/pom.xml index 45a97f76cfe5..3c71516044cb 100644 --- a/signup/impl/pom.xml +++ b/signup/impl/pom.xml @@ -115,14 +115,7 @@ backport-util-concurrent backport-util-concurrent - - - junit - junit - 4.11 - test - org.mockito mockito-core diff --git a/signup/tool/pom.xml b/signup/tool/pom.xml index 04002d9870b8..97cb7883412d 100644 --- a/signup/tool/pom.xml +++ b/signup/tool/pom.xml @@ -52,10 +52,10 @@ org.sakaiproject.jsf jsf-app - - org.sakaiproject.portal - sakai-portal-util - + + org.sakaiproject.portal + sakai-portal-util + org.sakaiproject.jsf @@ -123,7 +123,7 @@ javax.servlet.jsp jsp-api - + commons-validator @@ -158,13 +158,7 @@ backport-util-concurrent backport-util-concurrent - - - junit - junit - test - org.mockito mockito-core @@ -195,4 +189,4 @@ - + diff --git a/site-manage/site-manage-util/util/pom.xml b/site-manage/site-manage-util/util/pom.xml index 1ab3a1ab3104..9c4976bf499c 100644 --- a/site-manage/site-manage-util/util/pom.xml +++ b/site-manage/site-manage-util/util/pom.xml @@ -44,11 +44,6 @@ commons-lang commons-lang - - junit - junit - 4.11 - diff --git a/sitestats/sitestats-impl/pom.xml b/sitestats/sitestats-impl/pom.xml index cfd48da8ebfe..88ff2f69a5a1 100644 --- a/sitestats/sitestats-impl/pom.xml +++ b/sitestats/sitestats-impl/pom.xml @@ -170,12 +170,6 @@ mysql-connector-java test - - junit - junit - - 4.11 - diff --git a/webservices/cxf/pom.xml b/webservices/cxf/pom.xml index f1117d8b6c06..73a730ea8d0a 100644 --- a/webservices/cxf/pom.xml +++ b/webservices/cxf/pom.xml @@ -157,11 +157,6 @@ 2.6 test - - junit - junit - test - org.mockito mockito-core