[struts] 01/01: Merge pull request #658 from apache/WW-5275-custom-csp
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 31a24ee70972f54b9c32094d3a5250e5f6035f87 Merge: 930c6de80 68a401aac Author: Lukasz Lenart AuthorDate: Sat Feb 18 16:14:54 2023 +0100 Merge pull request #658 from apache/WW-5275-custom-csp [WW-5275] Allows to provide a custom CspSettings per action .../apache/struts2/action/CspSettingsAware.java| 33 + .../struts2/interceptor/csp/CspInterceptor.java| 45 +- .../struts2/interceptor/csp/CspSettings.java | 8 +++- .../interceptor/csp/DefaultCspSettings.java| 8 .../struts2/interceptor/CspInterceptorTest.java| 54 ++ 5 files changed, 116 insertions(+), 32 deletions(-)
[struts] branch master updated (930c6de80 -> 31a24ee70)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from 930c6de80 Merge pull request #657 from
atlassian/WW-5279-xml-config-provider
add 68a401aac WW-5275 Allows to provide a custom CspSettings per action
new 31a24ee70 Merge pull request #658 from apache/WW-5275-custom-csp
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...vletContextAware.java => CspSettingsAware.java} | 12 +++--
.../struts2/interceptor/csp/CspInterceptor.java| 45 +-
.../struts2/interceptor/csp/CspSettings.java | 8 +++-
.../interceptor/csp/DefaultCspSettings.java| 8
.../struts2/interceptor/CspInterceptorTest.java| 54 ++
5 files changed, 90 insertions(+), 37 deletions(-)
copy core/src/main/java/org/apache/struts2/action/{ServletContextAware.java =>
CspSettingsAware.java} (73%)
[struts-archetypes] 01/01: Merge pull request #8 from apache/WW-5283-update
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git commit 9e385a3bb3705fcc84969bbb5922e989038820c6 Merge: 7de8404 1d1266a Author: Lukasz Lenart AuthorDate: Sat Feb 18 16:19:54 2023 +0100 Merge pull request #8 from apache/WW-5283-update [WW-5283] Upgrade Struts archetypes to use the latest Struts version .mvn/wrapper/MavenWrapperDownloader.java | 117 - .mvn/wrapper/maven-wrapper.properties | 20 +++- Jenkinsfile| 4 +- mvnw | 99 +++-- mvnw.cmd | 41 pom.xml| 30 +++--- struts2-archetype-angularjs/pom.xml| 7 +- .../src/main/resources/archetype-resources/pom.xml | 24 ++--- .../src/main/webapp/WEB-INF/web.xml| 6 +- struts2-archetype-blank/pom.xml| 7 +- .../src/main/resources/archetype-resources/pom.xml | 24 ++--- .../src/main/webapp/WEB-INF/web.xml| 9 +- struts2-archetype-convention/pom.xml | 7 +- .../src/main/resources/archetype-resources/pom.xml | 25 ++--- .../src/main/webapp/WEB-INF/web.xml| 7 +- struts2-archetype-dbportlet/pom.xml| 8 +- .../src/main/resources/archetype-resources/pom.xml | 21 ++-- .../src/main/webapp/WEB-INF/web.xml| 8 +- struts2-archetype-plugin/pom.xml | 7 +- .../src/main/resources/archetype-resources/pom.xml | 20 ++-- struts2-archetype-portlet/pom.xml | 7 +- .../src/main/resources/archetype-resources/pom.xml | 18 +--- .../src/main/webapp/WEB-INF/web.xml| 8 +- struts2-archetype-starter/pom.xml | 8 +- .../src/main/resources/archetype-resources/pom.xml | 28 ++--- .../src/main/webapp/WEB-INF/web.xml| 53 +- 26 files changed, 224 insertions(+), 389 deletions(-)
[struts-archetypes] branch master updated (7de8404 -> 9e385a3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from 7de8404 [maven-release-plugin] prepare for next development iteration add c25cb38 WW-5283 Upgrade Struts archetypes to use the latest Struts version add b121bcd Uses proper tools in Jenkins pipeline add 06e19c0 WW-5283 Extracts Jetty version into property add 1d1266a Upgrades Maven wrapper new 9e385a3 Merge pull request #8 from apache/WW-5283-update The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .mvn/wrapper/MavenWrapperDownloader.java | 117 - .mvn/wrapper/maven-wrapper.properties | 20 +++- Jenkinsfile| 4 +- mvnw | 99 +++-- mvnw.cmd | 41 pom.xml| 30 +++--- struts2-archetype-angularjs/pom.xml| 7 +- .../src/main/resources/archetype-resources/pom.xml | 24 ++--- .../src/main/webapp/WEB-INF/web.xml| 6 +- struts2-archetype-blank/pom.xml| 7 +- .../src/main/resources/archetype-resources/pom.xml | 24 ++--- .../src/main/webapp/WEB-INF/web.xml| 9 +- struts2-archetype-convention/pom.xml | 7 +- .../src/main/resources/archetype-resources/pom.xml | 25 ++--- .../src/main/webapp/WEB-INF/web.xml| 7 +- struts2-archetype-dbportlet/pom.xml| 8 +- .../src/main/resources/archetype-resources/pom.xml | 21 ++-- .../src/main/webapp/WEB-INF/web.xml| 8 +- struts2-archetype-plugin/pom.xml | 7 +- .../src/main/resources/archetype-resources/pom.xml | 20 ++-- struts2-archetype-portlet/pom.xml | 7 +- .../src/main/resources/archetype-resources/pom.xml | 18 +--- .../src/main/webapp/WEB-INF/web.xml| 8 +- struts2-archetype-starter/pom.xml | 8 +- .../src/main/resources/archetype-resources/pom.xml | 28 ++--- .../src/main/webapp/WEB-INF/web.xml| 53 +- 26 files changed, 224 insertions(+), 389 deletions(-) delete mode 100644 .mvn/wrapper/MavenWrapperDownloader.java
[struts-archetypes] branch dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/junit-junit-4.13.1 created (now b901fb6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/junit-junit-4.13.1 in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at b901fb6 Bump junit No new revisions were added by this update.
[struts-archetypes] branch dependabot/maven/struts2-archetype-blank/src/main/resources/archetype-resources/junit-junit-4.13.1 created (now dff2cb9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/struts2-archetype-blank/src/main/resources/archetype-resources/junit-junit-4.13.1 in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at dff2cb9 Bump junit No new revisions were added by this update.
[struts-archetypes] branch dependabot/maven/struts2-archetype-dbportlet/src/main/resources/archetype-resources/junit-junit-4.13.1 created (now badc04f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/struts2-archetype-dbportlet/src/main/resources/archetype-resources/junit-junit-4.13.1 in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at badc04f Bump junit No new revisions were added by this update.
[struts-archetypes] branch dependabot/maven/struts2-archetype-starter/src/main/resources/archetype-resources/junit-junit-4.13.1 created (now 2850e6b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/struts2-archetype-starter/src/main/resources/archetype-resources/junit-junit-4.13.1 in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at 2850e6b Bump junit No new revisions were added by this update.
[struts-archetypes] branch dependabot/maven/struts2-archetype-plugin/src/main/resources/archetype-resources/junit-junit-4.13.1 created (now 9a52a75)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/struts2-archetype-plugin/src/main/resources/archetype-resources/junit-junit-4.13.1 in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at 9a52a75 Bump junit No new revisions were added by this update.
[struts-archetypes] branch dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 created (now 85e2a77)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at 85e2a77 Bump commons-compress No new revisions were added by this update.
[struts-archetypes] branch dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 created (now e869375)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at e869375 Bump commons-compress No new revisions were added by this update.
[struts-archetypes] branch master updated: Adds .asf.yaml to customize the repo
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new 040f420 Adds .asf.yaml to customize the repo
040f420 is described below
commit 040f42014356cb4eed3ca049cb113f57d54ce245
Author: Lukasz Lenart
AuthorDate: Sat Feb 18 16:24:53 2023 +0100
Adds .asf.yaml to customize the repo
---
.asf.yaml | 20
1 file changed, 20 insertions(+)
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 000..a59e02e
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,20 @@
+# Documentation https://s.apache.org/asfyaml
+notifications:
+ commits: commits@struts.apache.org
+ # Send all issue emails (new, closed, comments) to issues@
+ issues: iss...@struts.apache.org
+ # Send new/closed PR notifications to dev@
+ pullrequests_status: d...@struts.apache.org
+ # Send individual PR comments/reviews to issues@
+ pullrequests_comment: iss...@struts.apache.org
+ # Link opened PRs with JIRA
+ jira_options: link label worklog
+
+github:
+ del_branch_on_merge: true
+ protected_branches:
+master: { }
+ autolink_jira:
+- WW
+ custom_subjects:
+new_pr: "Created PR {repository}/#{pr_id}: {title}"
[struts-archetypes] branch master updated (040f420 -> ccde5df)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from 040f420 Adds .asf.yaml to customize the repo add 9a52a75 Bump junit add ccde5df Merge pull request #9 from apache/dependabot/maven/struts2-archetype-plugin/src/main/resources/archetype-resources/junit-junit-4.13.1 No new revisions were added by this update. Summary of changes: struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] branch master updated (ccde5df -> 421d6b5)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from ccde5df Merge pull request #9 from apache/dependabot/maven/struts2-archetype-plugin/src/main/resources/archetype-resources/junit-junit-4.13.1 add 2850e6b Bump junit new 421d6b5 Merge pull request #10 from apache/dependabot/maven/struts2-archetype-starter/src/main/resources/archetype-resources/junit-junit-4.13.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] 01/01: Merge pull request #10 from apache/dependabot/maven/struts2-archetype-starter/src/main/resources/archetype-resources/junit-junit-4.13.1
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git commit 421d6b529bfa738a6af037116a7050c7dc09f249 Merge: ccde5df 2850e6b Author: Lukasz Lenart AuthorDate: Sat Feb 18 16:26:05 2023 +0100 Merge pull request #10 from apache/dependabot/maven/struts2-archetype-starter/src/main/resources/archetype-resources/junit-junit-4.13.1 Bump junit from 4.12 to 4.13.1 in /struts2-archetype-starter/src/main/resources/archetype-resources .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] branch master updated (421d6b5 -> 36c76c7)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from 421d6b5 Merge pull request #10 from apache/dependabot/maven/struts2-archetype-starter/src/main/resources/archetype-resources/junit-junit-4.13.1 add badc04f Bump junit add 36c76c7 Merge pull request #11 from apache/dependabot/maven/struts2-archetype-dbportlet/src/main/resources/archetype-resources/junit-junit-4.13.1 No new revisions were added by this update. Summary of changes: .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] branch master updated (36c76c7 -> 5405a4a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from 36c76c7 Merge pull request #11 from apache/dependabot/maven/struts2-archetype-dbportlet/src/main/resources/archetype-resources/junit-junit-4.13.1 add dff2cb9 Bump junit new 5405a4a Merge pull request #12 from apache/dependabot/maven/struts2-archetype-blank/src/main/resources/archetype-resources/junit-junit-4.13.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] 01/01: Merge pull request #12 from apache/dependabot/maven/struts2-archetype-blank/src/main/resources/archetype-resources/junit-junit-4.13.1
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git commit 5405a4a95ddcd72e7d2336ff2113d7d20b6a0cc3 Merge: 36c76c7 dff2cb9 Author: Lukasz Lenart AuthorDate: Sat Feb 18 16:26:54 2023 +0100 Merge pull request #12 from apache/dependabot/maven/struts2-archetype-blank/src/main/resources/archetype-resources/junit-junit-4.13.1 Bump junit from 4.12 to 4.13.1 in /struts2-archetype-blank/src/main/resources/archetype-resources struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] branch master updated (5405a4a -> 11fea75)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from 5405a4a Merge pull request #12 from apache/dependabot/maven/struts2-archetype-blank/src/main/resources/archetype-resources/junit-junit-4.13.1 add b901fb6 Bump junit add 11fea75 Merge pull request #13 from apache/dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/junit-junit-4.13.1 No new revisions were added by this update. Summary of changes: .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] branch dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/junit-junit-4.13.1 created (now 97ce972)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/junit-junit-4.13.1 in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at 97ce972 Bump junit No new revisions were added by this update.
[struts-archetypes] branch master updated (11fea75 -> e4c1970)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from 11fea75 Merge pull request #13 from apache/dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/junit-junit-4.13.1 add 85e2a77 Bump commons-compress new e4c1970 Merge pull request #14 from apache/dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] 01/01: Merge pull request #14 from apache/dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git commit e4c1970d4005631ce34e6234ad59a21fe00625ce Merge: 11fea75 85e2a77 Author: Lukasz Lenart AuthorDate: Sat Feb 18 16:27:34 2023 +0100 Merge pull request #14 from apache/dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 Bump commons-compress from 1.20 to 1.21 in /struts2-archetype-convention/src/main/resources/archetype-resources .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] 01/01: Merge pull request #15 from apache/dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git commit b71000aa762527ddacd7648caff84f2a8b9d84cf Merge: e4c1970 e869375 Author: Lukasz Lenart AuthorDate: Sat Feb 18 16:27:52 2023 +0100 Merge pull request #15 from apache/dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 Bump commons-compress from 1.20 to 1.21 in /struts2-archetype-angularjs/src/main/resources/archetype-resources .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] branch master updated (e4c1970 -> b71000a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from e4c1970 Merge pull request #14 from apache/dependabot/maven/struts2-archetype-convention/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 add e869375 Bump commons-compress new b71000a Merge pull request #15 from apache/dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] branch master updated (b71000a -> d36c708)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git from b71000a Merge pull request #15 from apache/dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/org.apache.commons-commons-compress-1.21 add 97ce972 Bump junit new d36c708 Merge pull request #16 from apache/dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/junit-junit-4.13.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] 01/01: Merge pull request #16 from apache/dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/junit-junit-4.13.1
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git commit d36c708851e7c5ebd0075182e5a94f051a8a2b78 Merge: b71000a 97ce972 Author: Lukasz Lenart AuthorDate: Sat Feb 18 16:28:37 2023 +0100 Merge pull request #16 from apache/dependabot/maven/struts2-archetype-angularjs/src/main/resources/archetype-resources/junit-junit-4.13.1 Bump junit from 4.12 to 4.13.1 in /struts2-archetype-angularjs/src/main/resources/archetype-resources .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-archetypes] branch WW-5283-update-test created (now f81a070)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5283-update-test in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git at f81a070 WW-5283 Adjusts tests to use proper new based test case class This branch includes the following new commits: new f81a070 WW-5283 Adjusts tests to use proper new based test case class The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[struts-archetypes] 01/01: WW-5283 Adjusts tests to use proper new based test case class
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5283-update-test
in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git
commit f81a070f39ebca757a8d3104301c548e5e4eddf0
Author: Lukasz Lenart
AuthorDate: Sat Feb 18 16:44:05 2023 +0100
WW-5283 Adjusts tests to use proper new based test case class
---
.../src/test/java/actions/IndexTest.java | 2 +-
.../src/test/java/example/ConfigTest.java | 9 +++
.../src/test/java/example/HelloWorldTest.java | 3 +--
.../src/test/java/example/LoginTest.java | 1 -
.../src/test/java/actions/HelloActionTest.java | 20 ++-
.../src/test/java/actions/IndexTest.java | 20 ++-
.../src/test/java/HelloWorldActionTest.java| 30 +++---
.../src/test/java/IndexActionTest.java | 30 +++---
8 files changed, 73 insertions(+), 42 deletions(-)
diff --git
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
index dde937a..7625e3d 100644
---
a/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
+++
b/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/IndexTest.java
@@ -19,7 +19,7 @@
package ${package}.actions;
import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.StrutsRestTestCase;
+import org.apache.struts2.junit.StrutsRestTestCase;
import org.junit.Test;
import static org.junit.Assert.*;
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
index 137ebb1..a222597 100644
---
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
+++
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
@@ -16,21 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package ${package}.example;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.config.RuntimeConfiguration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.config.StrutsXmlConfigurationProvider;
+import org.apache.struts2.junit.StrutsTestCase;
import java.util.List;
import java.util.Map;
-import org.apache.struts2.StrutsTestCase;
-
public class ConfigTest extends StrutsTestCase {
protected void assertSuccess(String result) {
@@ -56,7 +53,7 @@ public class ConfigTest extends StrutsTestCase {
protected void setUp() throws Exception {
super.setUp();
-XmlConfigurationProvider c = new
XmlConfigurationProvider("struts.xml");
+XmlConfigurationProvider c = new
StrutsXmlConfigurationProvider("struts.xml");
configurationManager.addContainerProvider(c);
configurationManager.reload();
}
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
index a5ca567..8866809 100644
---
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
+++
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
@@ -16,12 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package ${package}.example;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.junit.StrutsTestCase;
public class HelloWorldTest extends StrutsTestCase {
diff --git
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
index e2f2b2e..b38350c 100644
---
a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
+++
b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package ${package}.example;
import com.opensymphony.xwork2.ActionProxy;
diff --git
a/struts2-archetype-convention/src/main/resources/archetype-reso
