Merge pull request #709 from niehusa/10.2

[SP-6635] Backport of PPP-4895 - Vulnerable Component: Jettison
pentaho · Nov 29, 2024 · 01a86c2 · 01a86c2
2 parents 3e967ee + 7f7c3ba
commit 01a86c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -67,6 +67,12 @@
       <artifactId>blueprints-core</artifactId>
       <version>${dependency.com.tinkerpop.blueprints.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.jettison</groupId>
+          <artifactId>jettison</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sf.flexjson</groupId>

diff --git a/assemblies/plugin/src/assembly/assembly.xml b/assemblies/plugin/src/assembly/assembly.xml
@@ -30,6 +30,7 @@
         <exclude>org.pentaho.*</exclude>
         <exclude>com.tinkerpop.blueprints:*</exclude>
         <exclude>pentaho:pentaho-metaverse-core:jar</exclude>
+        <exclude>org.codehaus.jettison:*</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>

diff --git a/core/pom.xml b/core/pom.xml
@@ -59,6 +59,12 @@
       <artifactId>blueprints-core</artifactId>
       <version>${dependency.com.tinkerpop.blueprints.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.jettison</groupId>
+          <artifactId>jettison</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-configuration</groupId>