Skip to content

Commit

Permalink
Revert "W-17463327: Update parent-pom version in http-connector (#972)…
Browse files Browse the repository at this point in the history 
…" (#975)
  • Loading branch information
@asanguinetti
asanguinetti authored Dec 27, 2024
1 parent add23af commit 5605c9a
Show file tree
Hide file tree
Showing 68 changed files with 307 additions and 525 deletions.
31 changes: 15 additions & 16 deletions build.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
projectType: extension
mavenTool: "3.9.5"

mavenTool: "3.9.9"
jdkTool: OPEN-JDK17
testJdkTool: OPEN-JDK17
mavenAdditionalArgs: -Dmule.jvm.version.extension.enforcement=LOOSE -Dmule.module.tweaking.validation.skip=true
additionalTestConfigs:
mtf-jdk8:
testJdkTool: OPEN-JDK8
mavenAdditionalArgs: -pl mule-http-connector -DskipUnitTests=true
# TODO W-17496009
# mtf-jdk11:
# testJdkTool: OPEN-JDK11
# mavenAdditionalArgs: -pl mule-http-connector -DskipUnitTests=true
jdk21:
testJdkTool: TEMURIN-JDK21
netty-jdk17:
mavenAdditionalArgs: -Drevapi.skip -DexportedPackagesValidator.skip -Dmaven.javadoc.skip=true -Dmule.jvm.version.extension.enforcement=LOOSE -Dmule.module.tweaking.validation.skip=true -Dmule.http.service.implementation=NETTY -DmunitMinMuleVersion=4.9.0
mavenAdditionalArgs: -pl .,mule-http-connector

additionalTestConfigs:
functionalTests:
jdkTool: OPEN-JDK17
mavenAdditionalArgs: -pl functional-tests,functional-tests/http,functional-tests/cors -Drevapi.skip -DexportedPackagesValidator.skip -Dmaven.javadoc.skip=true -Dmule.jvm.version.extension.enforcement=LOOSE -Dmule.module.tweaking.validation.skip=true
munitTests:
testJdkTool: OPEN-JDK17
mavenAdditionalArgs: -pl mule-http-connector -DmunitMinMuleVersion=4.6.0 -Drevapi.skip -DexportedPackagesValidator.skip -Dmaven.javadoc.skip=true -Dmule.jvm.version.extension.enforcement=LOOSE -Dmule.module.tweaking.validation.skip=true
netty-functionalTests:
jdkTool: OPEN-JDK17
mavenAdditionalArgs: -pl functional-tests,functional-tests/http,functional-tests/cors -Dmule.http.service.implementation=NETTY -Drevapi.skip -DexportedPackagesValidator.skip -Dmaven.javadoc.skip=true -Dmule.jvm.version.extension.enforcement=LOOSE -Dmule.module.tweaking.validation.skip=true
netty-munitTests:
testJdkTool: OPEN-JDK17
mavenAdditionalArgs: -pl mule-http-connector -Dmule.http.service.implementation=NETTY -DmunitMinMuleVersion=4.9.0 -Drevapi.skip -DexportedPackagesValidator.skip -Dmaven.javadoc.skip=true -Dmule.jvm.version.extension.enforcement=LOOSE -Dmule.module.tweaking.validation.skip=true
32 changes: 12 additions & 20 deletions functional-tests/http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -248,46 +249,43 @@
<version>${mule.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mule.runtime</groupId>
<artifactId>mule-module-javaee</artifactId>
<version>${mule.version}</version>
<scope>provided</scope>
</dependency>

<!-- Mule Services -->
<dependency>
<groupId>org.mule.services</groupId>
<artifactId>mule-service-scheduler</artifactId>
<classifier>mule-service</classifier>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mule.services</groupId>
<artifactId>mule-service-weave</artifactId>
<classifier>mule-service</classifier>
<version>2.7.2</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mule.runtime</groupId>
<artifactId>mule-dwb-api</artifactId>
<version>2.9.0-20241028</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mule.services</groupId>
<artifactId>mule-service-http</artifactId>
<classifier>mule-service</classifier>
<scope>provided</scope>
<!-- Exclusion: this is needed for registering the secure random for fips testing. The bouncy castle is sealed so the packages can only be registered once -->
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -296,12 +294,6 @@
<artifactId>mule-service-http</artifactId>
<scope>test</scope>
<type>test-jar</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
10 changes: 4 additions & 6 deletions ...st/java/org/mule/test/http/functional/requester/HttpStandardRevocationConfigTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@

import static org.hamcrest.CoreMatchers.both;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsStringIgnoringCase;
import static org.hamcrest.core.StringContains.containsString;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;

Expand All @@ -25,12 +24,11 @@
import java.net.HttpURLConnection;
import java.net.URL;

import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;

import org.hamcrest.MatcherAssert;

public class HttpStandardRevocationConfigTestCase extends AbstractHttpTestCase {

@Override
Expand Down Expand Up @@ -67,6 +65,6 @@ public void revocationWorksWithoutTrustStore() throws Exception {
CoreEvent event = flowRunner("test").keepStreamsOpen().run();
MatcherAssert.assertThat(((HttpResponseAttributes) event.getMessage().getAttributes().getValue()).getStatusCode(),
is(OK.getStatusCode()));
assertThat(event.getMessage(), hasPayload(both(containsString("test")).and(containsStringIgnoringCase("google"))));
assertThat(event.getMessage(), hasPayload(both(containsString("test")).and(containsString("google"))));
}
}
11 changes: 8 additions & 3 deletions ...est/java/org/mule/test/http/functional/requester/crl/HttpInvalidCrlAlgorithmTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@
import static org.mule.test.http.functional.fips.DefaultTestConfiguration.isFipsTesting;

import static java.util.Arrays.asList;
import static java.util.Collections.emptySet;
import static java.util.Collections.singleton;

import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCause;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assume.assumeFalse;

import org.mule.extension.http.internal.temporary.HttpConnector;
import org.mule.extension.socket.api.SocketsExtension;
import org.mule.functional.junit4.AbstractConfigurationFailuresTestCase;
import org.mule.runtime.api.lifecycle.CreateException;
import org.mule.runtime.api.meta.model.ExtensionModel;
Expand Down Expand Up @@ -48,10 +52,11 @@ public void testInvalidCrlAlgorithm() {
}
}

@Override
protected List<ExtensionModel> getRequiredExtensions() {
ExtensionModel mule = MuleExtensionModelProvider.getExtensionModel();
ExtensionModel tls = MuleExtensionModelProvider.getTlsExtensionModel();
return asList(mule, tls);
ExtensionModel sockets = loadExtension(SocketsExtension.class, emptySet());
ExtensionModel http = loadExtension(HttpConnector.class, singleton(sockets));
return asList(mule, tls, http, sockets);
}
}
14 changes: 9 additions & 5 deletions functional-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
<maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>

<muleDependenciesVersion>1.x-SNAPSHOT</muleDependenciesVersion>
<mule.version>4.10.0-SNAPSHOT</mule.version>
<mule.version>4.9.0-SNAPSHOT</mule.version>
<muleBomVersion>${mule.version}</muleBomVersion>
<muleApiVersion>1.10.0-SNAPSHOT</muleApiVersion>
<muleApiVersion>1.9.0-SNAPSHOT</muleApiVersion>
<httpConnectorVersion>${project.version}</httpConnectorVersion>

<!-- fips testing -->
Expand Down Expand Up @@ -95,6 +95,7 @@
<dependency>
<groupId>org.mule.runtime</groupId>
<artifactId>mule-dwb-api</artifactId>
<version>2.9.0-20241028</version>
</dependency>

<!-- fips testing -->
Expand Down Expand Up @@ -255,9 +256,12 @@
<version>${maven.surefire.plugin.version}</version>
<configuration>
<argLine>${surefire.args}</argLine>
<systemPropertyVariables>
<maven.projectVersion>${mule.version}</maven.projectVersion>
</systemPropertyVariables>
<systemProperties>
<property>
<name>maven.projectVersion</name>
<value>${mule.version}</value>
</property>
</systemProperties>
</configuration>
<dependencies>
<dependency>
Expand Down
43 changes: 18 additions & 25 deletions mule-http-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<parent>
<groupId>org.mule.extensions</groupId>
<artifactId>mule-core-modules-parent</artifactId>
<version>1.9.0-rc1</version>
<!-- TODO MULE-15249 if this is upgraded, change the Map to Set in HttpResponseHeaderBuilder -->
<!-- TODO MULE-15803 if this is upgraded, change HttpRequestAttributes#lazyClientCertificate-->
<version>1.1.11</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -19,8 +21,6 @@
<description>A Mule extension that provides HTTP server and client functionality</description>

<properties>
<java.release.version>8</java.release.version>

<jacoco.version>0.8.11</jacoco.version>
<aspectjVersion>1.9.22.1</aspectjVersion>

Expand All @@ -31,8 +31,6 @@
<commonsLang3Version>3.12.0</commonsLang3Version>
<formatterConfigPath>../formatter.xml</formatterConfigPath>

<muleSchedulerServiceVersion>1.1.11</muleSchedulerServiceVersion>
<muleHttpServiceVersion>1.1.1</muleHttpServiceVersion>
<muleJavaEeBomVersion>4.7.2</muleJavaEeBomVersion>
<muleSocketsConnectorVersion>1.2.5</muleSocketsConnectorVersion>
<muleCorsKernelVersion>1.1.2</muleCorsKernelVersion>
Expand All @@ -51,8 +49,8 @@
<munit.version>3.3.1</munit.version>
<mtf-tools.version>1.2.0</mtf-tools.version>
<mavenResources.version>3.3.1</mavenResources.version>
<!-- MUnit minMuleVersion is 4.8.3-S, previous versions are configured via `additionalProducts` -->
<munitMinMuleVersion>4.8.3-SNAPSHOT</munitMinMuleVersion>
<!-- MUnit minMuleVersion is 4.3.0 -->
<munitMinMuleVersion>4.3.0</munitMinMuleVersion>

<muleObjectStoreConnectorTestVersion>1.2.2</muleObjectStoreConnectorTestVersion>

Expand All @@ -70,15 +68,14 @@
<bcpg-fips.version>1.0.7.1</bcpg-fips.version>
<bcmail-fips.version>1.0.4</bcmail-fips.version>
<bc-fips.version>1.0.2.5</bc-fips.version>

<skipUnitTests>false</skipUnitTests>
</properties>

<build>
<plugins>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>${license.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.mulesoft.license</groupId>
Expand Down Expand Up @@ -113,7 +110,6 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>default-jar</id>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
Expand All @@ -124,6 +120,7 @@

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>${mavenResources.version}</version>
<executions>
<execution>
<id>copy-munit-resources</id>
Expand All @@ -147,6 +144,7 @@
<plugin>
<groupId>com.mulesoft.munit</groupId>
<artifactId>munit-extensions-maven-plugin</artifactId>
<version>${munit.extensions.maven.plugin.version}</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -177,10 +175,6 @@
<includeSnapshots>true</includeSnapshots>
<latestPatches>true</latestPatches>
</discoverRuntimes>
<additionalRuntimes>
<additionalRuntime>MULE_EE:4.6.11-SNAPSHOT</additionalRuntime>
<additionalRuntime>MULE_EE:4.4.1-SNAPSHOT</additionalRuntime>
</additionalRuntimes>
</runtimeConfiguration>
</configuration>
<dependencies>
Expand Down Expand Up @@ -214,9 +208,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>${skipUnitTests}</skipTests>
</configuration>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
Expand Down Expand Up @@ -477,6 +468,7 @@
<plugin>
<groupId>com.mulesoft.munit</groupId>
<artifactId>munit-extensions-maven-plugin</artifactId>
<version>${munit.extensions.maven.plugin.version}</version>
<configuration>
<argLines>
<argLine>
Expand Down Expand Up @@ -522,20 +514,21 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.args}</argLine>
<systemPropertyVariables>
<systemProperties>
<mule.fips.testing>true</mule.fips.testing>
</systemPropertyVariables>
<properties>
<property>
<name>listener</name>
<value>org.mule.test.AllureJunit4</value>
</property>
</properties>
</systemProperties>
<properties>
<property>
<name>listener</name>
<value>org.mule.test.AllureJunit4</value>
</property>
</properties>
</configuration>
</plugin>
<plugin>
<groupId>com.mulesoft.munit</groupId>
<artifactId>munit-extensions-maven-plugin</artifactId>
<version>${munit.extensions.maven.plugin.version}</version>
<configuration>
<argLines>
<argLine>
Expand Down
14 changes: 0 additions & 14 deletions mule-http-connector/src/main/java/org/mule/extension/http/api/BaseHttpRequestAttributes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ public class BaseHttpRequestAttributes extends HttpAttributes {
@Parameter
protected String requestPath;

public BaseHttpRequestAttributes() {}

public BaseHttpRequestAttributes(MultiMap<String, String> headers, MultiMap<String, String> queryParams,
Map<String, String> uriParams, String requestPath) {
super(headers);
Expand All @@ -52,23 +50,11 @@ public String getRequestPath() {
return requestPath;
}

public void setRequestPath(String requestPath) {
this.requestPath = requestPath;
}

public MultiMap<String, String> getQueryParams() {
return queryParams;
}

public void setQueryParams(MultiMap<String, String> queryParams) {
this.queryParams = queryParams;
}

public Map<String, String> getUriParams() {
return uriParams;
}

public void setUriParams(Map<String, String> uriParams) {
this.uriParams = uriParams;
}
}
Loading

0 comments on commit 5605c9a

Please sign in to comment.