You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by cm...@apache.org on 2015/09/09 03:51:25 UTC

incubator-htrace git commit: HTRACE-243. Remove duplicate maven-assembly-plugin configuration section in htrace-htraced/pom.xml (Lewis John McGibbney via Colin P. McCabe)

Repository: incubator-htrace
Updated Branches:
  refs/heads/master c1f17ea27 -> a93302051


HTRACE-243. Remove duplicate maven-assembly-plugin configuration section in htrace-htraced/pom.xml (Lewis John McGibbney via Colin P. McCabe)


Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/a9330205
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/a9330205
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/a9330205

Branch: refs/heads/master
Commit: a9330205178eee25a64737346b045140c2d38529
Parents: c1f17ea
Author: Colin P. Mccabe <cm...@apache.org>
Authored: Tue Sep 8 18:49:01 2015 -0700
Committer: Colin P. Mccabe <cm...@apache.org>
Committed: Tue Sep 8 18:49:01 2015 -0700

----------------------------------------------------------------------
 htrace-htraced/pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a9330205/htrace-htraced/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-htraced/pom.xml b/htrace-htraced/pom.xml
index 6a9dc91..16d2206 100644
--- a/htrace-htraced/pom.xml
+++ b/htrace-htraced/pom.xml
@@ -33,13 +33,6 @@ language governing permissions and limitations under the License. -->
   <build>
     <plugins>
       <plugin>
-        <!--Make it so assembly:single does nothing in here-->
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
@@ -67,6 +60,8 @@ language governing permissions and limitations under the License. -->
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
           </descriptorRefs>
+          <!--Make it so assembly:single does nothing in here-->
+          <skipAssembly>true</skipAssembly>
         </configuration>
       </plugin>
       <!--Move this to top-level. These shade patterns are common across components