Skip to content

Remove guava override as web-commons-bom no longer conflicts #148

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

Open
rnc wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −19
Open

Remove guava override as web-commons-bom no longer conflicts #148

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
10 changes: 1 addition & 9 deletions pathdb/datastax/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,11 @@
<artifactId>cassandra-driver-mapping</artifactId>
<version>${cassandraVersion}</version>
</dependency>
<!-- web-commons-bom:26 has guava 18. bom versions above that have 29 or 31. This
conflicts with cassandra-unit which requires 21 or less. Also CassandraPathDB
uses code that has been deprecated in later versions of guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
</dependency>
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
<version>${cassandraUnitVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
11 changes: 1 addition & 10 deletions storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@
<artifactId>path-mapped-pathdb-jpa</artifactId>
<scope>test</scope>
</dependency>
<!-- web-commons-bom:26 has guava 18. bom versions above that have 29 or 31. This
conflicts with cassandra-unit which requires 21 or less -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
Expand Down Expand Up @@ -121,5 +113,4 @@
</plugins>
</pluginManagement>
</build>

</project>
</project>
Loading