You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ad...@apache.org on 2019/05/15 13:41:03 UTC
[incubator-zipkin] branch master updated: Removes spring boot
dependency management as it subverted the versions we were using
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git
The following commit(s) were added to refs/heads/master by this push:
new 3876e5d Removes spring boot dependency management as it subverted the versions we were using
3876e5d is described below
commit 3876e5d63a5e691a65b7011e0dc59190494c8434
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Wed May 15 15:40:52 2019 +0200
Removes spring boot dependency management as it subverted the versions we were using
---
pom.xml | 16 ----------------
zipkin-server/pom.xml | 24 +++++++++++++++---------
2 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 33410a3..751a97b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -444,22 +444,6 @@
</plugin>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>${start-class}</mainClass>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index bb8f33f..be50a90 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -33,7 +33,6 @@
<main.basedir>${project.basedir}/..</main.basedir>
<main.java.version>1.8</main.java.version>
<main.signature.artifact>java18</main.signature.artifact>
- <start-class>zipkin.server.ZipkinServer</start-class>
<kotlin.version>1.3.31</kotlin.version>
<maven-invoker-plugin.version>3.2.0</maven-invoker-plugin.version>
<proto.generatedSourceDirectory>${project.build.directory}/generated-test-sources/wire</proto.generatedSourceDirectory>
@@ -42,14 +41,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <!-- Import dependency management from Spring Boot -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>com.linecorp.armeria</groupId>
<artifactId>armeria-bom</artifactId>
<version>${armeria.version}</version>
@@ -63,12 +54,14 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring-boot.version}</version>
</dependency>
<!-- Use log4j 2 instead of SLF4J to allow log4j 1.2 used by Kafka 0.8 to still work -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
+ <version>${spring-boot.version}</version>
</dependency>
<!-- More efficient, gRPC ready server with brave tracing built-in -->
@@ -93,11 +86,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
+ <version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
+ <version>${spring-boot.version}</version>
<optional>true</optional>
</dependency>
@@ -297,6 +292,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
+ <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
@@ -455,10 +451,20 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
+ <mainClass>zipkin.server.ZipkinServer</mainClass>
<classifier>exec</classifier>
<executable>true</executable>
</configuration>