Skip to content

Expose dependency versions as properties so they may be overriden. #297

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
olim7t merged 1 commit into from
Mar 13, 2015
Merged

Expose dependency versions as properties so they may be overriden. #297

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
22 changes: 9 additions & 13 deletions driver-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,19 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.9.0.Final</version>
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<!--
We use an old version of Guava to be compatible with Spark 1.1.
Check with the spark-cassandra-connector team before upgrading this.
-->
<version>14.0.1</version>
<version>${guava.version}</version>
</dependency>

<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.0.2</version>
<version>${metrics.version}</version>
</dependency>

<!-- Compression libraries for the protocol. -->
Expand All @@ -55,14 +51,14 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.0.5</version>
<version>${snappy.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>net.jpountz.lz4</groupId>
<artifactId>lz4</artifactId>
<version>1.2.0</version>
<version>${lz4.version}</version>
<optional>true</optional>
</dependency>

Expand All @@ -71,29 +67,29 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
<version>${testng.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>1.7.0</version>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.8</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.scassandra</groupId>
<artifactId>java-client</artifactId>
<!-- N.B. later versions of scassandra require JDK 7 -->
<version>0.4.1</version>
<version>${scassandra.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
4 changes: 2 additions & 2 deletions driver-examples/osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.6</version>
<version>${slf4j-log4j12.version}</version>
<scope>test</scope>
</dependency>

Expand Down
25 changes: 21 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,37 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cassandra.version>2.0.10</cassandra.version>
<java.version>1.6</java.version>
<log4j.version>1.2.17</log4j.version>
<slf4j-log4j12.version>1.7.6</slf4j-log4j12.version>
<!--
We use an old version of Guava to be compatible with Spark 1.1.
Check with the spark-cassandra-connector team before upgrading this.
-->
<guava.version>14.0.1</guava.version>
<netty.version>3.9.0.Final</netty.version>
<metrics.version>3.0.2</metrics.version>
<snappy.version>1.0.5</snappy.version>
<lz4.version>1.2.0</lz4.version>
<!-- test dependency versions -->
<testng.version>6.8.8</testng.version>
<assertj.version>1.7.0</assertj.version>
<mockito.version>1.10.8</mockito.version>
<scassandra.version>0.4.1</scassandra.version>
</properties>

<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.6</version>
<version>${slf4j-log4j12.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -74,8 +91,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>${java.version}</source>
<target>${java.version}</target>
<optimize>true</optimize>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
Expand Down