[GitHub] busbey closed pull request #766: Include commons-configuration in our convenience binaries for Hadoop 2.

[GitBox <gi...@apache.org>]

busbey closed pull request #766: Include commons-configuration in our convenience binaries for Hadoop 2.
URL: https://github.com/apache/accumulo/pull/766
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/assemble/pom.xml b/assemble/pom.xml
index d5a4d3fc8d..0996fd25a5 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -47,6 +47,10 @@
       <artifactId>protobuf-java</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
@@ -331,7 +335,7 @@
         </property>
       </activation>
       <properties>
-        <artifactList>commons-math3,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12</artifactList>
+        <artifactList>commons-configuration,commons-math3,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12</artifactList>
         <assemblyDescriptor>src/main/assemblies/binary-release.xml</assemblyDescriptor>
         <hadoop.profile>2</hadoop.profile>
       </properties>
@@ -345,7 +349,7 @@
         </property>
       </activation>
       <properties>
-        <artifactList>commons-math3,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12</artifactList>
+        <artifactList>commons-configuration,commons-math3,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12</artifactList>
         <assemblyDescriptor>src/main/assemblies/binary-release.xml</assemblyDescriptor>
       </properties>
     </profile>
@@ -376,10 +380,6 @@
           <groupId>commons-collections</groupId>
           <artifactId>commons-collections</artifactId>
         </dependency>
-        <dependency>
-          <groupId>commons-configuration</groupId>
-          <artifactId>commons-configuration</artifactId>
-        </dependency>
         <dependency>
           <groupId>commons-io</groupId>
           <artifactId>commons-io</artifactId>
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index bfcedc84fd..455872e996 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -36,6 +36,7 @@
         <include>com.google.protobuf:protobuf-java</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.thrift:libthrift</include>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services