Rename Jupiter Migration Support to junit-jupiter-migrationsupport

Prior to this commit, the module was named: `junit-jupiter-migration-support` But the super package used was (and stays): `org.junit.jupiter.migrationsupport` To follow the same naming convention without moving the support classes into a different package, the module name now is: `junit-jupiter-migrationsupport`
junit-team · Jun 7, 2017 · a19e6ee · a19e6ee
1 parent 1d8c684
commit a19e6ee
Show file tree

Hide file tree

Showing 46 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ See also <http://repo1.maven.org/maven2/org/junit/> for releases and <https://os
 - **Artifact IDs**:
   - `junit-jupiter-api`
   - `junit-jupiter-engine`
-  - `junit-jupiter-migration-support`
+  - `junit-jupiter-migrationsupport`
   - `junit-jupiter-params`
 
 ### JUnit Vintage

diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ ext {
 	jupiterProjects = [
 		'junit-jupiter-api',
 		'junit-jupiter-engine',
-		'junit-jupiter-migration-support',
+		'junit-jupiter-migrationsupport',
 		'junit-jupiter-params'
 	]
 
@@ -73,7 +73,7 @@ ext {
 
 	cloverTestProjects = [
 		'junit-jupiter-engine',
-		'junit-jupiter-migration-support',
+		'junit-jupiter-migrationsupport',
 		'junit-jupiter-params',
 		'junit-vintage-engine',
 		'junit-platform-surefire-provider',

diff --git a/documentation/src/docs/asciidoc/overview.adoc b/documentation/src/docs/asciidoc/overview.adoc
@@ -94,7 +94,7 @@ Snapshot artifacts are deployed to Sonatype's {snapshot-repo}[snapshots reposito
     JUnit Jupiter test engine implementation, only required at runtime.
   `junit-jupiter-params`::
     Support for <<writing-tests-parameterized-tests,parameterized tests>> in JUnit Jupiter.
-  `junit-jupiter-migration-support`::
+  `junit-jupiter-migrationsupport`::
     Migration support from JUnit 4 to JUnit Jupiter,
     only required for running selected JUnit 4 rules.
 
@@ -121,7 +121,7 @@ package org.junit.jupiter {
     [junit-jupiter-api] as jupiter_api
     [junit-jupiter-engine] as jupiter_engine
     [junit-jupiter-params] as jupiter_params
-    [junit-jupiter-migration-support] as jupiter_migration_support
+    [junit-jupiter-migrationsupport] as jupiter_migration_support
 }
 
 package org.junit.vintage {

diff --git a/documentation/src/docs/asciidoc/release-notes-5.0.0-M5.adoc b/documentation/src/docs/asciidoc/release-notes-5.0.0-M5.adoc
@@ -21,7 +21,7 @@ is placed on the Java 9 module path.
 
 | `junit-jupiter-api-<VERSION>.jar`                 | `org.junit.jupiter.api`
 | `junit-jupiter-engine-<VERSION>.jar`              | `org.junit.jupiter.engine`
-| `junit-jupiter-migration-support-<VERSION>.jar`   | `org.junit.jupiter.migrationsupport`
+| `junit-jupiter-migrationsupport-<VERSION>.jar`    | `org.junit.jupiter.migrationsupport`
 | `junit-jupiter-params-<VERSION>.jar`              | `org.junit.jupiter.params`
 | `junit-platform-commons-<VERSION>.jar`            | `org.junit.platform.commons`
 | `junit-platform-console-<VERSION>.jar`            | `org.junit.platform.console`
@@ -91,6 +91,8 @@ is placed on the Java 9 module path.
 
 ===== Deprecations and Breaking Changes
 
+* The migration support module is now named `junit-jupiter-migrationsupport`, without
+  the dash `-` between `migration` and `support`.
 * In order to ensure the _composability_ of all supported extension APIs in JUnit
   Jupiter, several methods in existing APIs have been renamed.
 ** See <<release-notes-5.0.0-m5-migration-extension-api>> for details.

diff --git a/junit-jupiter-migration-support/LICENSE.md → junit-jupiter-migrationsupport/LICENSE.md b/junit-jupiter-migration-support/LICENSE.md → junit-jupiter-migrationsupport/LICENSE.md
diff --git a/junit-jupiter-migration-support/README.md → junit-jupiter-migrationsupport/README.md b/junit-jupiter-migration-support/README.md → junit-jupiter-migrationsupport/README.md
@@ -1,4 +1,4 @@
-# Module junit-jupiter-migration-support
+# Module junit-jupiter-migrationsupport
 
 This module provides support for JUnit 4 rules within JUnit Jupiter.
 Currently, this support is limited to subclasses of the ```org.junit.rules.Verifier```

diff --git a/...rt/junit-jupiter-migration-support.gradle → ...ort/junit-jupiter-migrationsupport.gradle b/...rt/junit-jupiter-migration-support.gradle → ...ort/junit-jupiter-migrationsupport.gradle
diff --git a/...upport/rules/AbstractTestRuleSupport.java → ...upport/rules/AbstractTestRuleSupport.java b/...upport/rules/AbstractTestRuleSupport.java → ...upport/rules/AbstractTestRuleSupport.java
diff --git a/...ort/rules/EnableRuleMigrationSupport.java → ...ort/rules/EnableRuleMigrationSupport.java b/...ort/rules/EnableRuleMigrationSupport.java → ...ort/rules/EnableRuleMigrationSupport.java
diff --git a/...pport/rules/ExpectedExceptionSupport.java → ...pport/rules/ExpectedExceptionSupport.java b/...pport/rules/ExpectedExceptionSupport.java → ...pport/rules/ExpectedExceptionSupport.java
diff --git a/...upport/rules/ExternalResourceSupport.java → ...upport/rules/ExternalResourceSupport.java b/...upport/rules/ExternalResourceSupport.java → ...upport/rules/ExternalResourceSupport.java
diff --git a/...onsupport/rules/TestRuleFieldSupport.java → ...onsupport/rules/TestRuleFieldSupport.java b/...onsupport/rules/TestRuleFieldSupport.java → ...onsupport/rules/TestRuleFieldSupport.java
diff --git a/...nsupport/rules/TestRuleMethodSupport.java → ...nsupport/rules/TestRuleMethodSupport.java b/...nsupport/rules/TestRuleMethodSupport.java → ...nsupport/rules/TestRuleMethodSupport.java
diff --git a/...grationsupport/rules/VerifierSupport.java → ...grationsupport/rules/VerifierSupport.java b/...grationsupport/rules/VerifierSupport.java → ...grationsupport/rules/VerifierSupport.java
diff --git a/...ules/adapter/AbstractTestRuleAdapter.java → ...ules/adapter/AbstractTestRuleAdapter.java b/...ules/adapter/AbstractTestRuleAdapter.java → ...ules/adapter/AbstractTestRuleAdapter.java
diff --git a/...les/adapter/ExpectedExceptionAdapter.java → ...les/adapter/ExpectedExceptionAdapter.java b/...les/adapter/ExpectedExceptionAdapter.java → ...les/adapter/ExpectedExceptionAdapter.java
diff --git a/...ules/adapter/ExternalResourceAdapter.java → ...ules/adapter/ExternalResourceAdapter.java b/...ules/adapter/ExternalResourceAdapter.java → ...ules/adapter/ExternalResourceAdapter.java
diff --git a/.../adapter/GenericBeforeAndAfterAdvice.java → .../adapter/GenericBeforeAndAfterAdvice.java b/.../adapter/GenericBeforeAndAfterAdvice.java → .../adapter/GenericBeforeAndAfterAdvice.java
diff --git a/...upport/rules/adapter/VerifierAdapter.java → ...upport/rules/adapter/VerifierAdapter.java b/...upport/rules/adapter/VerifierAdapter.java → ...upport/rules/adapter/VerifierAdapter.java
diff --git a/...onsupport/rules/adapter/package-info.java → ...onsupport/rules/adapter/package-info.java b/...onsupport/rules/adapter/package-info.java → ...onsupport/rules/adapter/package-info.java
diff --git a/...mber/AbstractTestRuleAnnotatedMember.java → ...mber/AbstractTestRuleAnnotatedMember.java b/...mber/AbstractTestRuleAnnotatedMember.java → ...mber/AbstractTestRuleAnnotatedMember.java
diff --git a/.../rules/member/TestRuleAnnotatedField.java → .../rules/member/TestRuleAnnotatedField.java b/.../rules/member/TestRuleAnnotatedField.java → .../rules/member/TestRuleAnnotatedField.java
diff --git a/...rules/member/TestRuleAnnotatedMember.java → ...rules/member/TestRuleAnnotatedMember.java b/...rules/member/TestRuleAnnotatedMember.java → ...rules/member/TestRuleAnnotatedMember.java
diff --git a/...ember/TestRuleAnnotatedMemberFactory.java → ...ember/TestRuleAnnotatedMemberFactory.java b/...ember/TestRuleAnnotatedMemberFactory.java → ...ember/TestRuleAnnotatedMemberFactory.java
diff --git a/...rules/member/TestRuleAnnotatedMethod.java → ...rules/member/TestRuleAnnotatedMethod.java b/...rules/member/TestRuleAnnotatedMethod.java → ...rules/member/TestRuleAnnotatedMethod.java
diff --git a/...ionsupport/rules/member/package-info.java → ...ionsupport/rules/member/package-info.java b/...ionsupport/rules/member/package-info.java → ...ionsupport/rules/member/package-info.java
diff --git a/.../migrationsupport/rules/package-info.java → .../migrationsupport/rules/package-info.java b/.../migrationsupport/rules/package-info.java → .../migrationsupport/rules/package-info.java
diff --git a/...ices/org.junit.platform.engine.TestEngine → ...ices/org.junit.platform.engine.TestEngine b/...ices/org.junit.platform.engine.TestEngine → ...ices/org.junit.platform.engine.TestEngine
diff --git a/...ort/JupiterMigrationSupportTestSuite.java → ...ort/JupiterMigrationSupportTestSuite.java b/...ort/JupiterMigrationSupportTestSuite.java → ...ort/JupiterMigrationSupportTestSuite.java
diff --git a/...t/rules/AbstractTestRuleAdapterTests.java → ...t/rules/AbstractTestRuleAdapterTests.java b/...t/rules/AbstractTestRuleAdapterTests.java → ...t/rules/AbstractTestRuleAdapterTests.java
diff --git a/...grationSupportWithBothRuleTypesTests.java → ...grationSupportWithBothRuleTypesTests.java b/...grationSupportWithBothRuleTypesTests.java → ...grationSupportWithBothRuleTypesTests.java
diff --git a/.../rules/ExpectedExceptionSupportTests.java → .../rules/ExpectedExceptionSupportTests.java b/.../rules/ExpectedExceptionSupportTests.java → .../rules/ExpectedExceptionSupportTests.java
diff --git a/...portForMixedMethodAndFieldRulesTests.java → ...portForMixedMethodAndFieldRulesTests.java b/...portForMixedMethodAndFieldRulesTests.java → ...portForMixedMethodAndFieldRulesTests.java
diff --git a/...rceSupportForMultipleFieldRulesTests.java → ...rceSupportForMultipleFieldRulesTests.java b/...rceSupportForMultipleFieldRulesTests.java → ...rceSupportForMultipleFieldRulesTests.java
diff --git a/...ceSupportForMultipleMethodRulesTests.java → ...ceSupportForMultipleMethodRulesTests.java b/...ceSupportForMultipleMethodRulesTests.java → ...ceSupportForMultipleMethodRulesTests.java
diff --git a/...eSupportForTemporaryFolderFieldTests.java → ...eSupportForTemporaryFolderFieldTests.java b/...eSupportForTemporaryFolderFieldTests.java → ...eSupportForTemporaryFolderFieldTests.java
diff --git a/...lResourceSupportWithInheritanceTests.java → ...lResourceSupportWithInheritanceTests.java b/...lResourceSupportWithInheritanceTests.java → ...lResourceSupportWithInheritanceTests.java
diff --git a/.../ExternalResourceWithoutAdapterTests.java → .../ExternalResourceWithoutAdapterTests.java b/.../ExternalResourceWithoutAdapterTests.java → .../ExternalResourceWithoutAdapterTests.java
diff --git a/...tionsupport/rules/FailAfterAllHelper.java → ...tionsupport/rules/FailAfterAllHelper.java b/...tionsupport/rules/FailAfterAllHelper.java → ...tionsupport/rules/FailAfterAllHelper.java
diff --git a/...BasedEnableRuleMigrationSupportTests.java → ...BasedEnableRuleMigrationSupportTests.java b/...BasedEnableRuleMigrationSupportTests.java → ...BasedEnableRuleMigrationSupportTests.java
diff --git a/...portForMixedMethodAndFieldRulesTests.java → ...portForMixedMethodAndFieldRulesTests.java b/...portForMixedMethodAndFieldRulesTests.java → ...portForMixedMethodAndFieldRulesTests.java
diff --git a/...WrongExtendWithForVerifierFieldTests.java → ...WrongExtendWithForVerifierFieldTests.java b/...WrongExtendWithForVerifierFieldTests.java → ...WrongExtendWithForVerifierFieldTests.java
diff --git a/...rongExtendWithForVerifierMethodTests.java → ...rongExtendWithForVerifierMethodTests.java b/...rongExtendWithForVerifierMethodTests.java → ...rongExtendWithForVerifierMethodTests.java
diff --git a/...upport/src/test/resources/log4j2-test.xml → ...upport/src/test/resources/log4j2-test.xml b/...upport/src/test/resources/log4j2-test.xml → ...upport/src/test/resources/log4j2-test.xml
diff --git a/platform-tests/src/test/java/org/junit/AutomaticModuleNameTests.java b/platform-tests/src/test/java/org/junit/AutomaticModuleNameTests.java
@@ -75,9 +75,6 @@ static Stream<String> moduleDirectoryNames() throws IOException {
 	@MethodSource("moduleDirectoryNames")
 	void automaticModuleName(String module) {
 		String expected = "org." + module.replace('-', '.');
-		if (module.equals("junit-jupiter-migration-support")) {
-			expected = "org.junit.jupiter.migrationsupport";
-		}
 		String jarName = module + "-" + version(module) + ".jar";
 		Path jarPath = Paths.get("..", module).resolve("build/libs").resolve(jarName).normalize();
 		try (JarFile jarFile = new JarFile(jarPath.toFile())) {

diff --git a/settings.gradle b/settings.gradle
@@ -3,7 +3,7 @@ rootProject.name = 'junit5'
 include 'documentation'
 include 'junit-jupiter-api'
 include 'junit-jupiter-engine'
-include 'junit-jupiter-migration-support'
+include 'junit-jupiter-migrationsupport'
 include 'junit-jupiter-params'
 include 'junit-platform-commons'
 include 'junit-platform-console'