ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-14277. Upgrade findbugs-maven-plugin version to 3.0.3 (Ajit kumar via smohanty)
Date Fri, 11 Dec 2015 22:49:47 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 176cbc890 -> 5d9cc6111


AMBARI-14277. Upgrade findbugs-maven-plugin version to 3.0.3 (Ajit kumar via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d9cc611
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d9cc611
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d9cc611

Branch: refs/heads/branch-2.2
Commit: 5d9cc6111e14daacaa5786a4efabfe5efcbde677
Parents: 176cbc8
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Thu Dec 10 20:54:20 2015 -0800
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Fri Dec 11 14:49:35 2015 -0800

----------------------------------------------------------------------
 ambari-server/pom.xml                           | 67 ++++++--------------
 .../ambari/shell/support/TableRendererTest.java | 14 ++--
 2 files changed, 28 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d9cc611/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 9a51e9d..b5a9d49 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -135,6 +135,24 @@
               <goal>run</goal>
             </goals>
           </execution>
+          <!-- Copies compiled views into known location for RPM builds -->
+          <execution>
+            <id>copy-view-jars</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy todir="${ambari-admin-dir}/target" flatten="true">
+                  <fileset dir="${contrib-views-dir}">
+                    <include name="*/target/*jar" />
+                    <exclude name="**/ambari-views-utils*jar" />
+                  </fileset>
+                </copy>
+              </target>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -699,7 +717,7 @@
         </executions>
         <configuration>
           <controlDir>${basedir}/src/main/package/deb/control</controlDir>
-          <deb>${basedir}/target/${artifactId}_${package-version}-${package-release}.deb</deb>
+          <deb>${basedir}/target/${project.artifactId}_${package-version}-${package-release}.deb</deb>
           <dataSet>
             <data>
               <type>template</type>
@@ -1209,7 +1227,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
+        <version>3.0.3</version>
         <configuration>
           <failOnError>false</failOnError>
         </configuration>
@@ -1278,49 +1296,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <configuration>
-              <tasks>
-                <jar destfile="target/DBConnectionVerification.jar">
-                  <fileset dir="${basedir}/target/classes/"
-                    includes="**/DBConnectionVerification.class" />
-                  <manifest>
-                    <attribute name="Main-Class"
-                      value="org.apache.ambari.server.DBConnectionVerification" />
-                  </manifest>
-                </jar>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <!-- Copies compiled views into known location for RPM builds -->
-          <execution>
-            <id>copy-view-jars</id>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy todir="${ambari-admin-dir}/target" flatten="true">
-                  <fileset dir="${contrib-views-dir}">
-                    <include name="*/target/*jar" />
-                    <exclude name="**/ambari-views-utils*jar" />
-                  </fileset>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
     <resources>
       <resource>
@@ -1577,7 +1552,7 @@
   </profiles>
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>ambari-views</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/ambari/blob/5d9cc611/ambari-shell/ambari-groovy-shell/src/test/java/org/apache/ambari/shell/support/TableRendererTest.java
----------------------------------------------------------------------
diff --git a/ambari-shell/ambari-groovy-shell/src/test/java/org/apache/ambari/shell/support/TableRendererTest.java
b/ambari-shell/ambari-groovy-shell/src/test/java/org/apache/ambari/shell/support/TableRendererTest.java
index e576390..01dc435 100644
--- a/ambari-shell/ambari-groovy-shell/src/test/java/org/apache/ambari/shell/support/TableRendererTest.java
+++ b/ambari-shell/ambari-groovy-shell/src/test/java/org/apache/ambari/shell/support/TableRendererTest.java
@@ -23,7 +23,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,20 +34,20 @@ public class TableRendererTest {
 
   @Test
   public void testRenderMultiValueMap() throws IOException {
-    Map<String, List<String>> map = new HashMap<String, List<String>>();
-    map.put("HDFS", Collections.singletonList("DATANODE"));
-    map.put("MAPREDUCE2", Collections.singletonList("HISTORYSERVER"));
+    Map<String, List<String>> map = new LinkedHashMap<>();
     map.put("ZOOKEEPER", Collections.singletonList("ZOOKEEPER_SERVER"));
+    map.put("MAPREDUCE2", Collections.singletonList("HISTORYSERVER"));
+    map.put("HDFS", Collections.singletonList("DATANODE"));
     assertEquals(IOUtils.toString(new FileInputStream(new File("src/test/resources/2columns"))),
       TableRenderer.renderMultiValueMap(map, "SERVICE", "COMPONENT"));
   }
 
   @Test
   public void testRenderMapValueMap() throws IOException {
-    Map<String, Map<String, String>> map = new HashMap<String, Map<String,
String>>();
-    map.put("HDFS", Collections.singletonMap("DATANODE", "STARTED"));
-    map.put("MAPREDUCE2", Collections.singletonMap("HISTORYSERVER", "STARTED"));
+    Map<String, Map<String, String>> map = new LinkedHashMap<>();
     map.put("ZOOKEEPER", Collections.singletonMap("ZOOKEEPER_SERVER", "INSTALLED"));
+    map.put("MAPREDUCE2", Collections.singletonMap("HISTORYSERVER", "STARTED"));
+    map.put("HDFS", Collections.singletonMap("DATANODE", "STARTED"));
     assertEquals(IOUtils.toString(new FileInputStream(new File("src/test/resources/3columns"))),
       TableRenderer.renderMapValueMap(map, "SERVICE", "COMPONENT", "STATE"));
   }


Mime
View raw message