diff options
author | Piotr Darosz <piotr.darosz@nokia.com> | 2019-06-13 12:56:13 +0200 |
---|---|---|
committer | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-06-19 07:13:24 +0000 |
commit | a67f45c2ab3ec438061d2bd066c8daa41b81d5bc (patch) | |
tree | fe73587d48f583a832582fbffe0fc419fb532487 | |
parent | c82ace5a5ed259b0fd4dec29a414046fd3be9c6e (diff) |
Upgrade libthrift
Upgrade libthrift to the newest version.
Change-Id: I371acaec6d2e3f79f997c86a0b6051d3612f88db
Issue-ID: SDC-2264
Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
-rw-r--r-- | asdctool/pom.xml | 9 | ||||
-rw-r--r-- | catalog-be/pom.xml | 9 | ||||
-rw-r--r-- | catalog-dao/pom.xml | 9 | ||||
-rw-r--r-- | catalog-model/pom.xml | 9 | ||||
-rw-r--r-- | pom.xml | 1 | ||||
-rw-r--r-- | test-apis-ci/pom.xml | 9 |
6 files changed, 46 insertions, 0 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 762d749164..bfc1f00d43 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -237,6 +237,10 @@ <artifactId>groovy</artifactId> <groupId>org.codehaus.groovy</groupId> </exclusion> + <exclusion> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </exclusion> </exclusions> </dependency> @@ -396,6 +400,11 @@ <version>${cassandra.driver.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> <!-- CASSANDRA END --> diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index a68174cd3b..fbab1e36b7 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -319,6 +319,10 @@ <artifactId>commons-collections</artifactId> <groupId>commons-collections</groupId> </exclusion> + <exclusion> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </exclusion> </exclusions> </dependency> @@ -419,6 +423,11 @@ <version>${cassandra.driver.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> <!-- CASSANDRA END --> <!-- Inserted for ECOMP Portal Integration --> diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 3e04560aa6..360a23a271 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -304,6 +304,10 @@ Modifications copyright (c) 2018 Nokia <groupId>org.apache.cassandra</groupId> <artifactId>cassandra-all</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -312,6 +316,11 @@ Modifications copyright (c) 2018 Nokia <version>3.11.3</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> <!-- CASSANDRA END --> <dependency> diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index a28a040640..579d231590 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -127,6 +127,10 @@ <artifactId>groovy</artifactId> <groupId>org.codehaus.groovy</groupId> </exclusion> + <exclusion> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </exclusion> </exclusions> </dependency> @@ -178,6 +182,11 @@ <version>${cassandra.driver.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> <!-- CASSANDRA END --> <dependency> @@ -125,6 +125,7 @@ Modifications copyright (c) 2018 Nokia <!--cassandra --> <cassandra.driver.version>3.0.0</cassandra.driver.version> + <libthrift.version>0.12.0</libthrift.version> <!-- maven central (Nexus) --> <nexus.id.release>nexus</nexus.id.release> <nexus.id.snapshot>nexus</nexus.id.snapshot> diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 2bbf089840..ccfd79f035 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -243,6 +243,10 @@ <artifactId>groovy</artifactId> <groupId>org.codehaus.groovy</groupId> </exclusion> + <exclusion> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </exclusion> </exclusions> </dependency> @@ -380,6 +384,11 @@ <version>${cassandra.driver.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> <!-- CASSANDRA END --> <dependency> |