This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new 7b21b06 AMBARI-25349: Move Ambari metrics to guava 28.0-jre (#49)
7b21b06 is described below
commit 7b21b06287fec81fb6d296911a58572ab56d2924
Author: lucasbak <lucas.bakal...@gmail.com>
AuthorDate: Mon Nov 14 02:43:07 2022 +0100
AMBARI-25349: Move Ambari metrics to guava 28.0-jre (#49)
---
ambari-metrics-assembly/pom.xml | 7 +-
ambari-metrics-common/pom.xml | 7 +-
ambari-metrics-flume-sink/pom.xml | 3 +-
ambari-metrics-grafana/pom.xml | 1 -
ambari-metrics-hadoop-sink/pom.xml | 3 +-
ambari-metrics-host-aggregator/pom.xml | 1 -
ambari-metrics-host-monitoring/pom.xml | 3 +-
ambari-metrics-kafka-sink/pom.xml | 3 +-
ambari-metrics-storm-sink/pom.xml | 3 +-
ambari-metrics-timelineservice/pom.xml | 5 +-
pom.xml | 376 ++++++++++++++++-----------------
11 files changed, 201 insertions(+), 211 deletions(-)
diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
index ab94d19..89d0e39 100644
--- a/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics-assembly/pom.xml
@@ -199,7 +199,7 @@
<configuration>
<group>Development</group>
<needarch>x86_64</needarch>
- <copyright>2012, Apache Software Foundation</copyright>
+ <license>2012, Apache Software Foundation</license>
<version>${package-version}</version>
<release>${package-release}</release>
@@ -219,7 +219,7 @@
</goals>
<configuration>
<name>ambari-metrics-collector</name>
- <copyright>2012, Apache Software Foundation</copyright>
+ <license>2012, Apache Software Foundation</license>
<group>Development</group>
<description>Maven Recipe: RPM Package.</description>
<autoRequires>false</autoRequires>
@@ -379,7 +379,7 @@
<configuration>
<name>ambari-metrics-hadoop-sink</name>
- <copyright>2012, Apache Software Foundation</copyright>
+ <license>2012, Apache Software Foundation</license>
<group>Development</group>
<description>Maven Recipe: RPM Package.</description>
@@ -685,7 +685,6 @@
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
- <version>1.0.1</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/ambari-metrics-common/pom.xml b/ambari-metrics-common/pom.xml
index 7bfe53f..b79d2be 100644
--- a/ambari-metrics-common/pom.xml
+++ b/ambari-metrics-common/pom.xml
@@ -31,12 +31,11 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
@@ -57,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1</version>
<executions>
<!-- Run shade goal on package phase -->
<execution>
@@ -162,7 +161,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>28.0-jre</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/ambari-metrics-flume-sink/pom.xml
b/ambari-metrics-flume-sink/pom.xml
index 7b4f4fa..a6b81bb 100644
--- a/ambari-metrics-flume-sink/pom.xml
+++ b/ambari-metrics-flume-sink/pom.xml
@@ -54,7 +54,7 @@ limitations under the License.
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -97,7 +97,6 @@ limitations under the License.
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
diff --git a/ambari-metrics-grafana/pom.xml b/ambari-metrics-grafana/pom.xml
index 266a245..927868f 100644
--- a/ambari-metrics-grafana/pom.xml
+++ b/ambari-metrics-grafana/pom.xml
@@ -36,7 +36,6 @@
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
diff --git a/ambari-metrics-hadoop-sink/pom.xml
b/ambari-metrics-hadoop-sink/pom.xml
index 97d573a..7249ea0 100644
--- a/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics-hadoop-sink/pom.xml
@@ -60,7 +60,7 @@ limitations under the License.
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -103,7 +103,6 @@ limitations under the License.
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
diff --git a/ambari-metrics-host-aggregator/pom.xml
b/ambari-metrics-host-aggregator/pom.xml
index 8c6cf26..a824dd0 100644
--- a/ambari-metrics-host-aggregator/pom.xml
+++ b/ambari-metrics-host-aggregator/pom.xml
@@ -125,7 +125,6 @@
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
diff --git a/ambari-metrics-host-monitoring/pom.xml
b/ambari-metrics-host-monitoring/pom.xml
index e97e91e..69677b2 100644
--- a/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics-host-monitoring/pom.xml
@@ -83,7 +83,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -135,7 +135,6 @@
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
diff --git a/ambari-metrics-kafka-sink/pom.xml
b/ambari-metrics-kafka-sink/pom.xml
index 46afed3..b81127b 100644
--- a/ambari-metrics-kafka-sink/pom.xml
+++ b/ambari-metrics-kafka-sink/pom.xml
@@ -72,7 +72,7 @@ limitations under the License.
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -115,7 +115,6 @@ limitations under the License.
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
diff --git a/ambari-metrics-storm-sink/pom.xml
b/ambari-metrics-storm-sink/pom.xml
index 9e11539..e309817 100644
--- a/ambari-metrics-storm-sink/pom.xml
+++ b/ambari-metrics-storm-sink/pom.xml
@@ -38,7 +38,7 @@ limitations under the License.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -133,7 +133,6 @@ limitations under the License.
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
diff --git a/ambari-metrics-timelineservice/pom.xml
b/ambari-metrics-timelineservice/pom.xml
index 172063b..996df5b 100644
--- a/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics-timelineservice/pom.xml
@@ -88,7 +88,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -105,7 +105,7 @@
</executions>
<configuration>
<name>ambari-metrics-collector</name>
- <copyright>2012, Apache Software Foundation</copyright>
+ <license>2012, Apache Software Foundation</license>
<group>Development</group>
<description>Maven Recipe: RPM Package.</description>
<autoRequires>false</autoRequires>
@@ -273,7 +273,6 @@
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
diff --git a/pom.xml b/pom.xml
index 51d6c2c..6cf4278 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,198 +121,198 @@
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>28.0-jre</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <phase>validate</phase>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- <execution>
- <id>regex-property</id>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>ambariVersion</name>
- <value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- <execution>
- <id>parse-package-version</id>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>package-version</name>
- <value>${project.version}</value>
- <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
- <replacement>$1.$2.$3.$4</replacement>
- <failIfNoMatch>true</failIfNoMatch>
- </configuration>
- </execution>
- <execution>
- <id>parse-package-release</id>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>package-release</name>
- <value>${project.version}</value>
- <regex>
-
^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
- </regex>
- <replacement>$7</replacement>
- <failIfNoMatch>true</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assemblies/empty.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>build-tarball</id>
- <phase>none</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19</version>
- <configuration>
- <skip>${skipSurefireTests}</skip>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.vafer</groupId>
+ <artifactId>jdeb</artifactId>
+ <version>1.8</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>regex-property</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>ambariVersion</name>
+ <value>${project.version}</value>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3.$4</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ <execution>
+ <id>parse-package-version</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>package-version</name>
+ <value>${project.version}</value>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3.$4</replacement>
+ <failIfNoMatch>true</failIfNoMatch>
+ </configuration>
+ </execution>
+ <execution>
+ <id>parse-package-release</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>package-release</name>
+ <value>${project.version}</value>
+ <regex>
+
^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
+ </regex>
+ <replacement>$7</replacement>
+ <failIfNoMatch>true</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+
<descriptor>../ambari-project/src/main/assemblies/empty.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build-tarball</id>
+ <phase>none</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19</version>
+ <configuration>
+ <skip>${skipSurefireTests}</skip>
- <!-- Each profile in the top-level pom.xml defines which test group
categories to run. -->
- <groups>${testcase.groups}</groups>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <followSymlinks>false</followSymlinks>
- <includes>
- <include>**/*.pyc</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <!--Stub execution on direct plugin call - workaround for ambari rpm
build process-->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.0.1</version>
- <executions>
- <execution>
- <id>stub-execution</id>
- <!-- unbinds rpm creation from maven lifecycle -->
- <phase>none</phase>
- <goals>
- <goal>attached-rpm</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <copyright>2012, Apache Software Foundation</copyright>
- <group>Development</group>
- <description>Maven Recipe: RPM Package.</description>
- <release>${package-release}</release>
- <version>${package-version}</version>
- <mappings/>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.vafer</groupId>
- <artifactId>jdeb</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
- <id>stub-execution</id>
- <phase>none</phase>
- <goals>
- <goal>jdeb</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <skip>true</skip>
- <attach>false</attach>
- <submodules>true</submodules>
-
<controlDir>${project.basedir}/src/main/package/deb/control</controlDir>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
- <configuration>
- <excludes>
- <exclude>pass.txt</exclude>
- <exclude>derby.log</exclude>
- <exclude>**/*.nuspec</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/out</exclude>
- <exclude>**/*.md</exclude>
- <exclude>**/.idea/</exclude>
- <exclude>**/.classpath/</exclude>
- <exclude>**/.project/</exclude>
- <exclude>**/.settings/</exclude>
- <exclude>.git/</exclude>
- <exclude>ambari-metrics-grafana/conf/unix/ams-grafana.ini</exclude>
- <exclude>target/**</exclude>
-
<exclude>ambari-metrics-host-monitoring/src/main/python/psutil/**</exclude>
-
<exclude>target/rpm/ambari-metrics/SPECS/ambari-metrics.spec</exclude>
-
<exclude>ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.pom</exclude>
-
<exclude>ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/maven-metadata-local.xml</exclude>
- <exclude>*/target/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <!-- Each profile in the top-level pom.xml defines which test
group categories to run. -->
+ <groups>${testcase.groups}</groups>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <followSymlinks>false</followSymlinks>
+ <includes>
+ <include>**/*.pyc</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!--Stub execution on direct plugin call - workaround for ambari rpm
build process-->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1.4</version>
+ <executions>
+ <execution>
+ <id>stub-execution</id>
+ <!-- unbinds rpm creation from maven lifecycle -->
+ <phase>none</phase>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <license>2012, Apache Software Foundation</license>
+ <group>Development</group>
+ <description>Maven Recipe: RPM Package.</description>
+ <release>${package-release}</release>
+ <version>${package-version}</version>
+ <mappings/>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.vafer</groupId>
+ <artifactId>jdeb</artifactId>
+ <executions>
+ <execution>
+ <!--Stub execution on direct plugin call - workaround for ambari
deb build process-->
+ <id>stub-execution</id>
+ <phase>none</phase>
+ <goals>
+ <goal>jdeb</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>true</skip>
+ <attach>false</attach>
+ <submodules>true</submodules>
+
<controlDir>${project.basedir}/src/main/package/deb/control</controlDir>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version>
+ <configuration>
+ <excludes>
+ <exclude>pass.txt</exclude>
+ <exclude>derby.log</exclude>
+ <exclude>**/*.nuspec</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/out</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<profiles>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
