[GitHub] accumulo pull request #240: ACCUMULO-4618 Updates from additional code revie...

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[GitHub] accumulo pull request #240: ACCUMULO-4618 Updates from additional code revie...

joshelser
GitHub user mikewalch opened a pull request:

    https://github.com/apache/accumulo/pull/240

    ACCUMULO-4618 Updates from additional code review

    * Now using only one httpclient jar
    * Marked xml-apis jar as provided
    * Added slf4j-log4j12 to several modules with test scope

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/mikewalch/accumulo accumulo-4618-review

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/accumulo/pull/240.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #240
   
----
commit 63ecb30fc43f9093b07f4b8a1310c6ecbd6900a2
Author: Mike Walch <[hidden email]>
Date:   2017-04-05T15:11:24Z

    ACCUMULO-4618 Updates from additional code review
   
    * Now using only one httpclient jar
    * Marked xml-apis jar as provided
    * Added slf4j-log4j12 to several modules with test scope

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[GitHub] accumulo pull request #240: ACCUMULO-4618 Updates from additional code revie...

joshelser
Github user ctubbsii commented on a diff in the pull request:

    https://github.com/apache/accumulo/pull/240#discussion_r110285913
 
    --- Diff: maven-plugin/pom.xml ---
    @@ -68,6 +68,7 @@
         <dependency>
           <groupId>xml-apis</groupId>
           <artifactId>xml-apis</artifactId>
    +      <scope>provided</scope>
    --- End diff --
   
    I looked into this, and adding an exclusion in the `dependencyManagement` of `hadoop-client` and `hadoop-minicluster` in the root pom for `xerces:xercesImpl` is sufficient.
   
    These are being brought in transitively because this version of hadoop (2.6.4) is still using *very* old versions of (mortbay) jetty-util.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[GitHub] accumulo pull request #240: ACCUMULO-4618 Updates from additional code revie...

joshelser
In reply to this post by joshelser
Github user ctubbsii commented on a diff in the pull request:

    https://github.com/apache/accumulo/pull/240#discussion_r110286306
 
    --- Diff: maven-plugin/pom.xml ---
    @@ -68,6 +68,7 @@
         <dependency>
           <groupId>xml-apis</groupId>
           <artifactId>xml-apis</artifactId>
    +      <scope>provided</scope>
    --- End diff --
   
    ```patch
    diff --git a/pom.xml b/pom.xml
    index 801a6e6..0f753c9 100644
    --- a/pom.xml
    +++ b/pom.xml
    @@ -389,6 +389,12 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
             <version>${hadoop.version}</version>
    +        <exclusions>
    +          <exclusion>
    +            <groupId>xerces</groupId>
    +            <artifactId>xercesImpl</artifactId>
    +          </exclusion>
    +        </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
    @@ -399,6 +405,12 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-minicluster</artifactId>
             <version>${hadoop.version}</version>
    +        <exclusions>
    +          <exclusion>
    +            <groupId>xerces</groupId>
    +            <artifactId>xercesImpl</artifactId>
    +          </exclusion>
    +        </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
    @@ -555,11 +567,6 @@
             <artifactId>slf4j-nop</artifactId>
             <version>${slf4j.version}</version>
           </dependency>
    -      <dependency>
    -        <groupId>xml-apis</groupId>
    -        <artifactId>xml-apis</artifactId>
    -        <version>1.3.04</version>
    -      </dependency>
         </dependencies>
       </dependencyManagement>
       <build>
    diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
    index fa38dfc..9c9f1f9 100644
    --- a/maven-plugin/pom.xml
    +++ b/maven-plugin/pom.xml
    @@ -65,10 +65,6 @@
           <groupId>org.apache.maven.plugin-tools</groupId>
           <artifactId>maven-plugin-annotations</artifactId>
         </dependency>
    -    <dependency>
    -      <groupId>xml-apis</groupId>
    -      <artifactId>xml-apis</artifactId>
    -    </dependency>
       </dependencies>
       <build>
         <plugins>
    diff --git a/server/base/pom.xml b/server/base/pom.xml
    index 3554c14..65575db 100644
    --- a/server/base/pom.xml
    +++ b/server/base/pom.xml
    @@ -105,10 +105,6 @@
           <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
    -      <groupId>xml-apis</groupId>
    -      <artifactId>xml-apis</artifactId>
    -    </dependency>
    -    <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
           <scope>test</scope>
    diff --git a/start/pom.xml b/start/pom.xml
    index b9bdec8..85e22fc 100644
    --- a/start/pom.xml
    +++ b/start/pom.xml
    @@ -51,10 +51,6 @@
           <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
    -      <groupId>xml-apis</groupId>
    -      <artifactId>xml-apis</artifactId>
    -    </dependency>
    -    <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
           <scope>test</scope>
    ```


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[GitHub] accumulo pull request #240: ACCUMULO-4618 Updates from additional code revie...

joshelser
In reply to this post by joshelser
Github user mikewalch commented on a diff in the pull request:

    https://github.com/apache/accumulo/pull/240#discussion_r110412136
 
    --- Diff: maven-plugin/pom.xml ---
    @@ -68,6 +68,7 @@
         <dependency>
           <groupId>xml-apis</groupId>
           <artifactId>xml-apis</artifactId>
    +      <scope>provided</scope>
    --- End diff --
   
    Nice. I will fix this and merge.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[GitHub] accumulo pull request #240: ACCUMULO-4618 Updates from additional code revie...

joshelser
In reply to this post by joshelser
Github user asfgit closed the pull request at:

    https://github.com/apache/accumulo/pull/240


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [hidden email] or file a JIRA ticket
with INFRA.
---
Loading...