POMs: exclusion of checker-qual for postgresql dep declared in main POM

Evolveum · Jun 26, 2021 · 0876e65 · 0876e65
1 parent 4687aa0
commit 0876e65
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 38 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -227,13 +227,6 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
-            <exclusions>
-                <!-- in favor of com.google.guava:guava -->
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>

diff --git a/pom.xml b/pom.xml
@@ -1502,6 +1502,20 @@
                 <version>3.0.0</version>
                 <scope>runtime</scope>
             </dependency>
+
+            <!-- Version from Spring Boot, but with checker-qual exclusion. -->
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${postgresql.version}</version>
+                <exclusions>
+                    <!-- in favor of com.google.guava:guava -->
+                    <exclusion>
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1513,13 +1527,12 @@
             <name>Evolveum Public Releases</name>
             <url>https://nexus.evolveum.com/nexus/content/groups/public/</url>
         </repository>
-      <!-- FIXME -->
+        <!-- FIXME -->
         <repository>
             <id>evolveum-snapshots</id>
             <name>Evolveum Snapshots</name>
             <url>https://nexus.evolveum.com/nexus/content/repositories/snapshots/</url>
         </repository>
-      <!-- -->
         <repository>
             <id>spring-milestone</id>
             <name>Spring Milestone Repository</name>
@@ -1539,9 +1552,9 @@
     </repositories>
     <pluginRepositories>
         <pluginRepository>
-          <id>evolveum-nexus</id>
-          <name>Plugin Snapshots</name>
-          <url>https://nexus.evolveum.com/nexus/content/repositories/snapshots/</url>
+            <id>evolveum-nexus</id>
+            <name>Plugin Snapshots</name>
+            <url>https://nexus.evolveum.com/nexus/content/repositories/snapshots/</url>
         </pluginRepository>
         <pluginRepository>
             <id>evolveum</id>

diff --git a/repo/repo-sqale/pom.xml b/repo/repo-sqale/pom.xml
@@ -73,13 +73,6 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <exclusions>
-                <!-- in favor of com.google.guava:guava -->
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/repo/repo-sql-impl-test/pom.xml b/repo/repo-sql-impl-test/pom.xml
@@ -119,13 +119,6 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
-            <exclusions>
-                <!-- in favor of com.google.guava:guava -->
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>

diff --git a/repo/repo-sql-impl/pom.xml b/repo/repo-sql-impl/pom.xml
@@ -141,18 +141,6 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-        <!-- This is not used here directly, but dep plugin is complaining, argh... -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <exclusions>
-                <!-- in favor of com.google.guava:guava -->
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <dependency>
             <groupId>com.querydsl</groupId>