You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2018/11/15 16:01:46 UTC
[accumulo] branch master updated (d0162e5 -> 7703394)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from d0162e5 Merge branch '1.9'
new 447b52d Minor clean up from #766
new 7703394 Merge branch '1.9'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
assemble/pom.xml | 1 +
assemble/src/main/assemblies/component.xml | 36 ++++++++++++++----------------
2 files changed, 18 insertions(+), 19 deletions(-)
[accumulo] 01/02: Minor clean up from #766
Posted by ct...@apache.org.
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 <ct...@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>
[accumulo] 02/02: Merge branch '1.9'
Posted by ct...@apache.org.
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 7703394194f61e163af92b37f04960a07139957e
Merge: d0162e5 447b52d
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Nov 15 11:00:58 2018 -0500
Merge branch '1.9'
assemble/pom.xml | 1 +
assemble/src/main/assemblies/component.xml | 36 ++++++++++++++----------------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --cc assemble/pom.xml
index 27062f5,bcf532f..561c80c
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -80,42 -48,11 +80,43 @@@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<optional>true</optional>
diff --cc assemble/src/main/assemblies/component.xml
index 64f73da,c63c482..8842c2b
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@@ -30,73 -31,39 +30,71 @@@
version listing for packaged artifacts -->
<include>${groupId}:${artifactId}-*</include>
<include>com.beust:jcommander</include>
++ <include>com.fasterxml.jackson.core:jackson-annotations</include>
++ <include>com.fasterxml.jackson.core:jackson-core</include>
++ <include>com.fasterxml.jackson.core:jackson-databind</include>
++ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</include>
++ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
++ <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include>
++ <include>com.fasterxml:classmate</include>
+ <include>com.github.ben-manes.caffeine:caffeine</include>
<include>com.google.code.gson:gson</include>
<include>com.google.guava:guava</include>
<include>com.google.protobuf:protobuf-java</include>
+ <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.annotation:javax.annotation-api</include>
++ <include>javax.el:javax.el-api</include>
<include>javax.servlet:javax.servlet-api</include>
++ <include>javax.validation:validation-api</include>
++ <include>javax.ws.rs:javax.ws.rs-api</include>
<include>jline:jline</include>
++ <include>log4j:log4j</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-continuation</include>
<include>org.eclipse.jetty:jetty-http</include>
<include>org.eclipse.jetty:jetty-io</include>
<include>org.eclipse.jetty:jetty-security</include>
<include>org.eclipse.jetty:jetty-server</include>
- <!-- jetty-servlet only needed by old monitor -->
<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>
- <!-- Jersey/Jackson-based webservice -->
- <include>com.fasterxml:classmate</include>
- <include>com.fasterxml.jackson.core:jackson-annotations</include>
- <include>com.fasterxml.jackson.core:jackson-core</include>
- <include>com.fasterxml.jackson.core:jackson-databind</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
- <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include>
- <include>javax.annotation:javax.annotation-api</include>
- <include>javax.el:javax.el-api</include>
- <include>javax.validation:validation-api</include>
- <include>javax.ws.rs:javax.ws.rs-api</include>
+ <include>org.freemarker:freemarker</include>
+ <include>org.glassfish.hk2.external:aopalliance-repackaged</include>
+ <include>org.glassfish.hk2.external:javax.inject</include>
+ <include>org.glassfish.hk2:hk2-api</include>
+ <include>org.glassfish.hk2:hk2-locator</include>
+ <include>org.glassfish.hk2:hk2-utils</include>
+ <include>org.glassfish.hk2:osgi-resource-locator</include>
+ <include>org.glassfish.jersey.containers:jersey-container-jetty-http</include>
+ <include>org.glassfish.jersey.containers:jersey-container-servlet-core</include>
+ <include>org.glassfish.jersey.containers:jersey-container-servlet</include>
+ <include>org.glassfish.jersey.core:jersey-client</include>
+ <include>org.glassfish.jersey.core:jersey-common</include>
+ <include>org.glassfish.jersey.core:jersey-server</include>
+ <include>org.glassfish.jersey.ext:jersey-bean-validation</include>
+ <include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
+ <include>org.glassfish.jersey.ext:jersey-mvc-freemarker</include>
+ <include>org.glassfish.jersey.ext:jersey-mvc</include>
+ <include>org.glassfish.jersey.inject:jersey-hk2</include>
+ <include>org.glassfish.jersey.media:jersey-media-jaxb</include>
+ <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.web:javax.el</include>
+ <include>org.glassfish.web:el-impl</include>
++ <include>org.glassfish.web:javax.el</include>
+ <include>org.hibernate:hibernate-validator</include>
+ <include>org.javassist:javassist</include>
+ <include>org.jboss.logging:jboss-logging</include>
- <include>log4j:log4j</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-log4j12</include>
</includes>
- <excludes>
- <exclude>${groupId}:${artifactId}-docs</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>docs</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>${artifactId}_user_manual.${artifact.extension}</outputFileNameMapping>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <includes>
- <include>${groupId}:${artifactId}-docs:html:user-manual</include>
- </includes>
</dependencySet>
</dependencySets>
<fileSets>