accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/02: Minor clean up from #766
Date Thu, 15 Nov 2018 16:01:47 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 447b52d388e4ad211aad16d8f77c0fe9aadc63fb
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Thu Nov 15 10:44:15 2018 -0500

    Minor clean up from #766
    
    * Make commons-configuration dependency in assembly module optional, to
    avoid transitive dependency resolution if somebody depends on the
    assembly module.
    * Sort assembly component includes, for easier
    comparison/diff/deduplication
---
 assemble/pom.xml                                   | 1 +
 assemble/src/main/assemblies/component-hadoop3.xml | 4 ++--
 assemble/src/main/assemblies/component.xml         | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/assemble/pom.xml b/assemble/pom.xml
index 0996fd2..bcf532f 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -50,6 +50,7 @@
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/assemble/src/main/assemblies/component-hadoop3.xml b/assemble/src/main/assemblies/component-hadoop3.xml
index 38755cc..e5a83ea 100644
--- a/assemble/src/main/assemblies/component-hadoop3.xml
+++ b/assemble/src/main/assemblies/component-hadoop3.xml
@@ -37,15 +37,16 @@
         <include>commons-cli:commons-cli</include>
         <include>commons-codec:commons-codec</include>
         <include>commons-collections:commons-collections</include>
+        <include>commons-configuration:commons-configuration</include>
         <include>commons-io:commons-io</include>
         <include>commons-lang:commons-lang</include>
         <include>commons-logging:commons-logging</include>
-        <include>commons-configuration:commons-configuration</include>
         <include>javax.servlet:javax.servlet-api</include>
         <include>jline:jline</include>
         <include>org.apache.commons:commons-math3</include>
         <include>org.apache.commons:commons-vfs2</include>
         <include>org.apache.htrace:htrace-core4</include>
+        <include>org.apache.htrace:htrace-core</include>
         <include>org.apache.thrift:libthrift</include>
         <include>org.eclipse.jetty:jetty-http</include>
         <include>org.eclipse.jetty:jetty-io</include>
@@ -53,7 +54,6 @@
         <include>org.eclipse.jetty:jetty-server</include>
         <include>org.eclipse.jetty:jetty-servlet</include>
         <include>org.eclipse.jetty:jetty-util</include>
-        <include>org.apache.htrace:htrace-core</include>
         <include>org.slf4j:slf4j-api</include>
         <include>org.slf4j:slf4j-log4j12</include>
       </includes>
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 455872e..c63c482 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -34,11 +34,12 @@
         <include>com.google.code.gson:gson</include>
         <include>com.google.guava:guava</include>
         <include>com.google.protobuf:protobuf-java</include>
+        <include>commons-configuration:commons-configuration</include>
         <include>javax.servlet:javax.servlet-api</include>
         <include>jline:jline</include>
-        <include>commons-configuration:commons-configuration</include>
         <include>org.apache.commons:commons-math3</include>
         <include>org.apache.commons:commons-vfs2</include>
+        <include>org.apache.htrace:htrace-core</include>
         <include>org.apache.thrift:libthrift</include>
         <include>org.eclipse.jetty:jetty-http</include>
         <include>org.eclipse.jetty:jetty-io</include>
@@ -46,7 +47,6 @@
         <include>org.eclipse.jetty:jetty-server</include>
         <include>org.eclipse.jetty:jetty-servlet</include>
         <include>org.eclipse.jetty:jetty-util</include>
-        <include>org.apache.htrace:htrace-core</include>
         <include>org.slf4j:slf4j-api</include>
         <include>org.slf4j:slf4j-log4j12</include>
       </includes>


Mime
View raw message