This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new be6154b Include commons-configuration in our convenience binaries for
Hadoop 2. (#766)
be6154b is described below
commit be6154b5a71f988e216f91b5dcd06bbee0b75a21
Author: Sean Busbey <sean.bus...@gmail.com>
AuthorDate: Thu Nov 15 06:36:42 2018 -0600
Include commons-configuration in our convenience binaries for Hadoop 2.
(#766)
We need newer than Hadoop 2.y releases provide now, so bring our own along.
Closes #757
---
assemble/pom.xml | 12 ++++++------
assemble/src/main/assemblies/component.xml | 1 +
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/assemble/pom.xml b/assemble/pom.xml
index d5a4d3f..0996fd2 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -48,6 +48,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<optional>true</optional>
@@ -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>
@@ -377,10 +381,6 @@
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
diff --git a/assemble/src/main/assemblies/component.xml
b/assemble/src/main/assemblies/component.xml
index bfcedc8..455872e 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>
