Skip to content

Commit 0b6d39b

Browse files
Updates testing harness lib
1 parent 2dd7e75 commit 0b6d39b

File tree

4 files changed

+92
-463
lines changed

4 files changed

+92
-463
lines changed

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<plexus-archiver.version>4.10.0</plexus-archiver.version>
3939
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
4040
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
41-
<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
41+
<maven-plugin-testing-harness.version>4.0.0-beta-4</maven-plugin-testing-harness.version>
4242
<maven-shared-incremental.version>1.1</maven-shared-incremental.version>
4343
<slf4j-api.version>2.0.7</slf4j-api.version>
4444
</properties>
@@ -56,11 +56,11 @@
5656
</excludes>
5757
</configuration>
5858
</plugin>
59-
<plugin>
59+
<!--<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-failsafe-plugin</artifactId>
6262
<dependencies>
63-
<!-- let JUnit vintage engine run JUnit 3 or JUnit 4 tests -->
63+
&lt;!&ndash; let JUnit vintage engine run JUnit 3 or JUnit 4 tests &ndash;&gt;
6464
<dependency>
6565
<groupId>org.junit.jupiter</groupId>
6666
<artifactId>junit-jupiter-engine</artifactId>
@@ -85,12 +85,12 @@
8585
<executions>
8686
<execution>
8787
<goals>
88-
<goal>integration-test</goal>
88+
&lt;!&ndash; <goal>integration-test</goal>&ndash;&gt;
8989
<goal>verify</goal>
9090
</goals>
9191
</execution>
9292
</executions>
93-
</plugin>
93+
</plugin>-->
9494
<plugin>
9595
<groupId>org.jacoco</groupId>
9696
<artifactId>jacoco-maven-plugin</artifactId>
@@ -330,6 +330,11 @@
330330
<artifactId>maven-filtering</artifactId>
331331
<version>${maven-filtering.version}</version>
332332
</dependency>
333+
<dependency>
334+
<groupId>org.codehaus.plexus</groupId>
335+
<artifactId>plexus-utils</artifactId>
336+
<version>4.0.2</version>
337+
</dependency>
333338

334339
<dependency>
335340
<groupId>ch.qos.logback</groupId>

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/AbstractMojoTest.java

Lines changed: 0 additions & 88 deletions
This file was deleted.

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/MavenContractsDownloaderTests.java

Lines changed: 82 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.HashMap;
2121

2222
import org.apache.maven.model.Dependency;
23-
import org.apache.maven.plugin.testing.SilentLog;
23+
import org.apache.maven.plugin.logging.Log;
2424
import org.apache.maven.project.MavenProject;
2525
import org.assertj.core.api.BDDAssertions;
2626
import org.junit.jupiter.api.Test;
@@ -74,8 +74,87 @@ void shouldNotReadFolderFromCacheWhenExecutedTwiceFor2DifferentArtifactsInTheSam
7474
}
7575

7676
private MavenContractsDownloader contractsDownloader(MavenProject mavenProject, Dependency one, File file) {
77-
return new MavenContractsDownloader(mavenProject, one, "", "", StubRunnerProperties.StubsMode.LOCAL,
78-
new SilentLog(), "", "", "", null, false, new HashMap<>(), false) {
77+
return new MavenContractsDownloader(mavenProject, one, "", "", StubRunnerProperties.StubsMode.LOCAL, new Log() {
78+
@Override
79+
public boolean isDebugEnabled() {
80+
return false;
81+
}
82+
83+
@Override
84+
public void debug(CharSequence charSequence) {
85+
86+
}
87+
88+
@Override
89+
public void debug(CharSequence charSequence, Throwable throwable) {
90+
91+
}
92+
93+
@Override
94+
public void debug(Throwable throwable) {
95+
96+
}
97+
98+
@Override
99+
public boolean isInfoEnabled() {
100+
return false;
101+
}
102+
103+
@Override
104+
public void info(CharSequence charSequence) {
105+
106+
}
107+
108+
@Override
109+
public void info(CharSequence charSequence, Throwable throwable) {
110+
111+
}
112+
113+
@Override
114+
public void info(Throwable throwable) {
115+
116+
}
117+
118+
@Override
119+
public boolean isWarnEnabled() {
120+
return false;
121+
}
122+
123+
@Override
124+
public void warn(CharSequence charSequence) {
125+
126+
}
127+
128+
@Override
129+
public void warn(CharSequence charSequence, Throwable throwable) {
130+
131+
}
132+
133+
@Override
134+
public void warn(Throwable throwable) {
135+
136+
}
137+
138+
@Override
139+
public boolean isErrorEnabled() {
140+
return false;
141+
}
142+
143+
@Override
144+
public void error(CharSequence charSequence) {
145+
146+
}
147+
148+
@Override
149+
public void error(CharSequence charSequence, Throwable throwable) {
150+
151+
}
152+
153+
@Override
154+
public void error(Throwable throwable) {
155+
156+
}
157+
}, "", "", "", null, false, new HashMap<>(), false) {
79158
@Override
80159
ContractDownloader contractDownloader() {
81160
return new ContractDownloader(null, null, null, null, null, null) {

0 commit comments

Comments
 (0)