Extract dependency management to a bom (#7136)

CHANGES.md

@@ -5,7 +5,7 @@ Release Notes.
 8.7.0
 ------------------
 #### Project
-
+* Extract dependency management to a bom.
 
 #### Java Agent
 * Supports modifying span attributes in async mode.

oap-server-bom-es7/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm</artifactId>
+        <groupId>org.apache.skywalking</groupId>
+        <version>8.7.0-SNAPSHOT</version>
+    </parent>
+    <packaging>pom</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>oap-server-bom-es7</artifactId>
+
+    <properties>
+        <elasticsearch.version>7.10.2</elasticsearch.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-high-level-client</artifactId>
+                <version>${elasticsearch.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.skywalking</groupId>
+                <artifactId>oap-server-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>

oap-server/analyzer/meter-analyzer/pom.xml

@@ -44,8 +44,7 @@
         <dependency>
             <groupId>io.kubernetes</groupId>
             <artifactId>client-java</artifactId>
-            <version>${kubernetes.version}</version>
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

oap-server/oal-grammar/pom.xml

@@ -27,6 +27,10 @@
 
     <artifactId>oal-grammar</artifactId>
 
+    <properties>
+        <antlr.version>4.7.1</antlr.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.antlr</groupId>
@@ -51,4 +55,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml

@@ -26,6 +26,10 @@
 
     <artifactId>cluster-nacos-plugin</artifactId>
 
+    <properties>
+        <test.nacos.version>1.4.2</test.nacos.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
@@ -84,7 +88,7 @@
                             <imagePullPolicy>IfNotPresent</imagePullPolicy>
                             <images>
                                 <image>
-                                    <name>nacos/nacos-server:${nacos.version}</name>
+                                    <name>nacos/nacos-server:${test.nacos.version}</name>
                                     <alias>cluster-nacos-plugin-integration-test-nacos</alias>
                                     <run>
                                         <env>

oap-server/server-configuration/configuration-nacos/pom.xml

@@ -27,6 +27,10 @@
 
     <artifactId>configuration-nacos</artifactId>
 
+    <properties>
+        <test.nacos.version>1.4.2</test.nacos.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
@@ -60,7 +64,7 @@
                             <imagePullPolicy>IfNotPresent</imagePullPolicy>
                             <images>
                                 <image>
-                                    <name>nacos/nacos-server:${nacos.version}</name>
+                                    <name>nacos/nacos-server:${test.nacos.version}</name>
                                     <alias>nacos-dynamic-configuration-integration-test-nacos</alias>
                                     <run>
                                         <env>

oap-server/server-library/library-client/pom.xml

@@ -28,6 +28,10 @@
     <artifactId>library-client</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <test.elasticsearch.version>6.3.2</test.elasticsearch.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
@@ -89,7 +93,7 @@
                                 <configuration>
                                     <images>
                                         <image>
-                                            <name>elastic/elasticsearch:${elasticsearch.version}</name>
+                                            <name>elastic/elasticsearch:${test.elasticsearch.version}</name>
                                             <alias>elastic-client-integration-test</alias>
                                             <run>
                                                 <ports>

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml

@@ -62,7 +62,6 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>${protobuf-java-util.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- necessary for Java 9+ -->

oap-server/server-starter-es7/pom.xml

@@ -29,10 +29,6 @@
     <description>A backend starter specially for ElasticSearch 7 storage</description>
     <packaging>jar</packaging>
 
-    <properties>
-        <elasticsearch.version>7.10.2</elasticsearch.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
@@ -58,6 +54,18 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.skywalking</groupId>
+                <artifactId>oap-server-bom-es7</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <finalName>skywalking-oap</finalName>
         <plugins>

pom.xml

@@ -34,6 +34,8 @@
     <modules>
         <module>apm-commons</module>
         <module>apm-protocol</module>
+        <module>oap-server-bom</module>
+        <module>oap-server-bom-es7</module>
     </modules>
     <packaging>pom</packaging>