Merge branch 'main' into fix/WW-5446-jsp-clickable

apache · Aug 21, 2024 · 9d0ca5d · 9d0ca5d
2 parents 5bd7959 + 674d035
commit 9d0ca5d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -13,7 +13,7 @@ notifications:
 github:
   del_branch_on_merge: true
   protected_branches:
-    master:
+    main:
       # contexts are the names of checks that must pass.
       contexts:
         - gradle

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,6 +27,7 @@ intellij {
         "com.intellij.freemarker",
         "com.intellij.velocity",
         "org.intellij.groovy",
+        "com.intellij.jsp",
         "JavaScript",
         "com.intellij.java-i18n"
     ))

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,4 +5,4 @@ pluginManagement {
     }
 }
 
-rootProject.name = "struts-intellij-plugin"
+rootProject.name = "struts"
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<idea-plugin url="https://confluence.jetbrains.com/display/IDEADEV/Struts+2+Plugin+for+IntelliJ+IDEA"
+<idea-plugin url="https://struts.apache.org/idea-plugin"
              xmlns:xi="http://www.w3.org/2001/XInclude" package="com.intellij.struts2">
 
     <id>com.intellij.struts2</id>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ pluginManagement { @@
         }
     }
-    rootProject.name = "struts-intellij-plugin"
+    rootProject.name = "struts"