BACKLOG-22212 Make module compatible with 8.1.5 (#13)

* BACKLOG-22212 Make module compatible with 8.1.5 * BACKLOG-22212 Make module compatible with 8.1.5.1 * BACKLOG-22212 Make module compatible with 8.1.3.0 * BACKLOG-22212 Make module compatible with 8.1.6.1 * BACKLOG-22212 Make module compatible with 8.1.5.0, pass env * BACKLOG-22212 pass env * BACKLOG-22212 Update maven settings * BACKLOG-22212 Add username * BACKLOG-22212 Update on-merge settings * BACKLOG-22212 Import packages
Jahia · Jan 18, 2024 · 602b5c6 · 602b5c6
1 parent 8f8bd1a
commit 602b5c6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 20 deletions.
diff --git a/.github/maven.settings.xml b/.github/maven.settings.xml
@@ -15,7 +15,7 @@
                 <repository>
                     <id>jahia-internal</id>
                     <name>Jahia Internal Repository</name>
-                    <url>${env.NEXUS_INTERNAL_URL}</url>
+                    <url>https://devtools.jahia.com/nexus/content/groups/internal/</url>
                     <releases>
                         <enabled>true</enabled>
                         <updatePolicy>never</updatePolicy>
@@ -41,15 +41,14 @@
 
     <activeProfiles>
         <activeProfile>jahia-internal-repository</activeProfile>
-        <activeProfile>unit-tests</activeProfile>
     </activeProfiles>
 
     <servers>
         <server>
-            <id>jahia-releases</id>
+            <id>jahia-public</id>
             <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
-        </server>    
+        </server>
         <server>
             <id>jahia-enterprise</id>
             <username>${env.NEXUS_USERNAME}</username>
@@ -65,20 +64,13 @@
             <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
-        <server>
-            <id>jahia-enterprise-snapshots</id>
-            <username>${env.NEXUS_USERNAME}</username>
-            <password>${env.NEXUS_PASSWORD}</password>
-        </server>
-        <server>
-            <id>jahia-enterprise-releases</id>
-            <username>${env.NEXUS_USERNAME}</username>
-            <password>${env.NEXUS_PASSWORD}</password>
-        </server>
         <server>
             <id>staging-repository</id>
             <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
     </servers>
+    <pluginGroups>
+        <pluginGroup>org.owasp</pluginGroup>
+    </pluginGroups>
 </settings>
diff --git a/.github/workflows/on-code-change.yml b/.github/workflows/on-code-change.yml
@@ -23,6 +23,8 @@ jobs:
   build:
     name: Build Module
     runs-on: ubuntu-latest
+    env:
+      NEXUS_INTERNAL_URL: https://devtools.jahia.com/nexus/content/groups/internal/
     container:
       image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node
       credentials:
@@ -33,6 +35,8 @@ jobs:
       - uses: jahia/jahia-modules-action/build@v2
         with:
           module_id: richtext-configuration
+          nexus_username: ${{ secrets.NEXUS_USERNAME }}
+          nexus_password: ${{ secrets.NEXUS_PASSWORD }}
 
   integration-tests:
     name: Integration Tests

diff --git a/.github/workflows/on-merge.yml b/.github/workflows/on-merge.yml
@@ -28,6 +28,8 @@ jobs:
     name: Build Module
     needs: update-signature
     runs-on: ubuntu-latest
+    env:
+      NEXUS_INTERNAL_URL: https://devtools.jahia.com/nexus/content/groups/internal/
     container:
       image: jahia/cimg-mvn-cache:ga_cimg_openjdk_11.0.20-node
       credentials:
@@ -38,6 +40,8 @@ jobs:
       - uses: jahia/jahia-modules-action/build@v2
         with:
           module_id: richtext-configuration
+          nexus_username: ${{ secrets.NEXUS_USERNAME }}
+          nexus_password: ${{ secrets.NEXUS_PASSWORD }}
 
 #  sbom:
 #    name: SBOM processing

diff --git a/pom.xml b/pom.xml
@@ -52,7 +52,7 @@
     <parent>
         <artifactId>jahia-modules</artifactId>
         <groupId>org.jahia.modules</groupId>
-        <version>8.2.0.0-SNAPSHOT</version>
+        <version>8.1.5.0</version>
     </parent>
 
     <artifactId>richtext-configuration</artifactId>
@@ -68,11 +68,23 @@
     </scm>
 
     <properties>
+        <jahia.plugin.version>6.9</jahia.plugin.version>
         <jahia-depends>graphql-dxm-provider</jahia-depends>
         <jahia-module-signature>MC0CFHH5gM/Zpl8kOBTjCGqH1xA5pqdaAhUAlUgJeofDw/DfOp6piIOe9St+y+U=</jahia-module-signature>
         <export-package>
             org.jahia.modules.richtext
         </export-package>
+        <import-package>
+            graphql.annotations.annotationTypes;version="[6.5,99)",
+            javax.jcr;version="[2.0,3)",
+            org.jahia.modules.graphql.provider.dxm;version="[2.7,3)",
+            org.jahia.modules.graphql.provider.dxm.osgi.annotations;version="[2.7,3)",
+            org.jahia.osgi,
+            org.jahia.services.content,
+            org.osgi.framework;version="[1.8,2)",
+            org.slf4j;version="[1.7,2)",
+            org.jahia.services
+        </import-package>
     </properties>
 
     <repositories>
@@ -94,7 +106,7 @@
         <dependency>
             <groupId>org.jahia.modules</groupId>
             <artifactId>graphql-dxm-provider</artifactId>
-            <version>2.20.0-SNAPSHOT</version>
+            <version>2.19.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -108,6 +120,11 @@
             <artifactId>owasp-java-html-sanitizer</artifactId>
             <version>20220608.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20231013</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...va/org/jahia/modules/richtext/graphql/query/impl/htmlFiltering/GqlHtmlFilteringQuery.java b/...va/org/jahia/modules/richtext/graphql/query/impl/htmlFiltering/GqlHtmlFilteringQuery.java
@@ -16,13 +16,10 @@
 import org.jahia.services.sites.JahiaSitesService;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.owasp.html.HtmlChangeListener;
-import org.owasp.html.PolicyFactory;
 
-import javax.annotation.Nullable;
+
 import javax.jcr.RepositoryException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;