You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2022/12/23 13:03:26 UTC
[myfaces] 02/02: fix: checkstyle and rat errors from jenkins build, change version back to snapshot, update tomcat version, workaround for serializer.jar' error message from tomcat jar scanner
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
commit 50186684e6379d7387abb32db4b7b2de214e596d
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Fri Dec 23 13:30:33 2022 +0100
fix: checkstyle and rat errors from jenkins build, change version back to snapshot, update tomcat version, workaround for serializer.jar' error message from tomcat jar scanner
---
api/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bundle/pom.xml | 2 +-
impl/pom.xml | 4 +-
integration-tests/ajax/pom.xml | 2 +-
.../integrationtests/ajax/IntegrationTest.java | 93 ++++++++++++++++------
.../autoLookupExpressionFactoryWithoutJSP/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
.../automaticExtensionlessMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
integration-tests/exactMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
integration-tests/faceletToXhtmlMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
.../faceletToXhtmlMappingDisabled/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
integration-tests/pom.xml | 11 ++-
integration-tests/protectedViews/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
parent/pom.xml | 8 +-
test/pom.xml | 2 +-
21 files changed, 196 insertions(+), 50 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 298f4653e..7785148c7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 43ce371e7..d5a9e1da6 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 2bbbdd677..0910801a8 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/impl/pom.xml b/impl/pom.xml
index 9db6874a9..fe79dc34a 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -1027,7 +1027,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
- <version>10.0.0-M9</version>
+ <version>10.0.27</version>
<scope>test</scope>
</dependency>
diff --git a/integration-tests/ajax/pom.xml b/integration-tests/ajax/pom.xml
index 23ed559d1..70c1097ac 100644
--- a/integration-tests/ajax/pom.xml
+++ b/integration-tests/ajax/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java b/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
index 55c5c51ae..33239f1d5 100644
--- a/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
+++ b/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
@@ -50,7 +50,8 @@ import static org.junit.Assert.assertTrue;
@RunWith(Arquillian.class)
@RunAsClient
-public class IntegrationTest {
+public class IntegrationTest
+{
public static final String IB_1 = "insert before succeeded should display before test1";
public static final String IB_2 = "insert2 before succeeded should display before test1";
@@ -59,7 +60,26 @@ public class IntegrationTest {
public static final String IEL = "update succeeded 1";
@Deployment(testable = false)
- public static WebArchive createDeployment() {
+ public static WebArchive createDeployment()
+ {
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "ajax.war")
.importFrom(new File("target/ajax.war"))
.as(WebArchive.class);
@@ -80,18 +100,23 @@ public class IntegrationTest {
@After
- public void after() {
+ public void after()
+ {
webDriver.manage().deleteAllCookies();
}
@Before
- public void before() {
+ public void before()
+ {
}
- public void resetServerValues() {
- waitAjax().withTimeout(10, TimeUnit.SECONDS).until(new Function<WebDriver, Object>() {
+ public void resetServerValues()
+ {
+ waitAjax().withTimeout(10, TimeUnit.SECONDS).until(new Function<WebDriver, Object>()
+ {
- public Object apply(WebDriver webDriver) {
+ public Object apply(WebDriver webDriver)
+ {
return webDriver.findElement(By.id("_reset_all")).isDisplayed();
}
});
@@ -99,7 +124,8 @@ public class IntegrationTest {
}
@Test
- public void testAjaxPresent() {
+ public void testAjaxPresent()
+ {
webDriver.get(contextPath + "index.jsf");
resetServerValues();
@@ -117,21 +143,24 @@ public class IntegrationTest {
* and the response handling
*/
@Test
- public void testProtocol() {
+ public void testProtocol()
+ {
webDriver.get(contextPath + "test1-protocol.jsf");
resetServerValues();
//simple eval
trigger("cmd_eval", webDriver -> webDriver.getPageSource().contains("eval test succeeded"));
//simple update insert with embedded js
- trigger("cmd_update_insert", webDriver -> {
+ trigger("cmd_update_insert", webDriver ->
+ {
String pageSource = webDriver.getPageSource();
return pageSource.contains("embedded script at update succeed") &&
pageSource.contains("embedded script at insert succeed");
});
//update, insert with the correct order
- trigger("cmd_update_insert2", webDriver -> {
+ trigger("cmd_update_insert2", webDriver ->
+ {
String pageSource = webDriver.getPageSource();
return updateInsertElementsPresent(pageSource) &&
correctInsertUpdatePos(pageSource);
@@ -163,7 +192,8 @@ public class IntegrationTest {
* third test, body replacement
*/
@Test
- public void testViewBody() {
+ public void testViewBody()
+ {
webDriver.get(contextPath + "test2-viewbody.jsf");
resetServerValues();
trigger("cmd_body1", webDriver ->
@@ -177,7 +207,8 @@ public class IntegrationTest {
* third test, testing the chain function
*/
@Test
- public void testChain() {
+ public void testChain()
+ {
webDriver.get(contextPath + "test3-chain.jsf");
resetServerValues();
webDriver.findElement(new ByIdOrName("chaincall")).click();
@@ -190,24 +221,28 @@ public class IntegrationTest {
@Test
- public void testBasicTable() {
+ public void testBasicTable()
+ {
webDriver.get(contextPath + "test4-tablebasic.jsf");
resetServerValues();
- trigger("replace_head", webDriver -> {
+ trigger("replace_head", webDriver ->
+ {
final WebElement testTable = webDriver.findElement(new By.ById("testTable"));
return testTable.getText().contains("column1 in line1 replaced") &&
testTable.getText().contains("script evaled0");
});
- trigger("replace_body", webDriver -> {
+ trigger("replace_body", webDriver ->
+ {
final WebElement tableSegment = webDriver.findElement(new By.ById("body_row1_col1"));
return tableSegment.getText().contains("column1 in line1 replaced") &&
tableSegment.getText().contains("script evaled");
});
- trigger("insert_row_head", webDriver -> {
+ trigger("insert_row_head", webDriver ->
+ {
final WebElement headRow0 = webDriver.findElement(new By.ById("head_row1_0"));
final WebElement headRow1 = webDriver.findElement(new By.ById("head_row1"));
@@ -217,7 +252,8 @@ public class IntegrationTest {
});
- trigger("insert_row_body", webDriver -> {
+ trigger("insert_row_body", webDriver ->
+ {
final WebElement bodyRowCol1 = webDriver.findElement(new By.ById("body_row1_col1"));
final WebElement bodyRowCol2 = webDriver.findElement(new By.ById("body_row1_col2"));
final WebElement bodyRowCol0 = webDriver.findElement(new By.ById("body_row1_3_col1"));
@@ -231,7 +267,8 @@ public class IntegrationTest {
bodyRowCol2.getText().contains("colum2 in line1 replaced");
});
- trigger("insert_column_head", webDriver -> {
+ trigger("insert_column_head", webDriver ->
+ {
final WebElement headCol0 = webDriver.findElement(new By.ById("head_col1_1_4"));
final WebElement headCol1 = webDriver.findElement(new By.ById("head_col1_1_5"));
final WebElement headCol2 = webDriver.findElement(new By.ById("head_col1"));
@@ -251,7 +288,8 @@ public class IntegrationTest {
});
- trigger("insert_column_body", webDriver -> {
+ trigger("insert_column_body", webDriver ->
+ {
final WebElement bodyCol0 = webDriver.findElement(new By.ById("body_row1_col1_1_8"));
final WebElement bodyCol1 = webDriver.findElement(new By.ById("body_row1_col1_1_9"));
final WebElement bodyCol2 = webDriver.findElement(new By.ById("body_row1_col1"));
@@ -270,7 +308,8 @@ public class IntegrationTest {
});
- trigger("insert_body", webDriver -> {
+ trigger("insert_body", webDriver ->
+ {
return webDriver.getPageSource().contains("<tbody>") &&
webDriver.getPageSource().contains("second body added");
});
@@ -278,7 +317,8 @@ public class IntegrationTest {
}
@Test
- public void testViewRootBodyReplacement() {
+ public void testViewRootBodyReplacement()
+ {
webDriver.get(contextPath + "test5-viewbody-full-response.jsf");
resetServerValues();
trigger("cmd_body1", webDriver1 -> webDriver1.getPageSource().contains("Test for body change done") &&
@@ -291,7 +331,8 @@ public class IntegrationTest {
* @param id the trigger element id
* @param condition a condition resolver which should return true if the condition is met
*/
- void trigger(String id, Function<WebDriver, Object> condition) {
+ void trigger(String id, Function<WebDriver, Object> condition)
+ {
webDriver.findElement(new ByIdOrName(id)).click();
waitAjax()
.withTimeout(10, TimeUnit.SECONDS)
@@ -300,7 +341,8 @@ public class IntegrationTest {
//some page state condition helpers
- private boolean updateInsertElementsPresent(String pageSource) {
+ private boolean updateInsertElementsPresent(String pageSource)
+ {
return pageSource.contains(IB_1) &&
pageSource.contains(IB_2) &&
pageSource.contains(IA_2) &&
@@ -309,7 +351,8 @@ public class IntegrationTest {
}
- private boolean correctInsertUpdatePos(String pageSource) {
+ private boolean correctInsertUpdatePos(String pageSource)
+ {
return pageSource.indexOf(IB_1) < pageSource.indexOf(IB_2) &&
pageSource.indexOf(IB_2) < pageSource.indexOf(IEL) &&
pageSource.indexOf(IEL) < pageSource.indexOf(IA_2) &&
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/pom.xml b/integration-tests/autoLookupExpressionFactoryWithoutJSP/pom.xml
index 29ac3567c..bfc77428f 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/pom.xml
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index b2321c373..0d40a8bce 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -42,6 +42,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "exactMapping.war")
.importFrom(new File("target/autoLookupExpressionFactoryWithoutJSP.war"))
.as(WebArchive.class);
diff --git a/integration-tests/automaticExtensionlessMapping/pom.xml b/integration-tests/automaticExtensionlessMapping/pom.xml
index aec1ebbc5..be43038d2 100644
--- a/integration-tests/automaticExtensionlessMapping/pom.xml
+++ b/integration-tests/automaticExtensionlessMapping/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 483915662..73ee3300e 100644
--- a/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -42,6 +42,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "automaticExtensionlessMapping.war")
.importFrom(new File("target/automaticExtensionlessMapping.war"))
.as(WebArchive.class);
diff --git a/integration-tests/exactMapping/pom.xml b/integration-tests/exactMapping/pom.xml
index df9ac698c..bbaf64bb7 100644
--- a/integration-tests/exactMapping/pom.xml
+++ b/integration-tests/exactMapping/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index dff135f6c..4f4a529e3 100644
--- a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -45,6 +45,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "exactMapping.war")
.importFrom(new File("target/exactMapping.war"))
.as(WebArchive.class);
diff --git a/integration-tests/faceletToXhtmlMapping/pom.xml b/integration-tests/faceletToXhtmlMapping/pom.xml
index 055e16d7f..1af92c373 100644
--- a/integration-tests/faceletToXhtmlMapping/pom.xml
+++ b/integration-tests/faceletToXhtmlMapping/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 3c87770d0..a3d8caefa 100644
--- a/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -42,6 +42,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "faceletToXhtmlMapping.war")
.importFrom(new File("target/faceletToXhtmlMapping.war"))
.as(WebArchive.class);
diff --git a/integration-tests/faceletToXhtmlMappingDisabled/pom.xml b/integration-tests/faceletToXhtmlMappingDisabled/pom.xml
index c932fb5b9..f0a3ecee0 100644
--- a/integration-tests/faceletToXhtmlMappingDisabled/pom.xml
+++ b/integration-tests/faceletToXhtmlMappingDisabled/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index e87de9c19..e2d7f8334 100644
--- a/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -42,6 +42,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "faceletToXhtmlMappingDisabled.war")
.importFrom(new File("target/faceletToXhtmlMappingDisabled.war"))
.as(WebArchive.class);
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 8d0a58598..22f168053 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -28,7 +28,7 @@
<artifactId>myfaces-integration-tests</artifactId>
<name>Apache MyFaces Core 4.0 - Integration Tests</name>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M7</version>
<configuration>
<trimStackTrace>false</trimStackTrace>
<systemPropertyVariables>
@@ -119,7 +118,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>10.0.8</version>
+ <version>10.0.27</version>
<scope>provided</scope>
</dependency>
@@ -217,19 +216,19 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>10.0.8</version>
+ <version>10.0.27</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
- <version>10.0.8</version>
+ <version>10.0.27</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
- <version>10.0.8</version>
+ <version>10.0.27</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/integration-tests/protectedViews/pom.xml b/integration-tests/protectedViews/pom.xml
index c0756a5dd..3b444501d 100644
--- a/integration-tests/protectedViews/pom.xml
+++ b/integration-tests/protectedViews/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 6c763be1d..fcf18a6e3 100644
--- a/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -45,6 +45,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "protectedViews.war")
.importFrom(new File("target/protectedViews.war"))
.as(WebArchive.class);
diff --git a/parent/pom.xml b/parent/pom.xml
index 45ef34364..6db337670 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,7 @@
This project is the home of the MyFaces implementation of the JavaServer Faces 2.3 specification, and
consists of an API module (jakarta.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
</description>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<url>https://myfaces.apache.org/#/core40</url>
<issueManagement>
@@ -206,7 +206,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M7</version>
</plugin>
<plugin>
@@ -520,8 +520,4 @@
<siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
<siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>
</properties>
-
- <scm>
- <tag>myfaces-core-module-4.0.0-RC3</tag>
- </scm>
</project>
diff --git a/test/pom.xml b/test/pom.xml
index e833c5184..2423f5e43 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>