Skip to content

Commit 73d4bf6

Browse files
committed
Remove the dead JUnit 4 build configuration and stale references
The four junit:junit exclusions no longer exclude anything: wagon-provider-test stopped declaring junit, and stripping all four leaves junit:junit absent from every resolved tree. Do not restore them with the managed version.
1 parent b557bda commit 73d4bf6

9 files changed

Lines changed: 8 additions & 36 deletions

File tree

pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,6 @@ under the License.
189189
<artifactId>wagon-ssh-common</artifactId>
190190
<version>${project.version}</version>
191191
</dependency>
192-
<dependency>
193-
<groupId>junit</groupId>
194-
<artifactId>junit</artifactId>
195-
<version>4.13.2</version>
196-
</dependency>
197192
<dependency>
198193
<groupId>org.codehaus.plexus</groupId>
199194
<artifactId>plexus-testing</artifactId>
@@ -205,7 +200,7 @@ under the License.
205200
<version>1.5.1</version>
206201
</dependency>
207202
<!--
208-
| The Plexus shim: org.eclipse.sisu.plexus supplies PlexusContainer and PlexusTestCase,
203+
| The Plexus shim: org.eclipse.sisu.plexus supplies PlexusContainer,
209204
| and understands both META-INF/plexus/components.xml and JSR-330 @Named beans.
210205
| Its version is managed by maven-parent. Guice is "provided" in the sisu POM,
211206
| so it has to be declared here explicitly.

src/site/markdown/developer-guide.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,20 +225,21 @@ for the largest example of this in the project.
225225

226226
`wagon-provider-test` contains abstract test cases that exercise a provider through
227227
the public API against a real endpoint that you set up. It is a `compile`-scope
228-
artifact that drags in JUnit 3-style `PlexusTestCase`, Mockito and Jetty; the
228+
artifact that drags in JUnit 5, `plexus-testing`, Mockito and Jetty; the
229229
`wagon-providers` parent POM already declares it at `test` scope for every provider
230230
module.
231231

232232
### `WagonTestCase`
233233

234-
`WagonTestCase extends PlexusTestCase`. Two abstract methods:
234+
`WagonTestCase` is annotated `@PlexusTest` and implements `PlexusTestConfiguration`,
235+
which is what gives it a container. Two abstract methods:
235236

236237
```java
237238
protected abstract String getProtocol(); // the role hint, e.g. "file"
238239
protected abstract String getTestRepositoryUrl(); // where the tests should write
239240
```
240241

241-
`getWagon()` looks the provider up with `lookup(Wagon.ROLE, getProtocol())` and
242+
`getWagon()` looks the provider up with `container.lookup(Wagon.class, getProtocol())` and
242243
attaches an `observers.Debug` as both session and transfer listener, so a failing run
243244
prints a transcript.
244245

wagon-providers/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ under the License.
7878
<groupId>org.apache.maven.wagon</groupId>
7979
<artifactId>wagon-provider-test</artifactId>
8080
<scope>test</scope>
81-
<exclusions>
82-
<exclusion>
83-
<groupId>junit</groupId>
84-
<artifactId>junit</artifactId>
85-
</exclusion>
86-
</exclusions>
8781
</dependency>
8882
</dependencies>
8983
</project>

wagon-providers/wagon-http-lightweight/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ under the License.
4949
<artifactId>wagon-tck-http</artifactId>
5050
<version>${project.version}</version>
5151
<scope>test</scope>
52-
<exclusions>
53-
<exclusion>
54-
<groupId>junit</groupId>
55-
<artifactId>junit</artifactId>
56-
</exclusion>
57-
</exclusions>
5852
</dependency>
5953
<dependency>
6054
<groupId>org.codehaus.plexus</groupId>

wagon-providers/wagon-http/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ under the License.
108108
<artifactId>wagon-tck-http</artifactId>
109109
<version>${project.version}</version>
110110
<scope>test</scope>
111-
<exclusions>
112-
<exclusion>
113-
<groupId>junit</groupId>
114-
<artifactId>junit</artifactId>
115-
</exclusion>
116-
</exclusions>
117111
</dependency>
118112

119113
</dependencies>

wagon-providers/wagon-scm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ under the License.
4848
<exclusions>
4949
<!--
5050
| Drags in plexus-container-default 1.0-alpha-9, which collides with the Plexus shim
51-
| (two copies of PlexusContainer/PlexusTestCase on the test classpath).
51+
| (two copies of PlexusContainer on the test classpath).
5252
-->
5353
<exclusion>
5454
<groupId>org.codehaus.plexus</groupId>

wagon-providers/wagon-ssh-common-test/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ under the License.
6060
<dependency>
6161
<groupId>org.apache.maven.wagon</groupId>
6262
<artifactId>wagon-provider-test</artifactId>
63-
<exclusions>
64-
<exclusion>
65-
<groupId>junit</groupId>
66-
<artifactId>junit</artifactId>
67-
</exclusion>
68-
</exclusions>
6963
</dependency>
7064
<dependency>
7165
<groupId>org.apache.maven.wagon</groupId>

wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/TestPrompter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* {@code src/test/resources/META-INF/plexus/components.xml}.
2929
* <p>
3030
* {@code plexus-interactivity-api} stopped shipping a {@code META-INF/plexus/components.xml} in 1.3, so its
31-
* {@code DefaultPrompter} is invisible to the {@code plexus-container-default} that {@code PlexusTestCase} runs;
31+
* {@code DefaultPrompter} is invisible to the {@code plexus-container-default} the tests run;
3232
* without a replacement every {@code lookup( Wagon.ROLE, "scp" )} fails because {@code ConsoleInteractiveUserInfo}
3333
* and {@code PrompterUIKeyboardInteractive} both require one.
3434
* <p>

wagon-providers/wagon-ssh/src/test/resources/META-INF/plexus/components.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
plexus-interactivity-api dropped its own META-INF/plexus/components.xml in 1.3 and only ships a sisu index, so
2323
plexus-container-default cannot see DefaultPrompter (which in any case now takes its collaborators through a
2424
constructor, which plexus-container-default cannot satisfy). Maven itself runs on sisu and is unaffected; only
25-
the PlexusTestCase-based tests here need this descriptor.
25+
the tests here need this descriptor.
2626
-->
2727
<component-set>
2828
<components>

0 commit comments

Comments
 (0)