Use Guava 30.0 in all children (#101)

eclipse · Jun 5, 2021 · 1b7a55b · 1b7a55b
1 parent 88366ac
commit 1b7a55b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 
 ### Fixed
 
+- Make sure every Lyo dependency uses the same version of Guava (30.0)
 
 ## [4.0.0] - 2020-12-16
 

diff --git a/pom.xml b/pom.xml
@@ -24,6 +24,7 @@
     <v.slf4j>1.7.30</v.slf4j>
     <v.servlet>3.1.0</v.servlet>
     <v.httpclient>4.5.13</v.httpclient>
+    <v.guava>30.0-jre</v.guava>
   </properties>
 
 
@@ -192,11 +193,6 @@
         <version>${v.lyo}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>30.0-jre</version>
-      </dependency>
       <dependency>
         <!-- CQ 6577 -->
         <groupId>javax.xml.bind</groupId>
@@ -337,6 +333,11 @@
         <artifactId>commons-io</artifactId>
         <version>2.8.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${v.guava}</version>
+      </dependency>
 
       <!--Convergence-->
       <dependency>

diff --git a/store/pom.xml b/store/pom.xml
@@ -49,11 +49,6 @@
         <artifactId>slf4j-api</artifactId>
         <version>${v.slf4j}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>30.0-jre</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>

diff --git a/trs/client/pom.xml b/trs/client/pom.xml
@@ -85,12 +85,6 @@
         <artifactId>oslc4j-core</artifactId>
         <version>${v.lyo}</version>
       </dependency>
-
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>28.0-jre</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.rdf4j</groupId>
         <artifactId>rdf4j-repository-sparql</artifactId>

diff --git a/trs/server/pom.xml b/trs/server/pom.xml
@@ -144,7 +144,6 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>26.0-jre</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -55,11 +55,9 @@
       <type>pom</type>
     </dependency>-->
 
-    <!-- Guava Library -->
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>30.0-jre</version>
     </dependency>
 
     <!-- OSLC Core Libraries -->