Skip to content

Commit 0631edd

Browse files
Allows invoker tests to work with verify instead of install (#285)
Same as openzipkin/brave#1471 Signed-off-by: Adrian Cole <adrian@tetrate.io>
1 parent 94e01d9 commit 0631edd

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

build-bin/test

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44
#
55
# See [README.md] for an explanation of this and how CI should use it.
66

7-
# We use install, not verify, because maven-invoker-tests need modules in this
8-
# project installed into the local repository before tests run.
9-
./mvnw -T1C install -nsu "$@"
7+
./mvnw -T1C verify -nsu "$@"

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
<maven-help-plugin.version>3.5.1</maven-help-plugin.version>
8686
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
8787
<maven-invoker-plugin.version>3.9.1</maven-invoker-plugin.version>
88+
<!-- default is runtime, but test-scoped reactor deps like in
89+
spring_context need to be in the invoker local repo to resolve -->
90+
<invoker.install.scope>test</invoker.install.scope>
8891
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
8992
<maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
9093
<maven-release-plugin.version>3.3.1</maven-release-plugin.version>

spring-beans/pom.xml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,6 @@
3232
<log4j1.version>1.2.17</log4j1.version>
3333
</properties>
3434

35-
<dependencyManagement>
36-
<dependencies>
37-
<dependency>
38-
<groupId>${project.groupId}</groupId>
39-
<artifactId>zipkin-reporter-bom</artifactId>
40-
<version>${project.version}</version>
41-
<type>pom</type>
42-
<scope>import</scope>
43-
</dependency>
44-
</dependencies>
45-
</dependencyManagement>
46-
4735
<dependencies>
4836
<dependency>
4937
<groupId>${project.groupId}</groupId>
@@ -65,36 +53,43 @@
6553
<dependency>
6654
<groupId>${project.groupId}</groupId>
6755
<artifactId>zipkin-sender-libthrift</artifactId>
56+
<version>${project.version}</version>
6857
<scope>provided</scope>
6958
</dependency>
7059
<dependency>
7160
<groupId>${project.groupId}</groupId>
7261
<artifactId>zipkin-sender-okhttp3</artifactId>
62+
<version>${project.version}</version>
7363
<scope>provided</scope>
7464
</dependency>
7565
<dependency>
7666
<groupId>${project.groupId}</groupId>
7767
<artifactId>zipkin-sender-urlconnection</artifactId>
68+
<version>${project.version}</version>
7869
<scope>provided</scope>
7970
</dependency>
8071
<dependency>
8172
<groupId>${project.groupId}</groupId>
8273
<artifactId>zipkin-sender-kafka</artifactId>
74+
<version>${project.version}</version>
8375
<scope>provided</scope>
8476
</dependency>
8577
<dependency>
8678
<groupId>${project.groupId}</groupId>
8779
<artifactId>zipkin-sender-amqp-client</artifactId>
80+
<version>${project.version}</version>
8881
<scope>provided</scope>
8982
</dependency>
9083
<dependency>
9184
<groupId>${project.groupId}</groupId>
9285
<artifactId>zipkin-sender-activemq-client</artifactId>
86+
<version>${project.version}</version>
9387
<scope>provided</scope>
9488
</dependency>
9589
<dependency>
9690
<groupId>${project.groupId}</groupId>
9791
<artifactId>zipkin-reporter-brave</artifactId>
92+
<version>${project.version}</version>
9893
<scope>provided</scope>
9994
</dependency>
10095
<dependency>
@@ -120,6 +115,7 @@
120115
<dependency>
121116
<groupId>${project.groupId}</groupId>
122117
<artifactId>zipkin-sender-pulsar-client</artifactId>
118+
<version>${project.version}</version>
123119
<scope>provided</scope>
124120
</dependency>
125121
</dependencies>

src/it/settings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
<url>@localRepositoryUrl@</url>
1919
<releases>
2020
<enabled>true</enabled>
21+
<updatePolicy>always</updatePolicy>
2122
</releases>
2223
<snapshots>
2324
<enabled>true</enabled>
25+
<updatePolicy>always</updatePolicy>
2426
</snapshots>
2527
</repository>
2628
</repositories>
@@ -30,9 +32,11 @@
3032
<url>@localRepositoryUrl@</url>
3133
<releases>
3234
<enabled>true</enabled>
35+
<updatePolicy>always</updatePolicy>
3336
</releases>
3437
<snapshots>
3538
<enabled>true</enabled>
39+
<updatePolicy>always</updatePolicy>
3640
</snapshots>
3741
</pluginRepository>
3842
</pluginRepositories>

0 commit comments

Comments
 (0)