Skip to content
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

Jump to bottom

Clean up dependencies #20

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Clean up dependencies #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 21 additions & 20 deletions hadoop/hadoop-auth-stable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,6 @@

<dependencyManagement>
<dependencies>
<!-- import the original dependency versions -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
<version>${hadoop.stable.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- import dependency version overrides -->
<dependency>
<groupId>io.mishmash.apache.hadoop</groupId>
Expand Down Expand Up @@ -170,12 +162,6 @@
<version>9.41.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
Expand Down Expand Up @@ -370,15 +356,9 @@
<artifactId>apacheds-core-integ</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-guava</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down Expand Up @@ -444,6 +424,27 @@
</execution>
</executions>
</plugin>
<!-- Unshade the original sources -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>unshade-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<replace token="org.apache.hadoop.thirdparty.com.google.common" value="com.google.common" dir="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-auth/src">
<include name="**/*.java"/>
</replace>
</target>
</configuration>
</execution>
</executions>
</plugin>
<!-- Add the original sources for compilation -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
60 changes: 13 additions & 47 deletions hadoop/hadoop-common-stable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,6 @@

<dependencyManagement>
<dependencies>
<!-- import the original dependency versions -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project-dist</artifactId>
<version>${hadoop.stable.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- import dependency version overrides -->
<dependency>
<groupId>io.mishmash.apache.hadoop</groupId>
Expand All @@ -116,12 +108,6 @@
</dependency>

<!-- override deps specific to this artifact only-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
Expand Down Expand Up @@ -300,6 +286,18 @@
<version>${jersey.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -309,7 +307,6 @@
<artifactId>hadoop-annotations</artifactId>
<scope>compile</scope>
</dependency>
<!--Guava is required during runtime for curator-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down Expand Up @@ -396,37 +393,6 @@
<artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId>
<scope>compile</scope>
<exclusions>
<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.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!--
adding jettison as direct dependency (as jersey-json's jettison dependency is vulnerable with verison 1.1),
so those who depends on hadoop-common externally will get the non-vulnerable jettison
-->
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
Expand Down Expand Up @@ -573,7 +539,7 @@
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
Expand Down
8 changes: 0 additions & 8 deletions hadoop/hadoop-minikdc-stable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,6 @@

<dependencyManagement>
<dependencies>
<!-- import the original dependency versions -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
<version>${hadoop.stable.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- import dependency version overrides -->
<dependency>
<groupId>io.mishmash.apache.hadoop</groupId>
Expand Down
15 changes: 7 additions & 8 deletions hadoop/stable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,18 @@
<properties>
<httpcomponents.core.version>5.3</httpcomponents.core.version>
<httpcomponents.client.version>5.4</httpcomponents.client.version>
<javax-servlet.version>4.0.1</javax-servlet.version>
<curator.version>5.7.1</curator.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- the following deps are not patched, so, original artifacts are used -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<version>${hadoop.stable.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand All @@ -107,12 +113,6 @@
<version>${httpcomponents.client.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
Expand Down Expand Up @@ -172,7 +172,6 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>
<scope>test</scope>
<exclusions>
<!-- The following is already provided -->
<exclusion>
Expand Down
20 changes: 16 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,26 @@
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-util</artifactId>
<version>${kerby.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<artifactId>netty-bom</artifactId>
<version>${netty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
Expand Down
Loading