Skip to content

STORM-4053 - Include Client API / Runtime for HDFS #3638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 15, 2024
Merged

STORM-4053 - Include Client API / Runtime for HDFS #3638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba4285a
STORM-4053 - Include Client API / Runtime for HDFS
rzo1 Apr 15, 2024
bbb695d
Fix license
rzo1 Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions DEPENDENCY-LICENSES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ List of third-party dependencies grouped by their license type.

Apache License, Version 2.0, Eclipse Public License - Version 1.0

* Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-client)
* Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-continuation)
* Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-http)
* Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-io)
Expand Down Expand Up @@ -513,7 +512,6 @@ List of third-party dependencies grouped by their license type.
Common Development and Distribution License (CDDL) v1.1

* Java Transaction API (javax.transaction:jta:1.1 - http://java.sun.com/products/jta)
* jsp-api (javax.servlet.jsp:jsp-api:2.1 - no url defined)
* transaction-api (javax.transaction:transaction-api:1.1 - no url defined)

Common Development and Distribution License (CDDL) v1.1, The GNU General Public License (GPL), Version 2, With Classpath Exception
Expand Down
38 changes: 26 additions & 12 deletions external/storm-hdfs-blobstore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,23 @@
<artifactId>storm-client</artifactId>
<version>${project.version}</version>
<scope>${provided.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
<artifactId>storm-autocreds</artifactId>
<version>${project.version}</version>
<exclusions>
<!--log4j-over-slf4j must be excluded for hadoop-minicluster
see: http://stackoverflow.com/q/20469026/3542091 -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -66,10 +77,20 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<artifactId>hadoop-client-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
Expand All @@ -94,13 +115,6 @@
<configuration>
<reuseForks>false</reuseForks>
<forkCount>1</forkCount>
<!-- We exclude these dependencies from the test classpath as they have some ambiguity with classes from the
HDFS mini cluster used for testing. However, users need these dependencies, so we declare it in our POM
-->
<classpathDependencyExcludes>
<classpathDependencyExcludes>org.apache.hadoop:hadoop-client-api</classpathDependencyExcludes>
<classpathDependencyExcludes>org.apache.hadoop:hadoop-client-runtime</classpathDependencyExcludes>
</classpathDependencyExcludes>
</configuration>
</plugin>
<plugin>
Expand Down
33 changes: 25 additions & 8 deletions external/storm-hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,20 @@
<groupId>org.apache.storm</groupId>
<artifactId>storm-autocreds</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand Down Expand Up @@ -96,10 +110,20 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<artifactId>hadoop-client-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
Expand All @@ -114,13 +138,6 @@
<configuration>
<reuseForks>false</reuseForks>
<forkCount>1</forkCount>
<!-- We exclude these dependencies from the test classpath as they have some ambiguity with classes from the
HDFS mini cluster used for testing. However, users need these dependencies, so we declare it in our POM
-->
<classpathDependencyExcludes>
<classpathDependencyExcludes>org.apache.hadoop:hadoop-client-api</classpathDependencyExcludes>
<classpathDependencyExcludes>org.apache.hadoop:hadoop-client-runtime</classpathDependencyExcludes>
</classpathDependencyExcludes>
</configuration>
</plugin>
<plugin>
Expand Down
37 changes: 11 additions & 26 deletions sql/storm-sql-external/storm-sql-hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,26 +86,18 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<artifactId>hadoop-client-minicluster</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -153,13 +145,6 @@
<systemPropertyVariables>
<storm.home>${project.basedir}/target/testhome</storm.home>
</systemPropertyVariables>
<!-- We exclude these dependencies from the test classpath as they have some ambiguity with classes from the
HDFS mini cluster used for testing. However, users need these dependencies, so we declare it in our POM
-->
<classpathDependencyExcludes>
<classpathDependencyExcludes>org.apache.hadoop:hadoop-client-api</classpathDependencyExcludes>
<classpathDependencyExcludes>org.apache.hadoop:hadoop-client-runtime</classpathDependencyExcludes>
</classpathDependencyExcludes>
</configuration>
</plugin>
</plugins>
Expand Down
Loading