Merge branch 'release/29.x'

* release/29.x: #4192 - Upgrade dependencies #4192 - Upgrade dependencies % Conflicts: % inception/inception-bootstrap/src/main/ts_template/package-lock.json % inception/inception-brat-editor/src/main/ts_template/package-lock.json % inception/inception-diam-editor/src/main/ts_template/package-lock.json % inception/inception-diam/src/main/ts_template/package-lock.json % inception/inception-external-editor/src/main/ts_template/package-lock.json % inception/inception-html-apache-annotator-editor/src/main/ts_template/package-lock.json % inception/inception-html-editor/src/main/ts_template/package-lock.json % inception/inception-html-recogito-editor/src/main/ts_template/package-lock.json % inception/inception-js-api/src/main/ts_template/package-lock.json % inception/inception-pdf-editor/src/main/ts_template/package-lock.json % inception/inception-pdf-editor2/src/main/ts_template/package-lock.json % inception/inception-project-export/src/main/ts_template/package-lock.json % inception/inception-recommendation/src/main/ts_template/package-lock.json % inception/inception-ui-dashboard-activity/src/main/ts_template/package-lock.json % inception/inception-ui-kb/src/main/ts_template/package-lock.json % inception/inception-ui-search/src/main/ts_template/package-lock.json % inception/update-package-lock.sh % pom.xml
inception-project · Sep 19, 2023 · f80ea97 · f80ea97
2 parents 3b8ee1d + 8519b8e
commit f80ea97
Show file tree

Hide file tree

Showing 21 changed files with 4,461 additions and 3,328 deletions.
diff --git a/inception/inception-bootstrap/src/main/ts_template/package-lock.json b/inception/inception-bootstrap/src/main/ts_template/package-lock.json
diff --git a/inception/inception-brat-editor/src/main/ts_template/package-lock.json b/inception/inception-brat-editor/src/main/ts_template/package-lock.json
diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml
@@ -150,7 +150,7 @@
       <dependency>
         <groupId>com.nimbusds</groupId>
         <artifactId>nimbus-jose-jwt</artifactId>
-        <version>9.31</version>
+        <version>9.35</version>
       </dependency>
       <dependency>
         <groupId>org.awaitility</groupId>
@@ -553,6 +553,11 @@
         <artifactId>jul-to-slf4j</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-reload4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>org.jboss.logging</groupId>
@@ -588,7 +593,7 @@
       <dependency>
         <groupId>com.github.openjson</groupId>
         <artifactId>openjson</artifactId>
-        <version>1.0.12</version>
+        <version>1.0.13</version>
       </dependency>
 
       <dependency>
@@ -646,12 +651,12 @@
       <dependency>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>
-        <version>1.14.5</version>
+        <version>1.14.8</version>
       </dependency>
       <dependency>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy-agent</artifactId>
-        <version>1.14.5</version>
+        <version>1.14.8</version>
       </dependency>
       <dependency>
         <groupId>org.wicketstuff</groupId>
@@ -697,7 +702,7 @@
       <dependency>
         <groupId>com.networknt</groupId>
         <artifactId>json-schema-validator</artifactId>
-        <version>1.0.83</version>
+        <version>1.0.87</version>
       </dependency>
 
       <!-- SPRING SECURITY -->
@@ -711,7 +716,7 @@
       <dependency>
         <groupId>com.nimbusds</groupId>
         <artifactId>oauth2-oidc-sdk</artifactId>
-        <version>9.43.1</version>
+        <version>9.43.3</version>
       </dependency>
       <dependency>
         <groupId>io.jsonwebtoken</groupId>
@@ -946,7 +951,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.23.0</version>
+        <version>1.24.0</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
@@ -961,7 +966,7 @@
       <dependency>
         <groupId>com.github.ben-manes.caffeine</groupId>
         <artifactId>caffeine</artifactId>
-        <version>3.1.7</version>
+        <version>3.1.8</version>
       </dependency>
       <dependency>
         <groupId>org.xerial.snappy</groupId>
@@ -1145,7 +1150,7 @@
       <dependency>
         <groupId>org.eclipse.jgit</groupId>
         <artifactId>org.eclipse.jgit</artifactId>
-        <version>5.13.1.202206130422-r</version>
+        <version>6.7.0.202309050840-r</version>
       </dependency>
 
       <dependency>
@@ -1230,18 +1235,18 @@
       <dependency>
         <groupId>org.apache.ant</groupId>
         <artifactId>ant</artifactId>
-        <version>1.10.13</version>
+        <version>1.10.14</version>
       </dependency>
 
       <dependency>
         <groupId>info.picocli</groupId>
         <artifactId>picocli</artifactId>
-        <version>4.7.4</version>
+        <version>4.7.5</version>
       </dependency>
       <dependency>
         <groupId>info.picocli</groupId>
         <artifactId>picocli-spring-boot-starter</artifactId>
-        <version>4.7.4</version>
+        <version>4.7.5</version>
       </dependency>
 
       <dependency>
@@ -1277,6 +1282,11 @@
         <artifactId>log4j-spring-boot</artifactId>
         <version>${log4j2.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-to-slf4j</artifactId>
+        <version>${log4j2.version}</version>
+      </dependency>
 
       <dependency>
         <!-- Import dependency management from Spring Boot -->
@@ -1332,7 +1342,7 @@
       <dependency>
         <groupId>org.apache.ivy</groupId>
         <artifactId>ivy</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>