Merge pull request #64 from aashikam/build-issue

Remove unrelated dependencies
ballerina-attic · Sep 10, 2020 · c65e5c5 · c65e5c5
2 parents 54730db + 9a18a5f
commit c65e5c5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/cassandra-utils/pom.xml b/cassandra-utils/pom.xml
@@ -63,6 +63,14 @@
             <artifactId>cassandra-unit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
@@ -93,6 +101,7 @@
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
+                            <excludeTransitive>true</excludeTransitive>
                         </configuration>
                     </execution>
                 </executions>
@@ -110,11 +119,6 @@
                             <artifactSet>
                                 <includes>
                                     <include>${project.groupId}:${project.artifactId}</include>
-                                    <include>io.lettuce:lettuce-core</include>
-                                    <include>io.projectreactor:reactor-core</include>
-                                    <include>org.reactivestreams:reactive-streams</include>
-                                    <include>org.apache.commons:commons-pool2</include>
-                                    <include>com.github.kstyrc:embedded-redis</include>
                                     <include>com.google.guava:guava</include>
                                     <include>commons-io:commons-io</include>
                                     <include>io.netty:netty-all</include>

diff --git a/cassandra/Ballerina.toml b/cassandra/Ballerina.toml
@@ -19,20 +19,6 @@ artifactId = "cassandra-driver-core"
 version = "3.6.0"
 groupId = "com.datastax.cassandra"
 
-[[platform.libraries]]
-module = "cassandra"
-path = "../cassandra-utils/target/classes/lib/cassandra-all-3.11.2.jar"
-artifactId = "cassandra-all"
-version = "3.11.2"
-groupId = "com.datastax.cassandra"
-
-[[platform.libraries]]
-module = "cassandra"
-path = "../cassandra-utils/target/classes/lib/cassandra-thrift-3.11.2.jar"
-artifactId = "cassandra-thrift"
-version = "3.11.2"
-groupId = "com.datastax.cassandra"
-
 [[platform.libraries]]
 module = "cassandra"
 path = "../cassandra-utils/target/classes/lib/guava-19.0.jar"

diff --git a/pom.xml b/pom.xml
@@ -132,6 +132,16 @@
                 <artifactId>ballerina-lang</artifactId>
                 <version>${ballerina.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-core</artifactId>
+                <version>${metrics.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.ballerinalang</groupId>
                 <artifactId>ballerina-core</artifactId>
@@ -287,10 +297,10 @@
     <properties>
         <project.scm.id>my-scm-server</project.scm.id>
         <ballerina.version>2.0.0-Preview1</ballerina.version>
+        <guava.version>19.0</guava.version>
+        <metrics.version>3.2.2</metrics.version>
         <cassandra.version>3.6.0</cassandra.version>
         <netty.version>4.1.49.Final</netty.version>
-        <com.google.guava.version>19.0</com.google.guava.version>
-        <io.dropwizard.metrics.version>3.1.2</io.dropwizard.metrics.version>
         <mvn.processor.plugin.version>2.2.4</mvn.processor.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>