From f7e5006c06de1613eee6d09da701d8cfe6364f1c Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:31:48 -0300 Subject: [PATCH 01/12] [UNDERTOW-2171] Upgrade H2 Database test dependency to 2.1.214 Also: update JDBCLogDatabaseTestCase accordingly, since version 2 the database no longer supports UNSIGNED types, and remote host field column adds blank spaces Signed-off-by: Flavia Rainone --- .../undertow/server/handlers/JDBCLogDatabaseTestCase.java | 8 +++++--- pom.xml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/test/java/io/undertow/server/handlers/JDBCLogDatabaseTestCase.java b/core/src/test/java/io/undertow/server/handlers/JDBCLogDatabaseTestCase.java index 3f23c7b385..3e44f52214 100644 --- a/core/src/test/java/io/undertow/server/handlers/JDBCLogDatabaseTestCase.java +++ b/core/src/test/java/io/undertow/server/handlers/JDBCLogDatabaseTestCase.java @@ -85,8 +85,8 @@ public void setup() throws SQLException { " virtualHost VARCHAR(64)," + " method VARCHAR(8)," + " query VARCHAR(255) NOT NULL," + - " status SMALLINT UNSIGNED NOT NULL," + - " bytes INT UNSIGNED NOT NULL," + + " status SMALLINT NOT NULL," + + " bytes INT NOT NULL," + " referer VARCHAR(128)," + " userAgent VARCHAR(128)," + " PRIMARY KEY (id)" + @@ -150,7 +150,9 @@ public void testSingleLogMessageToDatabase() throws IOException, InterruptedExce statement = conn.createStatement(); ResultSet resultDatabase = statement.executeQuery("SELECT * FROM PUBLIC.ACCESS;"); resultDatabase.next(); - Assert.assertEquals(DefaultServer.getDefaultServerAddress().getAddress().getHostAddress(), resultDatabase.getString(logHandler.getRemoteHostField())); + // for some reason H2 database version 2 is filling in extra blanks in the remote host field. So, even though + // Undertow sets "127.0.0.1", h2 database is witing "127.0.0.1 " (length 15), so, just trim it + Assert.assertEquals(DefaultServer.getDefaultServerAddress().getAddress().getHostAddress(), resultDatabase.getString(logHandler.getRemoteHostField()).trim()); Assert.assertEquals("5", resultDatabase.getString(logHandler.getBytesField())); Assert.assertEquals("200", resultDatabase.getString(logHandler.getStatusField())); client.getConnectionManager().shutdown(); diff --git a/pom.xml b/pom.xml index 482f201564..4fec0744a7 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ versions, add the artifactId or other qualifier to the property name. For example: --> - 1.4.200 + 2.1.214 4.2 2.0.0 6.0.0 From c78b4fdee011e582b3e276ab5d1884e800c5e41f Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:35:24 -0300 Subject: [PATCH 02/12] [UNDERTOW-2172] Upgrade easymock to 4.3 Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4fec0744a7..d6abc0963b 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ For example: --> 2.1.214 - 4.2 + 4.3 2.0.0 6.0.0 2.1.0 From 36f5e831a55f0286d1ae71e29f7c5fe74ff89f21 Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:36:02 -0300 Subject: [PATCH 03/12] [UNDERTOW-2173] Upgrade Jakarta Annotation API to 2.1.1. Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d6abc0963b..08e359342d 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ --> 2.1.214 4.3 - 2.0.0 + 2.1.1 6.0.0 2.1.0 1.0.13.Final From 547deba20c0b178e207b258792ce47099d41bc61 Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:37:24 -0300 Subject: [PATCH 04/12] [UNDERTOW-2174] Remove batavia plugin config and dependencies Signed-off-by: Flavia Rainone --- pom.xml | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/pom.xml b/pom.xml index 08e359342d..30c7ff775e 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,6 @@ 2.1.1 6.0.0 2.1.0 - 1.0.13.Final 4.13 4.1.50.Final 2.0.0-M15 @@ -291,30 +290,6 @@ maven-bundle-plugin ${version.bundle.plugin} - - org.wildfly.extras.batavia - transformer-tools-mvn - ${version.org.wildfly.extras.batavia} - - - transform-sources - generate-sources - - transform-sources - - - ${jakarta.transformer.input.dir} - - - - - - org.wildfly.extras.batavia - transformer-impl-eclipse - ${version.org.wildfly.extras.batavia} - - - @@ -557,18 +532,6 @@ provided - - org.wildfly.extras.batavia - transformer-api - ${version.org.wildfly.extras.batavia} - - - - org.wildfly.extras.batavia - transformer-impl-eclipse - ${version.org.wildfly.extras.batavia} - - From d73a8a2f26a4a91a4da7312ab9a87167439c6c3c Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:38:11 -0300 Subject: [PATCH 05/12] [UNDERTOW-2175] Upgrade JUnit to 4.13.2 Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30c7ff775e..23c90193af 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 2.1.1 6.0.0 2.1.0 - 4.13 + 4.13.2 4.1.50.Final 2.0.0-M15 4.5.12 From 6b7d2b04b77823c2aa93ab2e9d6a74ae10c1c7fe Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:38:56 -0300 Subject: [PATCH 06/12] [UNDERTOW-2177] Upgrade Netty to 4.1.82.Final Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23c90193af..fb1abb49d3 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 6.0.0 2.1.0 4.13.2 - 4.1.50.Final + 4.1.82.Final 2.0.0-M15 4.5.12 1.2.4.Final From 2778298b99a3814720e6e2125aa8249f63db094d Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:40:16 -0300 Subject: [PATCH 07/12] [UNDERTOW-2178] Upgrade JBoss Class File Writer to 1.2.5.Final Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb1abb49d3..255674d618 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 4.1.82.Final 2.0.0-M15 4.5.12 - 1.2.4.Final + 1.2.5.Final 3.4.1.Final 2.2.1.Final 2.1.14.Final From d663f008d58c46eec5c3f359fdc87c880d37d64d Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:40:45 -0300 Subject: [PATCH 08/12] [UNDERTOW-2179] Upgrade JBoss Logging to 3.4.3.Final Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 255674d618..6d0db2031f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 2.0.0-M15 4.5.12 1.2.5.Final - 3.4.1.Final + 3.4.3.Final 2.2.1.Final 2.1.14.Final 3.8.7.Final From acb81a1738d1946f03fc26e70faec025fc76290a Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:41:23 -0300 Subject: [PATCH 09/12] [UNDERTOW-2180] Upgrade JBoss Log Manager to 2.1.19.Final Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d0db2031f..59e0f85a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 1.2.5.Final 3.4.3.Final 2.2.1.Final - 2.1.14.Final + 2.1.19.Final 3.8.7.Final 3.1.0.Final From 8e3310cb6510ae8281b74da7cf70d00f15ea9dfc Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:42:00 -0300 Subject: [PATCH 10/12] [UNDERTOW-2181] Upgrade XNIO to 3.8.8.Final (CVE-2022-0084) Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59e0f85a5b..efa39f1780 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 3.4.3.Final 2.2.1.Final 2.1.19.Final - 3.8.7.Final + 3.8.8.Final 3.1.0.Final 1.5.4.Final From a155c0139ff53ca8f38953be37b56dc05b56f193 Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:42:40 -0300 Subject: [PATCH 11/12] [UNDERTOW-2182] Upgrade JBoss Threads to 3.5.0.Final Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efa39f1780..e2c62cf944 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 2.1.19.Final 3.8.8.Final - 3.1.0.Final + 3.5.0.Final 1.5.4.Final 1.0.1.Final From 3b5747900b2ec75569f2c4c1c0366d8cd1a543ac Mon Sep 17 00:00:00 2001 From: Flavia Rainone Date: Wed, 12 Oct 2022 04:43:14 -0300 Subject: [PATCH 12/12] [UNDERTOW-2183] Upgrade WildFly Common to 1.6.0.Final Signed-off-by: Flavia Rainone --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2c62cf944..1a9579b845 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 3.8.8.Final 3.5.0.Final - 1.5.4.Final + 1.6.0.Final 1.0.1.Final