Jelajahi Sumber

AMBARI-17150 : Ambari Metrics components packages do not have vendor before upgrade, but for new versions it appears (avijayan)

Aravindan Vijayan 9 tahun lalu
induk
melakukan
21c50a03f5
2 mengubah file dengan 5 tambahan dan 24 penghapusan
  1. 0 17
      ambari-metrics/ambari-metrics-common/pom.xml
  2. 5 7
      ambari-metrics/pom.xml

+ 0 - 17
ambari-metrics/ambari-metrics-common/pom.xml

@@ -53,23 +53,6 @@
           <controlDir>${project.basedir}/../src/main/package/deb/control</controlDir>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>../../ambari-project/src/main/assemblies/empty.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>build-tarball</id>
-            <phase>none</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

+ 5 - 7
ambari-metrics/pom.xml

@@ -15,12 +15,6 @@
    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">
-  <parent>
-    <groupId>org.apache.ambari</groupId>
-    <artifactId>ambari-project</artifactId>
-    <version>2.4.0.0.0</version>
-    <relativePath>../ambari-project</relativePath>
-  </parent>
   <groupId>org.apache.ambari</groupId>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-metrics</artifactId>
@@ -112,6 +106,11 @@
   </dependencyManagement>
   <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>
@@ -140,7 +139,6 @@
         </executions>
       </plugin>
       <plugin>
-        <inherited>false</inherited>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>