Skip to content

Commit 220e28e

Browse files
eze210eze210
authored
Merge branch 'master' into chore/restore-munit
2 parents 7e84113 + 1ae83e8 commit 220e28e

File tree

7 files changed

+16
-21
lines changed

7 files changed

+16
-21
lines changed

‎functional-tests/http/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<javax.servlet.api.version>3.1.0</javax.servlet.api.version>
2323

24-
<grizzly.version>2.3.36-MULE-025</grizzly.version>
24+
<grizzly.version>2.3.36-MULE-026</grizzly.version>
2525
<grizzly.ahc.version>1.14-MULE-023</grizzly.ahc.version>
2626
<apacheAsyncClientVersion>4.1.5</apacheAsyncClientVersion>
2727
<jettyVersion>9.4.53.v20231009</jettyVersion>

‎functional-tests/http/src/test/java/org/mule/test/http/functional/HttpListenerTlsRestrictedProtocolsAndCiphersTestCase.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*/
77
package org.mule.test.http.functional;
88

9-
import static org.mule.runtime.core.privileged.security.tls.TlsConfiguration.DEFAULT_SECURITY_MODEL;
10-
import static org.mule.runtime.core.privileged.security.tls.TlsConfiguration.PROPERTIES_FILE_PATTERN;
119
import static org.mule.test.http.functional.AllureConstants.HttpFeature.HttpStory.HTTPS;
1210

1311
import static org.junit.Assert.assertEquals;
@@ -58,7 +56,7 @@ public static void removeTlsPropertiesFile() {
5856
}
5957

6058
private static File getTlsPropertiesFile() {
61-
return new File(String.format(PROPERTIES_FILE_PATTERN, DEFAULT_SECURITY_MODEL));
59+
return new File("tls-default.conf");
6260
}
6361

6462
@Override

‎functional-tests/http/src/test/java/org/mule/test/http/functional/HttpRequesterTlsRestrictedProtocolsAndCiphersTestCase.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
*/
77
package org.mule.test.http.functional;
88

9+
import static org.mule.runtime.api.exception.ExceptionHelper.getRootException;
10+
import static org.mule.test.http.functional.AllureConstants.HttpFeature.HttpStory.HTTPS;
11+
912
import static org.hamcrest.CoreMatchers.equalTo;
1013
import static org.hamcrest.Matchers.instanceOf;
1114
import static org.junit.Assert.assertThat;
1215
import static org.junit.Assert.fail;
13-
import static org.mule.runtime.api.exception.ExceptionHelper.getRootException;
14-
import static org.mule.runtime.core.privileged.security.tls.TlsConfiguration.DEFAULT_SECURITY_MODEL;
15-
import static org.mule.runtime.core.privileged.security.tls.TlsConfiguration.PROPERTIES_FILE_PATTERN;
16-
import static org.mule.test.http.functional.AllureConstants.HttpFeature.HttpStory.HTTPS;
16+
1717
import org.mule.runtime.core.api.util.FileUtils;
1818
import org.mule.runtime.core.api.util.IOUtils;
1919
import org.mule.tck.junit4.rule.DynamicPort;
@@ -66,7 +66,7 @@ public static void removeTlsPropertiesFile() {
6666

6767

6868
private static File getTlsPropertiesFile() {
69-
return new File(String.format(PROPERTIES_FILE_PATTERN, DEFAULT_SECURITY_MODEL));
69+
return new File("tls-default.conf");
7070
}
7171

7272
@Override

‎functional-tests/http/src/test/java/org/mule/test/http/functional/requester/HttpsRequesterSniTestCase.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
*/
77
package org.mule.test.http.functional.requester;
88

9-
import static java.lang.String.format;
109
import static org.hamcrest.CoreMatchers.containsString;
1110
import static org.hamcrest.CoreMatchers.notNullValue;
1211
import static org.hamcrest.core.Is.is;
1312
import static org.junit.Assert.assertThat;
1413
import static org.junit.Assume.assumeThat;
15-
import static org.mule.runtime.core.privileged.security.tls.TlsConfiguration.DEFAULT_SECURITY_MODEL;
16-
import static org.mule.runtime.core.privileged.security.tls.TlsConfiguration.PROPERTIES_FILE_PATTERN;
14+
1715
import org.mule.runtime.core.api.util.ClassUtils;
1816
import org.mule.tck.junit4.rule.DynamicPort;
1917
import org.mule.test.http.functional.AbstractHttpTestCase;
@@ -82,7 +80,7 @@ private static File getTlsPropertiesFile() {
8280
if (path == null) {
8381
path = ClassUtils.getClassPathRoot(HttpsRequesterSniTestCase.class).getPath();
8482
}
85-
return new File(path, format(PROPERTIES_FILE_PATTERN, DEFAULT_SECURITY_MODEL));
83+
return new File(path, "tls-default.conf");
8684
}
8785

8886
@Before

‎functional-tests/http/src/test/java/org/mule/test/http/functional/requester/crl/HttpInvalidCrlAlgorithmTestCase.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
package org.mule.test.http.functional.requester.crl;
88

9-
import static org.mule.runtime.core.privileged.security.tls.TlsConfiguration.formatInvalidCrlAlgorithm;
109

1110
import static java.util.Arrays.asList;
1211
import static java.util.Collections.emptySet;
@@ -16,12 +15,10 @@
1615
import static org.hamcrest.CoreMatchers.instanceOf;
1716
import static org.hamcrest.core.Is.is;
1817
import static org.junit.Assert.assertThat;
19-
import static org.junit.Assert.fail;
2018

2119
import org.mule.extension.http.internal.temporary.HttpConnector;
2220
import org.mule.extension.socket.api.SocketsExtension;
2321
import org.mule.functional.junit4.AbstractConfigurationFailuresTestCase;
24-
import org.mule.runtime.api.exception.MuleException;
2522
import org.mule.runtime.api.lifecycle.CreateException;
2623
import org.mule.runtime.api.meta.model.ExtensionModel;
2724
import org.mule.runtime.core.api.extension.provider.MuleExtensionModelProvider;
@@ -30,17 +27,19 @@
3027

3128
import org.junit.Test;
3229

33-
3430
public class HttpInvalidCrlAlgorithmTestCase extends AbstractConfigurationFailuresTestCase {
3531

32+
public static final String INVALID_CRL_ALGORITHM_SunX509 =
33+
"TLS Context: certificate revocation checking is only available for algorithm PKIX (current value is SunX509)";
34+
3635
@Test
3736
public void testInvalidCrlAlgorithm() {
3837
try {
3938
loadConfiguration("http-requester-tls-crl-invalid-algorithm-config.xml");
4039
} catch (Exception e) {
4140
Throwable rootCause = getRootCause(e);
4241
assertThat(rootCause, instanceOf(CreateException.class));
43-
assertThat(rootCause.getMessage(), is(formatInvalidCrlAlgorithm("SunX509")));
42+
assertThat(rootCause.getMessage(), is(INVALID_CRL_ALGORITHM_SunX509));
4443
}
4544
}
4645

‎mule-http-connector/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<properties>
2424
<jacoco.version>0.8.11</jacoco.version>
25-
<aspectjVersion>1.9.2</aspectjVersion>
25+
<aspectjVersion>1.9.21.1</aspectjVersion>
2626

2727
<fluentHcVersion>4.5.13</fluentHcVersion>
2828
<grizzlyVersion>2.3.36-MULE-026</grizzlyVersion>
@@ -54,7 +54,7 @@
5454

5555
<muleObjectStoreConnectorTestVersion>1.3.0-SNAPSHOT</muleObjectStoreConnectorTestVersion>
5656

57-
<springVersion>5.3.30</springVersion>
57+
<springVersion>5.3.32</springVersion>
5858

5959
<mulesoftLicenseVersion>1.4.0</mulesoftLicenseVersion>
6060
<license.maven.plugin.version>4.2</license.maven.plugin.version>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<mavenCompilerVersion>3.11.0</mavenCompilerVersion>
1717

1818
<jacoco.version>0.8.11</jacoco.version>
19-
<aspectjVersion>1.9.2</aspectjVersion>
19+
<aspectjVersion>1.9.21.1</aspectjVersion>
2020
</properties>
2121

2222
<modules>

0 commit comments

Comments
 (0)