Skip to content

Commit

Permalink
Minor dependencies cleanup:
Browse files Browse the repository at this point in the history
  - Move sling JSON dependency to streaming connectors (prev streaming core)
  - Exclude YARN API from transitive mapreduce-core dependencies we use the dependency
    only for .mapred and .mapreduce interfaces
  - Remove some unnecessary dependencies (junit in java8)
  - Manage Kryo dependency
  - Cleanup minor POM warnings.
  • Loading branch information
StephanEwen committed Jan 18, 2015
1 parent f38e203 commit 543453d
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ under the License.
<artifactId>spymemcached</artifactId>
<version>2.8.4</version>
</dependency>

<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.json</artifactId>
<version>2.0.6</version>
</dependency>

</dependencies>

Expand Down
5 changes: 0 additions & 5 deletions flink-addons/flink-streaming/flink-streaming-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ under the License.
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.json</artifactId>
<version>2.0.6</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
8 changes: 4 additions & 4 deletions flink-addons/flink-tachyon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ under the License.
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>7.6.8.v20121106</version>
<version>7.6.8.v20121106</version><!--$NO-MVN-MAN-VER$-->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -82,14 +82,14 @@ under the License.
<artifactId>hadoop-hdfs</artifactId>
<scope>test</scope>
<type>test-jar</type>
<version>${hadoop.version}</version>
<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>test</scope>
<type>test-jar</type>
<version>${hadoop.version}</version>
<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
</dependency>
</dependencies>
<dependencyManagement>
Expand All @@ -108,4 +108,4 @@ under the License.
</dependency>
</dependencies>
</dependencyManagement>
</project>
</project>
1 change: 0 additions & 1 deletion flink-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ under the License.
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
<version>2.24.0</version>
</dependency>

<dependency>
Expand Down
7 changes: 0 additions & 7 deletions flink-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ under the License.
<artifactId>flink-java-examples</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
</dependency>
</dependencies>

<build>
Expand All @@ -87,7 +81,6 @@ under the License.
<configuration>
<source>1.8</source>
<target>1.8</target>
<!-- High optimization, no debugging <compilerArgument>-g:none -O</compilerArgument> -->
</configuration>
</plugin>
<plugin>
Expand Down
6 changes: 3 additions & 3 deletions flink-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ under the License.
</dependency>

<dependency>
<groupId>org.scalamacros</groupId>
<artifactId>quasiquotes_${scala.binary.version}</artifactId>
<version>${scala.macros.version}</version>
<groupId>org.scalamacros</groupId>
<artifactId>quasiquotes_${scala.binary.version}</artifactId>
<version>${scala.macros.version}</version>
</dependency>

<dependency>
Expand Down
25 changes: 22 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ under the License.
<artifactId>flink-parent</artifactId>
<version>0.9-SNAPSHOT</version>

<name>flink</name>
<name>Apache Flink</name>
<packaging>pom</packaging>
<url>http:https://flink.incubator.apache.org/</url>
<url>http:https://flink.apache.org</url>
<inceptionYear>2014</inceptionYear>

<licenses>
Expand All @@ -47,7 +47,7 @@ under the License.

<scm>
<url>https://github.com/apache/incubator-flink</url>
<connection>[email protected]:apache/incubator-flink.git</connection>
<connection>[email protected]:apache/flink.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-flink.git</developerConnection>
</scm>

Expand Down Expand Up @@ -232,6 +232,13 @@ under the License.
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
</dependency>

<!-- kryo used in different versions by Flink an chill -->
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
<version>2.24.0</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
Expand Down Expand Up @@ -513,6 +520,18 @@ under the License.
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down

0 comments on commit 543453d

Please sign in to comment.