Merge pull request #4970 from inception-project/refactoring/4909-Upgr…

…ade-dependencies #4909 - Upgrade dependencies (34.0)
inception-project · Jul 30, 2024 · cb011a6 · cb011a6
2 parents 3d32225 + d92967f
commit cb011a6
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 97 deletions.
diff --git a/inception/inception-app-webapp/pom.xml b/inception/inception-app-webapp/pom.xml
@@ -561,7 +561,7 @@
     <!-- SENTRY DEPENDENCIES -->
     <dependency>
       <groupId>io.sentry</groupId>
-      <artifactId>sentry-spring-boot-starter</artifactId>
+      <artifactId>sentry-spring-boot-starter-jakarta</artifactId>
     </dependency>
     <dependency>
       <groupId>io.sentry</groupId>
@@ -725,8 +725,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -1044,16 +1044,16 @@
               <usedDependency>org.hsqldb:hsqldb</usedDependency>
               <usedDependency>org.mariadb.jdbc:mariadb-java-client</usedDependency>
               <usedDependency>com.microsoft.sqlserver:mssql-jdbc</usedDependency>
-              <usedDependency>mysql:mysql-connector-java</usedDependency>
               <usedDependency>org.postgresql:postgresql</usedDependency>
+              <usedDependency>com.mysql:mysql-connector-j</usedDependency>
               <!-- Logging - used via reflection / optional -->
               <usedDependency>com.mattbertolini:liquibase-slf4j</usedDependency>
               <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
               <usedDependency>org.apache.logging.log4j:log4j-slf4j2-impl</usedDependency>
               <usedDependency>org.apache.logging.log4j:log4j-core</usedDependency>
               <usedDependency>org.apache.logging.log4j:log4j-layout-template-json</usedDependency>
               <!-- Monitoring - used via reflection / optional -->
-              <usedDependency>io.sentry:sentry-spring-boot-starter</usedDependency>
+              <usedDependency>io.sentry:sentry-spring-boot-starter-jakarta</usedDependency>
               <usedDependency>io.sentry:sentry-log4j2</usedDependency>
               <!-- Themes -->
               <usedDependency>org.wicketstuff:wicketstuff-kendo-ui-theme-bootstrap</usedDependency>

diff --git a/inception/inception-build/src/main/resources/inception/rules.xml b/inception/inception-build/src/main/resources/inception/rules.xml
@@ -23,6 +23,7 @@
     <ignoreVersion type="regex">(?i).*[-_\.]b[0-9\.]*</ignoreVersion>
     <ignoreVersion type="regex">(?i).*[-_\.]M[0-9\.]*</ignoreVersion>
     <ignoreVersion type="regex">(?i).*[-_\.]rc[0-9\.-]*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*[-_\.]Dev[0-9\.-]*</ignoreVersion>
     <ignoreVersion type="regex">(?i).*[-_\.]alpha[0-9\.-]*</ignoreVersion>
     <ignoreVersion type="regex">(?i).*[-_\.]beta[0-9\.-]*</ignoreVersion>
     <!-- e.g. commons-collections:commons-collections ... 3.2.1.redhat-7 -> 20040117.000000 -->