Skip to content

Commit ee4b95e

Browse files
aamotharaldslawekjaranowski
authored andcommitted
relocated JUnit5 classes to have no package name change when migrating to Maven 4
1 parent 2a603ae commit ee4b95e

File tree

11 files changed

+19
-14
lines changed

11 files changed

+19
-14
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.maven.plugin.testing.junit5;
19+
package org.apache.maven.api.plugin.testing;
2020

2121
import java.lang.annotation.Retention;
2222
import java.lang.annotation.RetentionPolicy;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.maven.plugin.testing.junit5;
19+
package org.apache.maven.api.plugin.testing;
2020

2121
import java.io.BufferedReader;
2222
import java.io.File;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.maven.plugin.testing.junit5;
19+
package org.apache.maven.api.plugin.testing;
2020

2121
import java.lang.annotation.Repeatable;
2222
import java.lang.annotation.Retention;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.maven.plugin.testing.junit5;
19+
package org.apache.maven.api.plugin.testing;
2020

2121
import java.lang.annotation.Retention;
2222
import java.lang.annotation.RetentionPolicy;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.maven.plugin.testing.junit5;
19+
package org.apache.maven.api.plugin.testing;
2020

2121
import java.lang.annotation.ElementType;
2222
import java.lang.annotation.Retention;

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.util.Properties;
3737

3838
import com.google.inject.Module;
39+
import org.apache.maven.api.plugin.testing.MojoTest;
3940
import org.apache.maven.artifact.Artifact;
4041
import org.apache.maven.artifact.DefaultArtifact;
4142
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
@@ -89,7 +90,7 @@
8990
* descriptor and make this entirely declarative!
9091
*
9192
* @deprected As of version 3.4.0, it is advised to work with JUnit5 tests which do not
92-
* use this class but {@link org.apache.maven.plugin.testing.junit5.MojoTest}
93+
* use this class but {@link MojoTest}
9394
* instead.
9495
*
9596
* @author jesse

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.InputStream;
2323
import java.util.Map;
2424

25+
import org.apache.maven.api.plugin.testing.MojoExtension;
2526
import org.apache.maven.execution.DefaultMavenExecutionRequest;
2627
import org.apache.maven.execution.MavenExecutionRequest;
2728
import org.apache.maven.execution.MavenSession;
@@ -53,7 +54,7 @@
5354
* {@link WithoutMojo} to prevent the rule from firing.
5455
*
5556
* @deprected As of version 3.4.0, it is advised to work with JUnit5 tests which do not
56-
* use rules but extensions {@link org.apache.maven.plugin.testing.junit5.MojoExtension}
57+
* use rules but extensions {@link MojoExtension}
5758
* instead.
5859
*
5960
* @author Mirko Friedenhagen

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/WithoutMojo.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.lang.annotation.Retention;
2323
import java.lang.annotation.Target;
2424

25+
import org.apache.maven.api.plugin.testing.MojoExtension;
26+
2527
import static java.lang.annotation.ElementType.METHOD;
2628
import static java.lang.annotation.RetentionPolicy.RUNTIME;
2729

@@ -30,7 +32,7 @@
3032
* An annotation for test methods that do not require the {@link MojoRule} to create and tear down the instance.
3133
*
3234
* @deprected As of version 3.4.0, it is advised to work with JUnit5 tests which do not
33-
* use rules but extensions {@link org.apache.maven.plugin.testing.junit5.MojoExtension}
35+
* use rules but extensions {@link MojoExtension}
3436
* instead.
3537
*
3638
* @author Mirko Friedenhagen

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/resources/TestResources.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Set;
2525
import java.util.TreeSet;
2626

27+
import org.apache.maven.api.plugin.testing.MojoExtension;
2728
import org.codehaus.plexus.util.DirectoryScanner;
2829
import org.codehaus.plexus.util.FileUtils;
2930
import org.junit.Assert;
@@ -35,7 +36,7 @@
3536
* Junit4 test {@link Rule} to extract and assert test resources.
3637
*
3738
* @deprected As of version 3.4.0, it is advised to work with JUnit5 tests which do not
38-
* use rules but extensions {@link org.apache.maven.plugin.testing.junit5.MojoExtension}
39+
* use rules but extensions {@link MojoExtension}
3940
* instead.
4041
*
4142
* @since 3.1.0

maven-plugin-testing-harness/src/test/java/org/apache/maven/plugin/testing/MojoTestCaseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.io.StringReader;
2222
import java.util.Map;
2323

24-
import org.apache.maven.plugin.testing.junit5.MojoTest;
24+
import org.apache.maven.api.plugin.testing.MojoTest;
2525
import org.codehaus.plexus.configuration.PlexusConfiguration;
2626
import org.codehaus.plexus.util.xml.Xpp3Dom;
2727
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;

0 commit comments

Comments
 (0)