This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5445-struts6 in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
discard 45d0f28 WW-5445 Adds support for Struts 6 add 598b2fb Prepares IP Clearance form add 8ea7956 Updates header with proper license add 9c49dd5 Uses Gradle RAT plugin add 7116158 Adds missing headers to test data files add 3d50d31 Adds GH Actions workflow add edcaab7 Upgrades gradle wrapper add 1b64e8a Upgrades to the latest IDEA version add bc89d7e Uses proper build task add c8793ec Merge pull request #1 from apache/feature/ip-clearance add 0ab4d96 WW-5445 Adds support for Struts 6 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (45d0f28) \ N -- N -- N refs/heads/feature/WW-5445-struts6 (0ab4d96) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/gradle.yml | 44 ++++ .gitignore | 5 +- build.gradle.kts | 20 ++ docs/ip-clearance-struts-idea-plugin.xml | 237 +++++++++++++++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 41 ++-- gradlew.bat | 35 +-- settings.gradle.kts | 2 +- src/main/grammar/apache2.txt | 12 +- src/main/grammar/ognl.bnf | 24 ++- .../com/intellij/struts2/Struts2IconProvider.java | 25 ++- .../java/com/intellij/struts2/Struts2Icons.java | 17 +- .../struts2/Struts2PresentationProvider.java | 13 +- .../struts2/Struts2ProblemFileHighlightFilter.java | 13 +- .../struts2/dom/struts/constant/package-info.java | 21 +- .../com/intellij/struts2/facet/package-info.java | 21 +- .../java/com/intellij/struts2/facet/struts2.xml | 22 +- .../struts2/facet/ui/FeaturesConfigurationTab.form | 18 ++ .../struts2/facet/ui/FileSetConfigurationTab.form | 18 ++ .../intellij/struts2/facet/ui/FileSetEditor.form | 18 ++ .../intellij/struts2/facet/ui/package-info.java | 21 +- .../intellij/struts2/freemarker/package-info.java | 19 ++ .../ConstantValueConverterClassContributor.java | 20 +- .../struts2/model/jam/convention/package-info.java | 21 +- .../intellij/struts2/model/jam/package-info.java | 21 +- .../resolve/variable/OgnlVariableReference.java | 21 +- .../struts2/preview/Struts2UrlConverter.java | 19 +- .../intellij/struts2/reference/package-info.java | 21 +- .../struts2/reference/web/package-info.java | 21 +- .../lang/ognl/OgnlCodeInsightSanityTest.java | 21 +- .../java/com/intellij/lang/ognl/OgnlTestUtils.java | 25 ++- .../intellij/lang/ognl/OgnlTypedHandlerTest.java | 37 ++-- .../ognl/completion/OgnlCompletionTestCase.java | 25 ++- .../OgnlFqnTypeExpressionCompletionTest.java | 24 ++- .../ognl/completion/OgnlKeywordCompletionTest.java | 25 ++- .../OgnlVariableExpressionCompletionTest.java | 25 ++- .../lang/ognl/formatting/OgnlFormattingTest.java | 25 ++- .../ognl/highlight/OgnlHighlightingLexerTest.java | 31 +-- .../intellij/lang/ognl/lexer/OgnlLexerTest.java | 31 +-- .../lang/ognl/template/OgnlLiveTemplatesTest.java | 25 ++- src/test/testData/configsSearcher/struts.xml | 22 +- src/test/testData/freemarker/MyTestAction.java | 19 ++ .../testData/gutterJava/actionClass/MyAction.java | 21 +- .../com/MyValidationAction-validation.xml | 22 +- .../actionClass/com/MyValidationAction.java | 22 +- .../struts-actionClass-multiple_mappings.xml | 22 +- .../gutterJava/actionClass/struts-actionClass.xml | 22 +- .../gutterJava/actionClass/struts-validation.xml | 22 +- .../testData/gutterJsp/actionClass/MyAction.java | 21 +- .../jsp/test_gutter_action_attribute.jsp | 21 +- .../actionClass/jsp/test_gutter_name_attribute.jsp | 21 +- .../gutterJsp/actionClass/struts-actionClass.xml | 22 +- .../hardcodedUrl/customActionExtension.jsp | 21 +- .../hardcodedUrl/customActionExtension_after.jsp | 21 +- .../jsp/inspection/hardcodedUrl/customTag.jsp | 21 +- .../inspection/hardcodedUrl/customTag_after.jsp | 21 +- .../jsp/inspection/hardcodedUrl/dynamic.jsp | 21 +- .../testData/jsp/inspection/hardcodedUrl/host.jsp | 21 +- .../jsp/inspection/hardcodedUrl/method.jsp | 21 +- .../jsp/inspection/hardcodedUrl/method_after.jsp | 21 +- .../jsp/inspection/hardcodedUrl/multiParams.jsp | 21 +- .../inspection/hardcodedUrl/multiParamsEscaped.jsp | 21 +- .../hardcodedUrl/multiParamsEscaped_after.jsp | 21 +- .../inspection/hardcodedUrl/multiParams_after.jsp | 21 +- .../jsp/inspection/hardcodedUrl/namespace.jsp | 21 +- .../inspection/hardcodedUrl/namespace_after.jsp | 21 +- .../jsp/inspection/hardcodedUrl/oneParam.jsp | 21 +- .../jsp/inspection/hardcodedUrl/oneParam_after.jsp | 21 +- .../jsp/inspection/hardcodedUrl/protocol.jsp | 21 +- .../jsp/inspection/hardcodedUrl/simple.jsp | 21 +- .../hardcodedUrl/simpleTaglibPrefixDefined.jsp | 21 +- .../simpleTaglibPrefixDefined_after.jsp | 21 +- .../jsp/inspection/hardcodedUrl/simple_after.jsp | 21 +- .../jsp/inspection/hardcodedUrl/struts.properties | 19 +- .../jsp/inspection/hardcodedUrl/struts.xml | 22 +- src/test/testData/jsp/ognl/WEB-INF/web.xml | 22 +- .../jsp/ognl/struts2-jsp-variables-completion.jsp | 21 +- .../testData/jsp/ognl/taglib-ognl-injection.jsp | 19 ++ .../testData/model/constant/noCustom/dummy.xml | 20 ++ .../testData/model/constant/noCustom/struts.xml | 22 +- .../model/constant/withPluginXml/struts.xml | 22 +- .../withStrutsProperties/struts.properties | 19 +- .../model/constant/withStrutsProperties/struts.xml | 22 +- .../model/constant/withWebXml/WEB-INF/web.xml | 22 +- .../testData/model/constant/withWebXml/struts.xml | 22 +- .../defaultInterceptorRef/jam/package-info.java | 22 +- .../convention/defaultInterceptorRef/struts.xml | 22 +- .../testcompletion/package-info.java | 22 +- .../interceptorRef/completion/ActionSingle.java | 22 +- .../interceptorRef/jam/ActionSingle.java | 22 +- .../model/jam/convention/interceptorRef/struts.xml | 22 +- .../jam/convention/parentPackage/jam/Action.java | 22 +- .../convention/parentPackage/jam/package-info.java | 22 +- .../model/jam/convention/parentPackage/struts.xml | 22 +- .../parentPackage/testcompletion/Action.java | 22 +- .../parentPackage/testcompletion/package-info.java | 22 +- .../resultPath/WEB-INF/customContent/test.jsp | 21 +- .../convention/resultPath/jam/ActionProperty.java | 22 +- .../jam/convention/resultPath/jam/ActionValue.java | 22 +- .../jam/convention/resultPath/struts.properties | 17 ++ .../resultPath/testcompletion/ActionProperty.java | 22 +- .../reference/jsp/action/ActionMethods.java | 21 +- .../action/jsp/action-completionvariants-bang.jsp | 21 +- .../jsp/action/jsp/action-completionvariants.jsp | 21 +- .../jsp/action-completionvariants_method.jsp | 21 +- .../jsp/action/jsp/action-highlighting.jsp | 19 ++ .../reference/jsp/action/struts-action.xml | 22 +- .../reference/jsp/actionLink/WEB-INF/web.xml | 22 +- ...tionLink-completionvariants-namespace_given.jsp | 21 +- .../actionLink-completionvariants-no-namespace.jsp | 21 +- .../jsp/actionLink/jsp/actionLink-highlighting.jsp | 19 ++ .../jsp/actionLink/jsp/actionLink-reference_1.jsp | 21 +- .../jsp/actionLink/jsp/actionLink-reference_2.jsp | 21 +- .../reference/jsp/actionLink/jsp/index.jsp | 19 ++ .../reference/jsp/actionLink/struts-actionLink.xml | 22 +- ...actionproperty-forminput-completionvariants.jsp | 21 +- .../jsp/actionproperty-forminput-highlighting.jsp | 21 +- ...perty-forminput-readonly-completionvariants.jsp | 21 +- .../jsp/actionproperty/struts-actionproperty.xml | 22 +- .../namespace/jsp/namespace-completionvariants.jsp | 21 +- .../jsp/namespace/jsp/namespace-highlighting.jsp | 21 +- .../reference/jsp/namespace/struts-namespace.xml | 22 +- .../reference/jsp/uitags/MyBundle.properties | 19 +- .../testData/reference/jsp/uitags/jsp/common.jsp | 19 ++ .../testData/reference/jsp/uitags/jsp/paths.jsp | 21 +- .../testData/reference/jsp/uitags/jsp/specific.jsp | 19 ++ .../reference/web/constant/WEB-INF/web.xml | 22 +- .../web/constant/WEB-INF/web_name_completion.xml | 22 +- .../web/constant/WEB-INF/web_value_completion.xml | 22 +- .../constant/WEB-INF/web_value_completion_2.xml | 22 +- src/test/testData/structure/struts-structure.xml | 22 +- .../testData/structure/validation-structure.xml | 22 +- .../struts-completionvariants-action_method.xml | 22 +- .../struts-completionvariants-constant_name.xml | 22 +- .../struts-completionvariants-interceptor-ref.xml | 22 +- .../struts-completionvariants-package_extends.xml | 22 +- .../struts-completionvariants-result_name.xml | 22 +- ...ts-completionvariants-result_type-extending.xml | 22 +- .../struts-completionvariants-result_type.xml | 22 +- .../strutsXml/highlighting/MyAbstractClass.java | 21 +- .../strutsXml/highlighting/MyException.java | 21 +- .../strutsXml/highlighting/MyInterface.java | 21 +- .../strutsXml/highlighting/MyInterfaceImpl.java | 21 +- .../strutsXml/highlighting/MyNestedClass.java | 21 +- .../highlighting/struts-action-allowedMethods.xml | 22 +- .../strutsXml/highlighting/struts-constants.xml | 22 +- .../strutsXml/highlighting/struts-errors.xml | 22 +- .../highlighting/struts-interceptor-ref.xml | 22 +- .../strutsXml/highlighting/struts-param.xml | 22 +- .../highlighting/struts-unknownhandlerstack.xml | 22 +- .../strutsXml/include/com/test/struts-sub.xml | 22 +- .../testData/strutsXml/include/struts-include.xml | 22 +- .../strutsXml/include/struts-notinfileset.xml | 22 +- src/test/testData/strutsXml/include/struts.xml | 22 +- .../testData/strutsXml/intentions/MyClass.java | 21 +- .../strutsXml/intentions/struts-action-method.xml | 22 +- src/test/testData/strutsXml/result/WEB-INF/web.xml | 22 +- src/test/testData/strutsXml/result/jsp/index.jsp | 21 +- .../testData/strutsXml/result/jsp2/jsp2-index.jsp | 21 +- .../result/struts-completionvariants-chain.xml | 22 +- .../resultActionProperty/ActionClass.java | 21 +- .../struts-resultActionProperty.xml | 22 +- .../testData/strutsXml/spring/MyAbstractClass.java | 21 +- src/test/testData/strutsXml/spring/MyClass.java | 21 +- .../testData/strutsXml/spring/MyInterface.java | 21 +- src/test/testData/strutsXml/spring/spring.xml | 22 +- .../spring/struts-completionvariants-spring.xml | 22 +- .../struts-completionvariants-subclass-spring.xml | 22 +- .../testData/strutsXml/spring/struts-spring.xml | 22 +- src/test/testData/stubs/struts-stubs.xml | 22 +- .../config/validator-config-default.xml | 20 ++ .../config/validator-config-simple.xml | 22 +- .../highlighting/com/MyAction-validation.xml | 22 +- .../validationXml/highlighting/com/MyAction.java | 22 +- 175 files changed, 3613 insertions(+), 331 deletions(-) create mode 100644 .github/workflows/gradle.yml create mode 100644 docs/ip-clearance-struts-idea-plugin.xml