Selaa lähdekoodia

AMBARI-8968. Services metrics do not load due to symlink to ambari-metrics-hadoop-sink not created. (mpapirkovskyy)

Myroslav Papirkovskyy 10 vuotta sitten
vanhempi
commit
1cb1d211f3
1 muutettua tiedostoa jossa 58 lisäystä ja 35 poistoa
  1. 58 35
      ambari-metrics/ambari-metrics-assembly/pom.xml

+ 58 - 35
ambari-metrics/ambari-metrics-assembly/pom.xml

@@ -74,39 +74,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
-
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/deb/control</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${project.basedir}/src/main/package/deb/control</directory>
-                  <excludes>
-                    <exclude>postinst</exclude>
-                  </excludes>
-                  <filtering>false</filtering>
-                </resource>
-                <resource>
-                  <directory>${project.basedir}/src/main/package/deb/control</directory>
-                  <includes>
-                    <include>postinst</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
@@ -175,6 +142,29 @@
 
       <build>
         <plugins>
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>2.7</version>
+
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/resources/rpm</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>${project.basedir}/src/main/package/rpm</directory>
+                      <filtering>true</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>rpm-maven-plugin</artifactId>
@@ -435,7 +425,7 @@
                   <defaultGroupname>root</defaultGroupname>
 
                   <postinstallScriptlet>
-                    <scriptFile>${project.basedir}/src/main/package/rpm/sink/postinstall.sh</scriptFile>
+                    <scriptFile>${project.build.directory}/resources/rpm/sink/postinstall.sh</scriptFile>
                     <fileEncoding>utf-8</fileEncoding>
                   </postinstallScriptlet>
 
@@ -486,6 +476,39 @@
 
       <build>
         <plugins>
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>2.7</version>
+
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/resources/deb/control</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>${project.basedir}/src/main/package/deb/control</directory>
+                      <excludes>
+                        <exclude>postinst</exclude>
+                      </excludes>
+                      <filtering>false</filtering>
+                    </resource>
+                    <resource>
+                      <directory>${project.basedir}/src/main/package/deb/control</directory>
+                      <includes>
+                        <include>postinst</include>
+                      </includes>
+                      <filtering>true</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <artifactId>jdeb</artifactId>
             <groupId>org.vafer</groupId>
@@ -500,7 +523,7 @@
               </execution>
             </executions>
             <configuration>
-              <controlDir>${project.build.directory}/deb/control</controlDir>
+              <controlDir>${project.build.directory}/resources/deb/control</controlDir>
               <deb>${basedir}/target/${artifactId}_${package-version}-${package-release}.deb</deb>
               <dataSet>
                 <data>