diff --git a/assembly/pom.xml b/assembly/pom.xml index 56a801de1..ab349ad7f 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -206,11 +206,6 @@ struts2-tiles-plugin - - org.apache.struts - struts2-oval-plugin - - org.apache.struts struts2-json-plugin diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index 8dcb1856c..7be72203c 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -78,14 +78,6 @@ SITEMESH-LICENSE.txt - - ../plugins/oval/src/main/resources - - - OVAL-LICENSE.txt - XSTREAM-LICENSE.txt - - target/apps apps @@ -161,10 +153,6 @@ ../plugins/osgi/target/apidocs docs/struts2-plugins/struts2-osgi-plugin/apidocs - - ../plugins/oval/target/apidocs - docs/struts2-plugins/struts2-oval-plugin/apidocs - ../plugins/plexus/target/apidocs docs/struts2-plugins/struts2-plexus-plugin/apidocs diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index 641419eb9..344c91f7b 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -96,10 +96,6 @@ ../plugins/osgi/target/apidocs docs/struts2-plugins/struts2-osgi-plugin/apidocs - - ../plugins/oval/target/apidocs - docs/struts2-plugins/struts2-oval-plugin/apidocs - ../plugins/plexus/target/apidocs docs/struts2-plugins/struts2-plexus-plugin/apidocs diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml index f40bfb26c..b03f2d3cc 100644 --- a/assembly/src/main/assembly/lib.xml +++ b/assembly/src/main/assembly/lib.xml @@ -78,13 +78,5 @@ SITEMESH-LICENSE.txt - - ../plugins/oval/src/main/resources - - - OVAL-LICENSE.txt - XSTREAM-LICENSE.txt - - diff --git a/bom/pom.xml b/bom/pom.xml index 0e184e248..1e20d6f61 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -116,11 +116,6 @@ struts2-osgi-plugin ${struts-version.version} - - org.apache.struts - struts2-oval-plugin - ${struts-version.version} - org.apache.struts struts2-plexus-plugin diff --git a/pom.xml b/pom.xml index 4f2f7b85d..0a4a2500c 100644 --- a/pom.xml +++ b/pom.xml @@ -604,11 +604,6 @@ struts2-testng-plugin ${project.version} - - org.apache.struts - struts2-oval-plugin - ${project.version} - org.apache.struts struts2-json-plugin diff --git a/src/etc/project-suppression.xml b/src/etc/project-suppression.xml index be1c572b1..38324163d 100644 --- a/src/etc/project-suppression.xml +++ b/src/etc/project-suppression.xml @@ -148,36 +148,6 @@ ^pkg:maven/org\.codehaus\.plexus/plexus\-utils@.*$ Possible XML Injection - - - ^pkg:maven/net\.sf\.oval/oval@.*$ - cpe:/a:apache:groovy - - - - ^pkg:maven/net\.sf\.oval/oval@.*$ - cpe:/a:apache:log4j - - - - ^pkg:maven/net\.sf\.oval/oval@.*$ - cpe:/a:jruby:jruby - - - - ^pkg:maven/net\.sf\.oval/oval@.*$ - cpe:/a:xstream_project:xstream - - - - ^pkg:maven/com\.thoughtworks\.xstream/xstream@.*$ - CVE-2022-40151 - CVE-2022-40152 - CVE-2022-40153 - CVE-2022-40154 - CVE-2022-40155 - CVE-2022-40156 -