[struts] branch master updated: Upgrades integration tests config to match Spring and Jetty
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 The following commit(s) were added to refs/heads/master by this push: new 07b88fcc3 Upgrades integration tests config to match Spring and Jetty 07b88fcc3 is described below commit 07b88fcc3581247e397e5b82004cd91d26906a1e Author: Lukasz Lenart AuthorDate: Tue May 24 09:51:42 2022 +0200 Upgrades integration tests config to match Spring and Jetty --- apps/showcase/pom.xml | 11 ++ .../src/main/webapp/WEB-INF/applicationContext.xml | 44 ++ .../struts2/showcase/ActionChainingTest.java | 2 +- .../struts2/showcase/ActionTagExampleTest.java | 2 +- .../it/org/apache/struts2/showcase/AsyncTest.java | 2 +- .../it/org/apache/struts2/showcase/CRUDTest.java | 2 +- .../struts2/showcase/ComponentTagExampleTest.java | 2 +- .../apache/struts2/showcase/ConversionTest.java| 6 +-- .../apache/struts2/showcase/ExecAndWaitTest.java | 4 +- .../apache/struts2/showcase/FileDownloadTest.java | 1 + .../struts2/showcase/FreeMarkerManagerTest.java| 4 +- .../apache/struts2/showcase/StaticContentTest.java | 13 +++ .../apache/struts2/showcase/UITagExampleTest.java | 10 ++--- .../apache/struts2/showcase/ValidationTest.java| 2 +- 14 files changed, 39 insertions(+), 66 deletions(-) diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index c2136fe7a..a1933bc5f 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -144,7 +144,7 @@ net.sourceforge.htmlunit htmlunit -2.39.0 +2.61.0 test @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-failsafe-plugin -3.0.0-M4 +3.0.0-M6 it.org.apache.struts2.showcase.*Test @@ -193,7 +193,7 @@ log4j.configuration - file:${basedir}/src/main/resources/log4j.properties + file:${basedir}/src/main/resources/log4j2.xml slf4j @@ -214,11 +214,8 @@ stop -run-forked +start - -false - stop-jetty diff --git a/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml index f5c15414c..ef700ef48 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml @@ -45,66 +45,46 @@ - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + @@ -129,9 +109,7 @@ - - - + diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java index 4889193cc..dd519c53d 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java @@ -32,7 +32,7 @@ public class ActionChainingTest { try (final WebClient webClient = new WebClient()) { final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/actionchaining/actionChain1!input"); -final String pageAsText = page.asText(); +final String pageAsText = page.asNormalizedText(); Assert.assertTrue(pageAsText.contains("Action Chain 1 Property 1: Property Set In Action Chain 1")); Assert.assertTrue(pageAsText.contains("Action Chain 2 Property 1: Property Set in Action Chain 2")); Assert.assertTrue(pageAsText.contains("Action Chain 3 Property 1: Property set in Action Chain 3")); diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java b/apps
[struts] branch master updated: [maven-release-plugin] prepare release STRUTS_6_0_0_RC4
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 The following commit(s) were added to refs/heads/master by this push: new 981885fd6 [maven-release-plugin] prepare release STRUTS_6_0_0_RC4 981885fd6 is described below commit 981885fd6a8336ac36ca13e09f785cfa12d7770d Author: Lukasz Lenart AuthorDate: Tue May 24 13:59:22 2022 +0200 [maven-release-plugin] prepare release STRUTS_6_0_0_RC4 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 5 ++--- plugins/json/pom.xml| 5 ++--- plugins/junit/pom.xml | 5 ++--- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 5 ++--- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 5 ++--- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 5 ++--- plugins/testng/pom.xml | 5 ++--- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- pom.xml | 6 +++--- 37 files changed, 49 insertions(+), 56 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 54e3b841a..80183945d 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-SNAPSHOT +6.0.0-RC4 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 82dd137d9..d25cc9147 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.0.0-SNAPSHOT +6.0.0-RC4 struts2-rest-showcase war -6.0.0-SNAPSHOT +6.0.0-RC4 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index a1933bc5f..884eccfe1 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.0.0-SNAPSHOT +6.0.0-RC4 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 5abd8547c..715288b31 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-SNAPSHOT +6.0.0-RC4 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 021a767b2..da3b3f927 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -29,7 +29,7 @@ struts2-bom -6.0.0-SNAPSHOT +6.0.0-RC4 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.0.0-SNAPSHOT +6.0.0-RC4 true true @@ -175,7 +175,7 @@ -HEAD +STRUTS_6_0_0_RC4 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 4f5ce6cc2..759f49d4b 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.0.0-SNAPSHOT +6.0.0-RC4 struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index df1cd3231..f684a8edc 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.0.0-SNAPSHOT +6.0.0-RC4 struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index d34c67496..a392a2727 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-SNAPSHOT +6.0.0-RC4 struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index 02f1a09f1..d6ecb3150 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts
[struts] annotated tag STRUTS_6_0_0_RC4 created (now 4651f2206)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_6_0_0_RC4 in repository https://gitbox.apache.org/repos/asf/struts.git at 4651f2206 (tag) tagging 981885fd6a8336ac36ca13e09f785cfa12d7770d (commit) replaces STRUTS_6_0_0_RC3 by Lukasz Lenart on Tue May 24 13:59:27 2022 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_6_0_0_RC4 --- No new revisions were added by this update.
[struts] branch master updated: [maven-release-plugin] prepare for next development iteration
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 The following commit(s) were added to refs/heads/master by this push: new 735bbc283 [maven-release-plugin] prepare for next development iteration 735bbc283 is described below commit 735bbc283ee6edd25ab6133a716461716798ff71 Author: Lukasz Lenart AuthorDate: Tue May 24 13:59:32 2022 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-mocks/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- pom.xml | 6 +++--- 37 files changed, 42 insertions(+), 42 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 80183945d..54e3b841a 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-RC4 +6.0.0-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index d25cc9147..82dd137d9 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -6.0.0-RC4 +6.0.0-SNAPSHOT struts2-rest-showcase war -6.0.0-RC4 +6.0.0-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 884eccfe1..a1933bc5f 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -6.0.0-RC4 +6.0.0-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 715288b31..5abd8547c 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-RC4 +6.0.0-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index da3b3f927..021a767b2 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -29,7 +29,7 @@ struts2-bom -6.0.0-RC4 +6.0.0-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -6.0.0-RC4 +6.0.0-SNAPSHOT true true @@ -175,7 +175,7 @@ -STRUTS_6_0_0_RC4 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 759f49d4b..4f5ce6cc2 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.0.0-RC4 +6.0.0-SNAPSHOT struts2-osgi-admin-bundle diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index f684a8edc..df1cd3231 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-osgi-bundles -6.0.0-RC4 +6.0.0-SNAPSHOT struts2-osgi-demo-bundle diff --git a/bundles/pom.xml b/bundles/pom.xml index a392a2727..d34c67496 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -6.0.0-RC4 +6.0.0-SNAPSHOT struts2-osgi-bundles diff --git a/core/pom.xml b/core/pom.xml index d6ecb3150..02f1a09f1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts str
svn commit: r54705 - /dev/struts/6.0.0-RC4/
Author: lukaszlenart Date: Tue May 24 12:20:15 2022 New Revision: 54705 Log: Updates test release 6.0.0-RC4 Added: dev/struts/6.0.0-RC4/ dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip (with props) dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.asc dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.md5 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.sha1 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip (with props) dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip.asc dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip.md5 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip.sha1 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-docs.zip (with props) dev/struts/6.0.0-RC4/struts-6.0.0-RC4-docs.zip.asc dev/struts/6.0.0-RC4/struts-6.0.0-RC4-docs.zip.md5 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-docs.zip.sha1 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-lib.zip (with props) dev/struts/6.0.0-RC4/struts-6.0.0-RC4-lib.zip.asc dev/struts/6.0.0-RC4/struts-6.0.0-RC4-lib.zip.md5 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-lib.zip.sha1 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-min-lib.zip (with props) dev/struts/6.0.0-RC4/struts-6.0.0-RC4-min-lib.zip.asc dev/struts/6.0.0-RC4/struts-6.0.0-RC4-min-lib.zip.md5 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-min-lib.zip.sha1 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-src.zip (with props) dev/struts/6.0.0-RC4/struts-6.0.0-RC4-src.zip.asc dev/struts/6.0.0-RC4/struts-6.0.0-RC4-src.zip.md5 dev/struts/6.0.0-RC4/struts-6.0.0-RC4-src.zip.sha1 Added: dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip == Binary file - no diff available. Propchange: dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip -- svn:mime-type = application/octet-stream Added: dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.asc == --- dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.asc (added) +++ dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.asc Tue May 24 12:20:15 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmKMyeMYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sfHnAP/1Nph9l+Sc9NL99JOSiQjyQU +8WfwZIkx5SiZizHB5USCEOli3kXK4QVdwfnk6izSUuMPQPDHrwLm6XCxPgIEenu3 +Lmjm2gSVfduwVqn6DC34DshxL7MFBD01g4KC/I45NrdfbGprHxtVthsDBNt5bTrx +nwMxdsHSZ13AO15S5iqZv7tqAAZW7pdtFgF8E8MvgS6UbWsbtTjcgiH53OP447bk +ZyIPuvQ/AuXbP+qIq1wPvCD46Vy0JCOy2Up1XKU78pb31HStsaxIb9Z4ZS4onPrP +VhBp1l3dYeXMiGLqVgVIkJUft9cs8D3BE1cpVFaLsYMopBI6eUznGwuT2GK0ZADQ +TaXZu64TU+R+zW55CCmdj8qoHm8N9LUaq59/ysxTgVWfzWSoBKriiSLclYQeip+r +5+agPw6OTZ3LlJv6YwRhJx1hnSzRN8/DTubPxAnRhY074pKTJhEfToci/K96CY9+ +TaOmm538Hz7/9rPz9+gRPzBsPNBWXWxKOjwhBg7D8whbtyfPjkcCY1e+UqSP6B38 +MoyVnP00VCCMPfRRuJPbL+Iggihe7+nqIRIx6xbclk+QO53DD7l/BYdoWvJGBh2i +M3qBloYS6RZIsyk5c8ezOyVwm7/ObljDTJIbV/2ni82Qv1EjinkWHG7KAy9yRc7+ +ghMbaju8gj92m7E0zdE8 +=pVn+ +-END PGP SIGNATURE- Added: dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.md5 == --- dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.md5 (added) +++ dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.md5 Tue May 24 12:20:15 2022 @@ -0,0 +1 @@ +6644688e325ac4f9cca45c3e978d0b35 \ No newline at end of file Added: dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.sha1 == --- dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.sha1 (added) +++ dev/struts/6.0.0-RC4/struts-6.0.0-RC4-all.zip.sha1 Tue May 24 12:20:15 2022 @@ -0,0 +1 @@ +5e279bbc74cd918a9799191e04a3a066fa9584f7 \ No newline at end of file Added: dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip == Binary file - no diff available. Propchange: dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip -- svn:mime-type = application/octet-stream Added: dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip.asc == --- dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip.asc (added) +++ dev/struts/6.0.0-RC4/struts-6.0.0-RC4-apps.zip.asc Tue May 24 12:20:15 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJMBAABCgA2FiEEDgCGmDROYrkGM7fGKEFhBmOvux8FAmKMyeQYHGx1a2Fzemxl +bmFydEBhcGFjaGUub3JnAAoJEChBYQZjr7sf3mEQAJoYMtIhyZ1KRBIhvkL/YaBE +8p7cTWgcsDdozlEjkCCmPR9sYMDsFxE3C9lUw6lkvrYT1Drl3RhoIYfX4nM3AoT4 +FnmgJoD5wN3gWXInzmE/OxrIBjsJHJSDNTrXeorXTdSKp2tRa4QDv5WKyqBnviWb +j47Dq9snlkW7a483mtdRGcAu/uw2PUWeIoT42KC1nWeqiWM6eT1/fvQUpCnJVFzl +NN/LmgaXS2QeEoHLQEOaJqFTq2+9tcaYs4MN4tuVDjM7mdgHPlfiv5dq0NZlBRq0 +7GofUb6hoRlE+qMkwyCMxCQPzNaJ2yEkUqKLgghsi0j41ROtjQFUUGFJahxD7G5/ +ITQ9leRk4VvkaTlkhhh+Xwe9n4mQFGVTazmdBud5ZcWM03CpIuFdBLJAxx/y4VvS +7wHZDav
svn commit: r54706 - /dev/struts/6.0.0-RC3/
Author: lukaszlenart Date: Tue May 24 12:24:39 2022 New Revision: 54706 Log: Removes outdated RC Removed: dev/struts/6.0.0-RC3/