Code Review / ccsdk / parent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 2a65dc4)
Upgrade third party packages for Paris 35/140935/2
authorDan Timoney <dtimoney@att.com>
Tue, 27 May 2025 14:28:25 +0000 (10:28 -0400)
committerDan Timoney <dtimoney@att.com>
Wed, 28 May 2025 14:34:13 +0000 (10:34 -0400)
Upgrade third party versions for Paris to address critical and
high severity vulnerabilities.

Issue-ID: CCSDK-4096

Change-Id: I6f027e3442aa26778304ff768f4a86c4bdb20b6a
Signed-off-by: Dan Timoney <dtimoney@att.com>
dependencies-bom/pom.xml patch | blob | history
dependencies-odl-bom/pom.xml patch | blob | history
odlparent/binding-parent/pom.xml patch | blob | history
odlparent/bundle-parent/pom.xml patch | blob | history
odlparent/feature-repo-parent/pom.xml patch | blob | history
odlparent/karaf4-parent/pom.xml patch | blob | history
odlparent/mdsal-it-parent/pom.xml patch | blob | history
odlparent/odlparent-lite/pom.xml patch | blob | history
odlparent/odlparent/pom.xml patch | blob | history
odlparent/setup/src/main/resources/pom-template.xml patch | blob | history
odlparent/single-feature-parent/pom.xml patch | blob | history

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 3b3b229..49d13f2 100644 (file)
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -194,7 +194,7 @@
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
-                <version>10.14.2.0</version>
+                <version>10.17.1.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -240,7 +240,7 @@
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
-                <version>1.4.1</version>
+                <version>1.5.4</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
@@ -264,7 +264,7 @@
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
                 <!-- ODL has 20131018 -->
-                <version>20201115</version>
+                <version>20231013</version>
             </dependency>
             <dependency>
                 <groupId>org.jsoup</groupId>
@@ -328,17 +328,17 @@
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
-                <version>2.7.0</version>
+                <version>2.12.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-scp</artifactId>
-                <version>2.7.0</version>
+                <version>2.12.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-sftp</artifactId>
-                <version>2.7.0</version>
+                <version>2.12.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 27b81a7..a69ff87 100644 (file)
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -167,10 +167,27 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.17.1.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
-                <version>2.10.0</version>
+                <version>2.12.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jettison</groupId>
+                <artifactId>jettison</artifactId>
+                <version>1.5.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <!-- ODL has 20131018 -->
+                <version>20231013</version>
             </dependency>
             <!-- Below highstreet odl artifacts -->
             <dependency>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index ad1626b..1200ebd 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 2d22102..a91a450 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 4844ee1..aad6fc8 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index b7def70..d0d7bbb 100644 (file)
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index a6b4cf2..17de82b 100644 (file)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 6c62eb4..4743c8f 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 9460301..712ff20 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 8fcbea3..c33f0a4 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>\${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>\${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 3c65f76..3b59af7 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -170,7 +170,7 @@
         <!-- Managed dependency versions -->
         <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
@@ -235,6 +235,11 @@
                 <artifactId>antlr4</artifactId>
                 <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
Parent POMs to be used by CCSDK clients