Merge branch 'branches/rudder/8.2'

openscap/Makefile

@@ -5,8 +5,8 @@ PROXY_ENV = $(if $(PROXY), http_proxy=$(PROXY) ftp_proxy=$(PROXY))
 # grep 'GET=' */SOURCES/Makefile to patch everywhere
 GET=get() { $(PROXY_ENV) curl -s -L -o "$$1.part" "$$2" && { openssl dgst -sha256 "$$1.part" | grep -q "$$3" || { echo "Wrong checksum, aborting"; exit 1; }; } && mv "$$1.part" "$$1"; }; get
 
-FILES = antisamy.xml openscap.properties openscap_technique.zip
-SCRIPTS = postinst 
+FILES = openscap_technique.zip
+SCRIPTS = postinst
 
 #include ../makefiles/common-plugin.mk
 include ../makefiles/common-scala-plugin.mk
@@ -22,9 +22,6 @@ target/openscap_technique.zip: target/rudderc
 target/remove_configuration:
 	cp packaging/remove_configuration target/remove_configuration
 
-target/antisamy.xml:
-	cp src/main/resources/antisamy.xml target/antisamy.xml
-
 target/openscap.properties:
 	cp src/main/resources/openscap.properties target/openscap.properties
 

openscap/pom-template.xml

@@ -45,22 +45,16 @@
   <dependencies>
     <!-- Add other plugin specific dependencies -->
     <dependency>
-      <groupId>org.owasp.antisamy</groupId>
-      <artifactId>antisamy</artifactId>
-      <version>1.7.6</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>slf4j-simple</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+      <version>1.18.3</version>
     </dependency>
 
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
-    
+
   </dependencies>
 
   <!-- Below is an horrible if/then/else in maven. You shouldn't have anything to change here -->