From commits-return-1388-archive-asf-public=cust-asf.ponee.io@zipkin.apache.org  Wed May 15 13:41:08 2019
Return-Path: <commits-return-1388-archive-asf-public=cust-asf.ponee.io@zipkin.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [207.244.88.153])
	by mx-eu-01.ponee.io (Postfix) with SMTP id BB1D4180621
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 15 May 2019 15:41:07 +0200 (CEST)
Received: (qmail 96181 invoked by uid 500); 15 May 2019 13:41:07 -0000
Mailing-List: contact commits-help@zipkin.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zipkin.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zipkin.apache.org>
List-Post: <mailto:commits@zipkin.apache.org>
List-Id: <commits.zipkin.apache.org>
Reply-To: dev@zipkin.apache.org
Delivered-To: mailing list commits@zipkin.apache.org
Received: (qmail 96172 invoked by uid 99); 15 May 2019 13:41:07 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 May 2019 13:41:07 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id 2F21B873AE; Wed, 15 May 2019 13:41:03 +0000 (UTC)
Date: Wed, 15 May 2019 13:41:03 +0000
To: "commits@zipkin.apache.org" <commits@zipkin.apache.org>
Subject: [incubator-zipkin] branch master updated: Removes spring boot
 dependency management as it subverted the versions we were using
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Message-ID: <155792766303.18057.2326535039318188295@gitbox.apache.org>
From: adriancole@apache.org
X-Git-Host: gitbox.apache.org
X-Git-Repo: incubator-zipkin
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1978b6b1cf061aaab1cf8191538d84738497cb55
X-Git-Newrev: 3876e5d63a5e691a65b7011e0dc59190494c8434
X-Git-Rev: 3876e5d63a5e691a65b7011e0dc59190494c8434
X-Git-NotificationType: ref_changed_plus_diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated

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 <acole@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>