This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 628cd06 AMBARI-22968. Remove class duplications from Log Search / Log Feeder classpath. 628cd06 is described below commit 628cd06ebe421397622953cc79809232df0a0363 Author: Oliver Szabo <oleew...@gmail.com> AuthorDate: Mon Feb 12 23:20:44 2018 +0100 AMBARI-22968. Remove class duplications from Log Search / Log Feeder classpath. --- .../ambari-logsearch-logfeeder/pom.xml | 20 +++++++---- ambari-logsearch/ambari-logsearch-server/pom.xml | 40 ++++++++++++++++++---- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml index a70b713..72b5185 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml @@ -95,11 +95,6 @@ <version>1.9.13</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>18.0</version> @@ -207,6 +202,19 @@ <artifactId>spring-boot-configuration-processor</artifactId> <version>${spring-boot.version}</version> </dependency> + <!-- Exclude jars globally--> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>provided</scope> + </dependency> </dependencies> <build> <pluginManagement> @@ -257,7 +265,7 @@ <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>false</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> - <includeScope>compile</includeScope> + <includeScope>runtime</includeScope> </configuration> </execution> </executions> diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml b/ambari-logsearch/ambari-logsearch-server/pom.xml index 70306fd..92a2863 100755 --- a/ambari-logsearch/ambari-logsearch-server/pom.xml +++ b/ambari-logsearch/ambari-logsearch-server/pom.xml @@ -113,7 +113,7 @@ <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>false</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> - <includeScope>compile</includeScope> + <includeScope>runtime</includeScope> </configuration> </execution> </executions> @@ -379,6 +379,10 @@ <groupId>jdk.tools</groupId> <artifactId>jdk.tools</artifactId> </exclusion> + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -425,6 +429,10 @@ <artifactId>guava</artifactId> <groupId>com.google.guava</groupId> </exclusion> + <exclusion> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -499,11 +507,6 @@ <version>${jjwt.version}</version> </dependency> <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-bean-validation</artifactId> - <version>2.25</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> <version>1.55</version> @@ -518,5 +521,30 @@ <artifactId>ambari-logsearch-web</artifactId> <version>${project.version}</version> </dependency> + <!-- Exclude jars globally--> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + <version>${spring-boot.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-el</artifactId> + <version>8.5.16</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>provided</scope> + </dependency> </dependencies> </project> -- To stop receiving notification emails like this one, please contact oleew...@apache.org.