Skip to content

Commit 969c307

Browse files
committed
Fix mockito and ci
1 parent 6a7d963 commit 969c307

6 files changed

Lines changed: 30 additions & 30 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
- name: Test
111111
run: ./mvnw verify -pl it/java8 -e --ntp -B
112112
- name: Maven Plugin Test
113-
working-directory: maven-plugin/it
113+
working-directory: build-tool-plugins/maven-plugin/it
114114
run: ./mvnw stype:gen -e -B
115115
- name: Gradle Plugin Test
116116
working-directory: build-tool-plugins/gradle-plugin/it

build-tool-plugins/exec/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,17 @@
4141
<scope>test</scope>
4242
</dependency>
4343
</dependencies>
44+
45+
<build>
46+
<plugins>
47+
<plugin>
48+
<artifactId>maven-surefire-plugin</artifactId>
49+
<configuration>
50+
<argLine>
51+
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
52+
</argLine>
53+
</configuration>
54+
</plugin>
55+
</plugins>
56+
</build>
4457
</project>

build-tool-plugins/maven-plugin/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@
8989
</dependencies>
9090
<build>
9191
<plugins>
92+
<plugin>
93+
<artifactId>maven-surefire-plugin</artifactId>
94+
<configuration>
95+
<argLine>
96+
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
97+
</argLine>
98+
</configuration>
99+
</plugin>
92100
<plugin>
93101
<artifactId>maven-clean-plugin</artifactId>
94102
<configuration>

it/java8/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818
<maven.compiler.testTarget>${java.version}</maven.compiler.testTarget>
1919
</properties>
2020

21-
<build>
22-
<plugins>
23-
<plugin>
24-
<artifactId>maven-surefire-plugin</artifactId>
25-
</plugin>
26-
</plugins>
27-
</build>
28-
2921
<profiles>
3022
<profile>
3123
<id>it-no-jpms</id>

pom.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -355,26 +355,5 @@
355355
</plugins>
356356
</build>
357357
</profile>
358-
<profile>
359-
<id>mockito-agent</id>
360-
<activation>
361-
<jdk>[17,)</jdk>
362-
</activation>
363-
<build>
364-
<pluginManagement>
365-
<plugins>
366-
<plugin>
367-
<artifactId>maven-surefire-plugin</artifactId>
368-
<version>3.2.5</version>
369-
<configuration>
370-
<argLine>
371-
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
372-
</argLine>
373-
</configuration>
374-
</plugin>
375-
</plugins>
376-
</pluginManagement>
377-
</build>
378-
</profile>
379358
</profiles>
380359
</project>

processor/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@
110110

111111
<build>
112112
<plugins>
113+
<plugin>
114+
<artifactId>maven-surefire-plugin</artifactId>
115+
<configuration>
116+
<argLine>
117+
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
118+
</argLine>
119+
</configuration>
120+
</plugin>
113121
<plugin>
114122
<groupId>org.codehaus.mojo</groupId>
115123
<artifactId>build-helper-maven-plugin</artifactId>

0 commit comments

Comments
 (0)