Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions build-bin/test
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
#
# See [README.md] for an explanation of this and how CI should use it.

# We use install, not verify, because maven-invoker-tests need modules in this
# project installed into the local repository before tests run.
./mvnw -T1C install -nsu "$@"
./mvnw -T1C verify -nsu "$@"
3 changes: 3 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
<maven-help-plugin.version>3.5.1</maven-help-plugin.version>
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
<maven-invoker-plugin.version>3.9.1</maven-invoker-plugin.version>
<!-- default is runtime, but test-scoped reactor deps like in
spring_context need to be in the invoker local repo to resolve -->
<invoker.install.scope>test</invoker.install.scope>
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
<maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
<maven-release-plugin.version>3.3.1</maven-release-plugin.version>
Expand Down
20 changes: 8 additions & 12 deletions spring-beans/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@
<log4j1.version>1.2.17</log4j1.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-reporter-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -65,36 +53,43 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-sender-libthrift</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-sender-okhttp3</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-sender-urlconnection</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-sender-kafka</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-sender-amqp-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-sender-activemq-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-reporter-brave</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -120,6 +115,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-sender-pulsar-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 4 additions & 0 deletions src/it/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
<url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
Expand All @@ -30,9 +32,11 @@
<url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
Expand Down
Loading