Workaround for spring-projects/spring-framework#29511

lukas-krecan · Dec 10, 2022 · 8df691f · 8df691f
1 parent 7c6a0c8
commit 8df691f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.../main/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateStorageAccessor.java b/.../main/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateStorageAccessor.java
@@ -21,7 +21,6 @@
 import net.javacrumbs.shedlock.support.annotation.NonNull;
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.dao.DuplicateKeyException;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -66,10 +65,10 @@ public boolean insertRecord(@NonNull LockConfiguration lockConfiguration) {
         try {
             String sql = sqlStatementsSource().getInsertStatement();
             return execute(sql, lockConfiguration);
-        } catch (DuplicateKeyException | ConcurrencyFailureException | TransactionSystemException e) {
+        } catch (DataIntegrityViolationException | ConcurrencyFailureException | TransactionSystemException  e) {
             logger.debug("Duplicate key", e);
             return false;
-        } catch (DataIntegrityViolationException | BadSqlGrammarException | UncategorizedSQLException e) {
+        } catch (BadSqlGrammarException | UncategorizedSQLException e) {
             logger.error("Unexpected exception", e);
             return false;
         }

diff --git a/providers/jdbc/shedlock-test-support-jdbc/pom.xml b/providers/jdbc/shedlock-test-support-jdbc/pom.xml
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
+            <artifactId>ojdbc11</artifactId>
             <version>21.8.0.0</version>
         </dependency>
 

diff --git a/providers/r2dbc/shedlock-provider-r2dbc/pom.xml b/providers/r2dbc/shedlock-provider-r2dbc/pom.xml
@@ -74,7 +74,7 @@
 
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
+            <artifactId>ojdbc11</artifactId>
             <version>21.8.0.0</version>
             <scope>test</scope>
         </dependency>