Github user steveloughran commented on a diff in the pull request:

    https://github.com/apache/spark/pull/20923#discussion_r178054506
  
    --- Diff: hadoop-cloud/pom.xml ---
    @@ -177,6 +214,188 @@
                 </exclusion>
               </exclusions>
             </dependency>
    +        <!--
    +          the AWS module pulls in jackson; its transitive dependencies can 
create
    +          intra-jackson-module version problems.
    +          -->
    +        <dependency>
    +          <groupId>org.apache.hadoop</groupId>
    +          <artifactId>hadoop-aws</artifactId>
    +          <version>${hadoop.version}</version>
    +          <scope>${hadoop.deps.scope}</scope>
    +          <exclusions>
    +            <exclusion>
    +              <groupId>org.apache.hadoop</groupId>
    +              <artifactId>hadoop-common</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>commons-logging</groupId>
    +              <artifactId>commons-logging</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>org.codehaus.jackson</groupId>
    +              <artifactId>jackson-mapper-asl</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>org.codehaus.jackson</groupId>
    +              <artifactId>jackson-core-asl</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>com.fasterxml.jackson.core</groupId>
    +              <artifactId>jackson-core</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>com.fasterxml.jackson.core</groupId>
    +              <artifactId>jackson-databind</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>com.fasterxml.jackson.core</groupId>
    +              <artifactId>jackson-annotations</artifactId>
    +            </exclusion>
    +          </exclusions>
    +        </dependency>
    +        <dependency>
    +          <groupId>org.apache.hadoop</groupId>
    +          <artifactId>hadoop-openstack</artifactId>
    +          <version>${hadoop.version}</version>
    +          <scope>${hadoop.deps.scope}</scope>
    +          <exclusions>
    +            <exclusion>
    +              <groupId>org.apache.hadoop</groupId>
    +              <artifactId>hadoop-common</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>commons-logging</groupId>
    +              <artifactId>commons-logging</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>junit</groupId>
    +              <artifactId>junit</artifactId>
    +            </exclusion>
    +            <exclusion>
    +              <groupId>org.mockito</groupId>
    +              <artifactId>mockito-all</artifactId>
    +            </exclusion>
    +          </exclusions>
    +        </dependency>
    +
    +        <!--
    +        Add joda time to ensure that anything downstream which doesn't 
pull in spark-hive
    +        gets the correct joda time artifact, so doesn't have auth failures 
on later Java 8 JVMs
    +        -->
    +        <dependency>
    +          <groupId>joda-time</groupId>
    +          <artifactId>joda-time</artifactId>
    +          <scope>${hadoop.deps.scope}</scope>
    +        </dependency>
    +        <!-- explicitly declare the jackson artifacts desired -->
    +        <dependency>
    +          <groupId>com.fasterxml.jackson.core</groupId>
    +          <artifactId>jackson-databind</artifactId>
    +          <scope>${hadoop.deps.scope}</scope>
    +        </dependency>
    +        <dependency>
    +          <groupId>com.fasterxml.jackson.core</groupId>
    +          <artifactId>jackson-annotations</artifactId>
    +          <scope>${hadoop.deps.scope}</scope>
    +        </dependency>
    +        <dependency>
    +          <groupId>com.fasterxml.jackson.dataformat</groupId>
    +          <artifactId>jackson-dataformat-cbor</artifactId>
    +          <version>${fasterxml.jackson.version}</version>
    +        </dependency>
    +        <!--Explicit declaration to force in Spark version into transitive 
dependencies -->
    +        <dependency>
    +          <groupId>org.apache.httpcomponents</groupId>
    +          <artifactId>httpclient</artifactId>
    +          <scope>${hadoop.deps.scope}</scope>
    +        </dependency>
    +        <!--Explicit declaration to force in Spark version into transitive 
dependencies -->
    +        <dependency>
    +          <groupId>org.apache.httpcomponents</groupId>
    +          <artifactId>httpcore</artifactId>
    +          <scope>${hadoop.deps.scope}</scope>
    +        </dependency>
    +      </dependencies>
    +    </profile>
    +
    +    <!--
    +     Hadoop 3 simplifies the classpath, and adds a new committer base 
class which
    +     enables store-specific committers.
    +    -->
    +    <profile>
    +      <id>hadoop-3</id>
    +      <properties>
    +        <extra.source.dir>src/hadoop-3/main/scala</extra.source.dir>
    +        
<extra.testsource.dir>src/hadoop-3/test/scala</extra.testsource.dir>
    +      </properties>
    +
    +      <build>
    +        <plugins>
    +          <!-- Include a source dir depending on the Scala version -->
    +          <plugin>
    +            <groupId>org.codehaus.mojo</groupId>
    +            <artifactId>build-helper-maven-plugin</artifactId>
    +            <executions>
    +              <execution>
    +                <id>add-scala-sources</id>
    +                <phase>generate-sources</phase>
    +                <goals>
    +                  <goal>add-source</goal>
    +                </goals>
    +                <configuration>
    +                  <sources>
    +                    <source>${extra.source.dir}</source>
    +                  </sources>
    +                </configuration>
    +              </execution>
    +              <execution>
    +                <id>add-scala-test-sources</id>
    +                <phase>generate-test-sources</phase>
    +                <goals>
    +                  <goal>add-test-source</goal>
    +                </goals>
    +                <configuration>
    +                  <sources>
    +                    <source>${extra.testsource.dir}</source>
    +                  </sources>
    +                </configuration>
    +              </execution>
    +            </executions>
    +          </plugin>
    +        </plugins>
    +
    --- End diff --
    
    done


---

---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org

Reply via email to