You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/10/06 16:00:37 UTC

[03/12] ambari git commit: AMBARI-14439. ADDENDUM. Categorize unit tests so can run mvn test -P $PROFILE (alejandro)

AMBARI-14439. ADDENDUM. Categorize unit tests so can run mvn test -P $PROFILE (alejandro)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 1f7edfba8358ad3f07b168ec5c7f2245e01016d8
Parents: 76ea14e
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Wed Oct 5 12:53:52 2016 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Oct 5 12:53:55 2016 -0700

----------------------------------------------------------------------
 ambari-metrics/pom.xml |  1 +
 pom.xml                |  6 ------
 utility/pom.xml        | 34 ++++++++++++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1f7edfba/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index a010f47..80c99dc 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -31,6 +31,7 @@
     <module>ambari-metrics-host-monitoring</module>
     <module>ambari-metrics-grafana</module>
     <module>ambari-metrics-assembly</module>
+    <module>../utility</module>
   </modules>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f7edfba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 831089d..bd0aa7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -745,10 +745,4 @@ instead of a SNAPSHOT. -->
     </profile>
   </profiles>
   <!-- End of profiles for running unit tests. -->
-
-  <!-- Must depend on the utility project in order to find the
-  categories (testcase.groups) used in the unit test profiles. -->
-  <modules>
-    <module>utility</module>
-  </modules>
 </project>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1f7edfba/utility/pom.xml
----------------------------------------------------------------------
diff --git a/utility/pom.xml b/utility/pom.xml
index c98e2ed..9f3fe32 100644
--- a/utility/pom.xml
+++ b/utility/pom.xml
@@ -1,4 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -16,4 +32,18 @@
       <scope>compile</scope>    <!-- has to be compile-time dependency on junit -->
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+          <useIncrementalCompilation>false</useIncrementalCompilation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>