AMBARI-25349: Move Ambari metrics to guava 28.0-jre (#85)
diff --git a/ambari-logsearch-assembly/pom.xml b/ambari-logsearch-assembly/pom.xml
index 21cb491..a600e72 100644
--- a/ambari-logsearch-assembly/pom.xml
+++ b/ambari-logsearch-assembly/pom.xml
@@ -58,7 +58,7 @@
<artifactId>rpm-maven-plugin</artifactId>
<version>2.1.4</version>
<configuration>
- <copyright>2012, Apache Software Foundation</copyright>
+ <license>2012, Apache Software Foundation</license>
<group>Development</group>
<description>Maven Recipe: RPM Package.</description>
<autoRequires>false</autoRequires>
diff --git a/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch-logfeeder/pom.xml
index 791cb67..98c2a68 100644
--- a/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch-logfeeder/pom.xml
@@ -124,7 +124,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>27.0-jre</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index de32f1f..9d57628 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,6 +180,11 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.20</version>
</plugin>
+ <plugin>
+ <groupId>org.vafer</groupId>
+ <artifactId>jdeb</artifactId>
+ <version>1.8</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -221,7 +226,7 @@
</execution>
</executions>
<configuration>
- <copyright>2012, Apache Software Foundation</copyright>
+ <license>2012, Apache Software Foundation</license>
<group>Development</group>
<description>Maven Recipe: RPM Package.</description>
<release>${package-release}</release>
@@ -232,7 +237,6 @@
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
- <version>1.4</version>
<executions>
<execution>
<!--Stub execution on direct plugin call - workaround for ambari deb build process-->
@@ -458,6 +462,11 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>28.0-jre</version>
+ </dependency>
</dependencies>
</dependencyManagement>
