Merge pull request #180 from jenkinsci/csp-refactoring

CSP: Extract inline JS into an adjunct
jenkinsci · Feb 23, 2024 · c8ec914 · c8ec914
2 parents bd49ca3 + 167b98b
commit c8ec914
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
           check-latest: true
           cache: 'maven'
       - name: Set up Maven
-        uses: stCarolas/setup-maven@v4.5
+        uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.9.6
       - name: Build with Maven

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -38,7 +38,7 @@ jobs:
           cache: maven
 
       - name: Set up Maven
-        uses: stCarolas/setup-maven@v4.5
+        uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.9.6
 

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -23,7 +23,7 @@ jobs:
           check-latest: true
           cache: 'maven'
       - name: Set up Maven
-        uses: stCarolas/setup-maven@v4.5
+        uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.9.6
       - name: Generate coverage with JaCoCo

diff --git a/src/main/resources/io/jenkins/plugins/jquery3.jelly b/src/main/resources/io/jenkins/plugins/jquery3.jelly
@@ -2,17 +2,14 @@
 <!--
 Use it like <st:adjunct includes="io.jenkins.plugins.jquery3"/>
 -->
-<j:jelly xmlns:j="jelly:core">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
 
   <j:new var="h" className="hudson.Functions" />
   ${h.initPageVariables(context)}
 
   <script type="text/javascript" src="${resURL}/plugin/jquery3-api/js/jquery.min.js"/>
   <script type="text/javascript" src="${resURL}/plugin/jquery3-api/plugins/visible.js"/>
 
-  <script>
-    const jQuery3 = $;
-    jQuery3.noConflict();
-  </script>
+  <st:adjunct includes="io.jenkins.plugins.jquery3.init-constant"/>
 
 </j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/jquery3/init-constant.js b/src/main/resources/io/jenkins/plugins/jquery3/init-constant.js
@@ -0,0 +1,2 @@
+const jQuery3 = $;
+jQuery3.noConflict();