You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/21 18:05:59 UTC
[03/13] ambari git commit: AMBARI-21158. Eliminate Maven warnings
AMBARI-21158. Eliminate Maven warnings
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/597d003d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/597d003d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/597d003d
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 597d003d43c9ab43cca381810462e0803962a4fa
Parents: 380fa69
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Wed May 31 15:56:18 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue Jun 20 08:47:21 2017 +0200
----------------------------------------------------------------------
ambari-funtest/pom.xml | 5 --
.../ambari-metrics-host-monitoring/pom.xml | 1 +
ambari-metrics/pom.xml | 71 +++++++--------
ambari-project/pom.xml | 23 ++++-
ambari-server/pom.xml | 95 ++++++++------------
ambari-web/pom.xml | 65 ++++++--------
6 files changed, 121 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/597d003d/ambari-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml
index 3738106..bb2068d 100644
--- a/ambari-funtest/pom.xml
+++ b/ambari-funtest/pom.xml
@@ -486,11 +486,6 @@
<version>9.3-1101-jdbc4</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>1.3.9</version>
http://git-wip-us.apache.org/repos/asf/ambari/blob/597d003d/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
index d6c1fab..e8f8556 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
+++ b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml
@@ -86,6 +86,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
<executions>
<execution>
<configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/597d003d/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index b585916..560ef11 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -118,11 +118,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
@@ -147,6 +142,34 @@
<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>
@@ -169,6 +192,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19</version>
<configuration>
<skip>${skipSurefireTests}</skip>
@@ -187,6 +211,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<filesets>
<fileset>
@@ -200,41 +225,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <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>
<!--Stub execution on direct plugin call - workaround for ambari rpm build process-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
@@ -282,6 +272,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>0.11</version>
<configuration>
<excludes>
<exclude>pass.txt</exclude>
http://git-wip-us.apache.org/repos/asf/ambari/blob/597d003d/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 7e1b813..524a8f7 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -33,6 +33,7 @@
<jetty.version>8.1.19.v20160209</jetty.version>
<checkstyle.version>6.19</checkstyle.version> <!-- last version that does not require Java 8 -->
<swagger.version>1.5.10</swagger.version>
+ <swagger.maven.plugin.version>3.1.4</swagger.maven.plugin.version>
<slf4j.version>1.7.20</slf4j.version>
<forkCount>4</forkCount>
<reuseForks>false</reuseForks>
@@ -525,7 +526,7 @@
<dependency>
<groupId>com.github.kongchen</groupId>
<artifactId>swagger-maven-plugin</artifactId>
- <version>3.1.4</version>
+ <version>${swagger.maven.plugin.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -575,6 +576,26 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>com.github.kongchen</groupId>
+ <artifactId>swagger-maven-plugin</artifactId>
+ <version>${swagger.maven.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.20</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/ambari/blob/597d003d/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index d4416a3..1ada974 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -170,6 +170,30 @@
</target>
</configuration>
</execution>
+ <execution>
+ <id>clean-sample-upgrade-check-jar</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <delete dir="target/test-classes/checks" includeemptydirs="true"/>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-test-oozie2-checks-dir</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <mkdir dir="target/test-classes/extensions/EXT/0.1/services/OOZIE2/checks/tmp"/>
+ </target>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -699,25 +723,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>clean-sample-upgrade-check-jar</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <delete dir="target/test-classes/checks" includeemptydirs="true"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<executions>
@@ -734,23 +739,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-test-oozie2-checks-dir</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <mkdir dir="target/test-classes/extensions/EXT/0.1/services/OOZIE2/checks/tmp"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
@@ -788,6 +776,20 @@
<goal>exec</goal>
</goals>
</execution>
+ <execution>
+ <id>configuration-markdown</id>
+ <phase>site</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.apache.ambari.server.configuration.Configuration</mainClass>
+ <arguments>
+ <argument>-output</argument>
+ <argument>${basedir}/../ambari-server/docs/configuration/index.md</argument>
+ </arguments>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -826,27 +828,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>configuration-markdown</id>
- <phase>site</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.apache.ambari.server.configuration.Configuration</mainClass>
- <arguments>
- <argument>-output</argument>
- <argument>${basedir}/../ambari-server/docs/configuration/index.md</argument>
- </arguments>
- </configuration>
- </plugin>
</plugins>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/ambari/blob/597d003d/ambari-web/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index d7a1d18..3a6f4f9 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -88,42 +88,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>clean-rmdir</id>
- <phase>clean</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>${executable.rmdir}</executable>
- <workingDirectory>${basedir}</workingDirectory>
- <commandlineArgs>${args.rm.clean} public ${nodemodules.dir}</commandlineArgs>
- <successCodes>
- <successCode>0</successCode>
- <successCode>1</successCode>
- <successCode>2</successCode>
- </successCodes>
- </configuration>
- </execution>
- <execution>
- <id>clean-mkdir</id>
- <phase>clean</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>${executable.mkdir}</executable>
- <workingDirectory>${basedir}</workingDirectory>
- <commandlineArgs>${args.mkdir} public</commandlineArgs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.4</version>
@@ -164,6 +128,35 @@
<version>1.2.1</version>
<executions>
<execution>
+ <id>clean-rmdir</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>${executable.rmdir}</executable>
+ <workingDirectory>${basedir}</workingDirectory>
+ <commandlineArgs>${args.rm.clean} public ${nodemodules.dir}</commandlineArgs>
+ <successCodes>
+ <successCode>0</successCode>
+ <successCode>1</successCode>
+ <successCode>2</successCode>
+ </successCodes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>clean-mkdir</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>${executable.mkdir}</executable>
+ <workingDirectory>${basedir}</workingDirectory>
+ <commandlineArgs>${args.mkdir} public</commandlineArgs>
+ </configuration>
+ </execution>
+ <execution>
<id>Brunch build</id>
<phase>generate-resources</phase>
<goals>