From 47e9ea17936fbc1649944783a2a0f8a20637fe8c Mon Sep 17 00:00:00 2001 From: elrodro83 Date: Fri, 3 Jan 2025 11:36:35 -0300 Subject: [PATCH 1/2] W-17369306: Update Jetty/Wiremock to latest in the whole Uber --- extensions-xml-support/pom.xml | 7 +------ .../AbstractModuleWithHttpTestCase.java | 15 ++++++++------- integration/pom.xml | 2 +- .../integration/tck/WeatherReportType.java | 18 ------------------ .../org/mule/test/issues/ObjectFactory.java | 18 ------------------ oauth/pom.xml | 3 +-- tracing/pom.xml | 5 ++--- 7 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 integration/src/test/java/org/mule/test/integration/tck/WeatherReportType.java delete mode 100644 integration/src/test/java/org/mule/test/issues/ObjectFactory.java diff --git a/extensions-xml-support/pom.xml b/extensions-xml-support/pom.xml index b67ac8cac6..7c8a73a36f 100644 --- a/extensions-xml-support/pom.xml +++ b/extensions-xml-support/pom.xml @@ -87,7 +87,7 @@ test - com.github.tomakehurst + org.wiremock wiremock test @@ -245,11 +245,6 @@ test - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - test - org.mule.runtime mule-module-extensions-spring-support diff --git a/extensions-xml-support/src/test/java/org/mule/test/functional/AbstractModuleWithHttpTestCase.java b/extensions-xml-support/src/test/java/org/mule/test/functional/AbstractModuleWithHttpTestCase.java index cba15b2c69..b65c44a5c4 100644 --- a/extensions-xml-support/src/test/java/org/mule/test/functional/AbstractModuleWithHttpTestCase.java +++ b/extensions-xml-support/src/test/java/org/mule/test/functional/AbstractModuleWithHttpTestCase.java @@ -6,10 +6,10 @@ */ package org.mule.test.functional; - import static java.util.Base64.getDecoder; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; + +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -18,17 +18,18 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.AbstractHandler; + import org.junit.After; import org.junit.Before; import org.junit.Rule; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public abstract class AbstractModuleWithHttpTestCase extends AbstractCeXmlExtensionMuleArtifactFunctionalTestCase { protected static final String MODULE_GLOBAL_ELEMENT_XML = "modules/module-global-element.xml"; diff --git a/integration/pom.xml b/integration/pom.xml index 6700a2cf07..3504be7db4 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -340,7 +340,7 @@ test - com.github.tomakehurst + org.wiremock wiremock test diff --git a/integration/src/test/java/org/mule/test/integration/tck/WeatherReportType.java b/integration/src/test/java/org/mule/test/integration/tck/WeatherReportType.java deleted file mode 100644 index 57e4b34795..0000000000 --- a/integration/src/test/java/org/mule/test/integration/tck/WeatherReportType.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2023 Salesforce, Inc. All rights reserved. - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. - */ -package org.mule.test.integration.tck; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "weatherReport") -@XmlType(name = "WeatherReportType") -public class WeatherReportType { - - public String zipCode; - public String report; -} diff --git a/integration/src/test/java/org/mule/test/issues/ObjectFactory.java b/integration/src/test/java/org/mule/test/issues/ObjectFactory.java deleted file mode 100644 index a0f01bb75b..0000000000 --- a/integration/src/test/java/org/mule/test/issues/ObjectFactory.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2023 Salesforce, Inc. All rights reserved. - * The software in this package is published under the terms of the CPAL v1.0 - * license, a copy of which has been included with this distribution in the - * LICENSE.txt file. - */ -package org.mule.test.issues; - -import org.junit.Ignore; - -import javax.xml.bind.annotation.XmlRegistry; - -@XmlRegistry -@Ignore -public class ObjectFactory { - - public ObjectFactory() {} -} diff --git a/oauth/pom.xml b/oauth/pom.xml index 45e0b508c9..32587df2ed 100644 --- a/oauth/pom.xml +++ b/oauth/pom.xml @@ -194,11 +194,10 @@ org.apache.httpcomponents fluent-hc - ${apacheHttpClientVersion} test - com.github.tomakehurst + org.wiremock wiremock test diff --git a/tracing/pom.xml b/tracing/pom.xml index b91c27db16..2b97008798 100644 --- a/tracing/pom.xml +++ b/tracing/pom.xml @@ -302,10 +302,9 @@ ${openTelemetryProtoVersion} test - - com.github.tomakehurst - wiremock-standalone + org.wiremock + wiremock test From 9b35397780fb829c45d7626ff039f13f88b1272c Mon Sep 17 00:00:00 2001 From: elrodro83 Date: Fri, 3 Jan 2025 19:48:36 -0300 Subject: [PATCH 2/2] W-17369306: Update Jetty/Wiremock to latest in the whole Uber