Repository: incubator-distributedlog Updated Branches: refs/heads/master 057cca919 -> 46ea899ba
DL-170: All dependency versions should be defined in the parent pom make all dependencies' version be defined in the parent pom file. Author: Gerrit Sundaram <gerritsunda...@gmail.com> Reviewers: Sijie Guo <si...@apache.org> Closes #97 from gerritsundaram/DL-170 Project: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/commit/46ea899b Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/46ea899b Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/46ea899b Branch: refs/heads/master Commit: 46ea899ba077ca04a336d895fd19003c55a78b73 Parents: 057cca9 Author: Gerrit Sundaram <gerritsunda...@gmail.com> Authored: Sun Jan 8 14:10:37 2017 -0800 Committer: Sijie Guo <si...@apache.org> Committed: Sun Jan 8 14:10:37 2017 -0800 ---------------------------------------------------------------------- distributedlog-benchmark/pom.xml | 11 +++++------ distributedlog-client/pom.xml | 28 ++++++++++++++-------------- distributedlog-core/pom.xml | 33 ++++++++++++++------------------- distributedlog-protocol/pom.xml | 22 +++++++++++----------- distributedlog-service/pom.xml | 35 ++++++++++------------------------- pom.xml | 29 +++++++++++++++++++++++++---- 6 files changed, 79 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/46ea899b/distributedlog-benchmark/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-benchmark/pom.xml b/distributedlog-benchmark/pom.xml index b3ed0f0..3c16d59 100644 --- a/distributedlog-benchmark/pom.xml +++ b/distributedlog-benchmark/pom.xml @@ -39,7 +39,7 @@ <dependency> <groupId>com.twitter</groupId> <artifactId>finagle-ostrich4_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> @@ -51,7 +51,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -76,7 +76,7 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> + <version>${maven-assembly-plugin.version}</version> <configuration> <descriptors> <descriptor>../src/assemble/bin.xml</descriptor> @@ -115,12 +115,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> + <version>${maven-checkstyle-plugin.version}</version> <dependencies> <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> - <version>6.19</version> + <version>${puppycrawl.checkstyle.version}</version> </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> @@ -145,7 +145,6 @@ </execution> </executions> </plugin> - </plugins> </build> <profiles> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/46ea899b/distributedlog-client/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-client/pom.xml b/distributedlog-client/pom.xml index f8243a4..484f185 100644 --- a/distributedlog-client/pom.xml +++ b/distributedlog-client/pom.xml @@ -34,17 +34,17 @@ <dependency> <groupId>com.twitter</groupId> <artifactId>finagle-core_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>finagle-thriftmux_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>finagle-serversets_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -55,34 +55,34 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>16.0</version> + <version>${guava.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> + <version>${commons-lang3.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.4</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.5</version> + <version>${mockito.version}</version> <scope>test</scope> </dependency> <dependency> @@ -104,7 +104,7 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <compilerArguments> <Werror /> @@ -116,7 +116,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> @@ -128,7 +128,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>-Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G</argLine> @@ -145,12 +145,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> + <version>${maven-checkstyle-plugin.version}</version> <dependencies> <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> - <version>6.19</version> + <version>${puppycrawl.checkstyle.version}</version> </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/46ea899b/distributedlog-core/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-core/pom.xml b/distributedlog-core/pom.xml index ead101d..e4a5e7a 100644 --- a/distributedlog-core/pom.xml +++ b/distributedlog-core/pom.xml @@ -44,30 +44,30 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jmock</groupId> <artifactId>jmock</artifactId> - <version>2.8.2</version> + <version>${jmock.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.4</version> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>com.twitter.common</groupId> <artifactId>stats-util</artifactId> - <version>0.0.58</version> + <version>${stats-util.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -78,22 +78,17 @@ <dependency> <groupId>com.twitter</groupId> <artifactId>util-core_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.94</version> + <version>${commons-lang3.version}</version> </dependency> <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.5.0-1</version> + <version>${libthrift.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId> @@ -127,7 +122,7 @@ <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.1</version> + <version>${commons-cli.version}</version> </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> @@ -137,12 +132,12 @@ <dependency> <groupId>net.jpountz.lz4</groupId> <artifactId>lz4</artifactId> - <version>1.2.0</version> + <version>${lz4.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.5</version> + <version>${mockito.version}</version> <scope>test</scope> </dependency> <dependency> @@ -174,7 +169,7 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <compilerArguments> <Xlint:deprecation /> @@ -185,7 +180,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> @@ -197,7 +192,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>-Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G</argLine> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/46ea899b/distributedlog-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-protocol/pom.xml b/distributedlog-protocol/pom.xml index d047e3a..ef04acb 100644 --- a/distributedlog-protocol/pom.xml +++ b/distributedlog-protocol/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.5.0-1</version> + <version>${libthrift.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId> @@ -50,37 +50,37 @@ <dependency> <groupId>com.twitter</groupId> <artifactId>finagle-core_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>finagle-thrift_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> + <version>${commons-lang.version}</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.6</version> + <version>${commons-codec.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>net.jpountz.lz4</groupId> <artifactId>lz4</artifactId> - <version>1.2.0</version> + <version>${lz4.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -109,7 +109,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>${maven-jar-plugin.version}</version> <executions> <execution> <goals> @@ -128,12 +128,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> + <version>${maven-checkstyle-plugin.version}</version> <dependencies> <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> - <version>6.19</version> + <version>${puppycrawl.checkstyle.version}</version> </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/46ea899b/distributedlog-service/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-service/pom.xml b/distributedlog-service/pom.xml index 6843e7a..bc10cc2 100644 --- a/distributedlog-service/pom.xml +++ b/distributedlog-service/pom.xml @@ -45,12 +45,12 @@ <dependency> <groupId>com.twitter</groupId> <artifactId>finagle-ostrich4_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>finagle-thriftmux_2.11</artifactId> - <version>${birdcage.sha}</version> + <version>${finagle.version}</version> </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> @@ -71,30 +71,15 @@ </exclusions> </dependency> <dependency> - <groupId>jdiff</groupId> - <artifactId>jdiff</artifactId> - <version>1.0.9</version> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>2.14.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.11</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.5</version> + <version>${mockito.version}</version> <scope>test</scope> </dependency> <dependency> @@ -120,7 +105,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.5.0-1</version> + <version>${libthrift.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId> @@ -130,7 +115,7 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>3.2.1</version> + <version>${curator.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -168,7 +153,7 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> + <version>${maven-assembly-plugin.version}</version> <configuration> <descriptors> <descriptor>../src/assemble/bin.xml</descriptor> @@ -186,7 +171,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>-Xmx3G -Djava.net.preferIPv4Stack=true -XX:MaxDirectMemorySize=2G</argLine> @@ -224,12 +209,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> + <version>${maven-checkstyle-plugin.version}</version> <dependencies> <dependency> <groupId>com.puppycrawl.tools</groupId> <artifactId>checkstyle</artifactId> - <version>6.19</version> + <version>${puppycrawl.checkstyle.version}</version> </dependency> <dependency> <groupId>org.apache.distributedlog</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/46ea899b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ecb3c12..b3700ba 100644 --- a/pom.xml +++ b/pom.xml @@ -94,13 +94,34 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <zookeeper.version>3.5.1-alpha</zookeeper.version> + <!-- dependencies --> <bookkeeper.version>4.3.6-TWTTR-OSS</bookkeeper.version> - <birdcage.sha>6.34.0</birdcage.sha> - <scrooge.version>4.6.0</scrooge.version> - <scrooge-maven-plugin.version>3.17.0</scrooge-maven-plugin.version> <codahale.metrics.version>3.0.1</codahale.metrics.version> + <commons-cli.version>1.1</commons-cli.version> + <commons-codec.version>1.6</commons-codec.version> + <commons-lang.version>2.6</commons-lang.version> + <commons-lang3.version>3.3.2</commons-lang3.version> + <curator.version>3.2.1</curator.version> + <finagle.version>6.34.0</finagle.version> + <guava.version>16.0</guava.version> <jetty.version>8.1.19.v20160209</jetty.version> + <jmock.version>2.8.2</jmock.version> + <junit.version>4.8.1</junit.version> + <libthrift.version>0.5.0-1</libthrift.version> + <lz4.version>1.2.0</lz4.version> + <mockito.version>1.9.5</mockito.version> + <scrooge.version>4.6.0</scrooge.version> + <slf4j.version>1.6.4</slf4j.version> + <stats-util.version>0.0.58</stats-util.version> + <zookeeper.version>3.5.1-alpha</zookeeper.version> + <!-- plugin dependencies --> + <puppycrawl.checkstyle.version>6.19</puppycrawl.checkstyle.version> + <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version> + <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version> + <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version> + <maven-jar-plugin.version>2.2</maven-jar-plugin.version> + <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> + <scrooge-maven-plugin.version>3.17.0</scrooge-maven-plugin.version> </properties> <build> <plugins>
