You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/08/02 18:03:19 UTC
[camel-quarkus] branch main updated: Restore AS2 testing
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 047fee618b Restore AS2 testing
047fee618b is described below
commit 047fee618b6bcbed50b9a620e42f87a00699fa0b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Aug 2 10:49:18 2023 +0100
Restore AS2 testing
---
.../camel/quarkus/component/as2/it/As2CertificateHelper.java | 8 +++++---
.../org/apache/camel/quarkus/component/as2/it/As2Receiver.java | 2 +-
.../java/org/apache/camel/quarkus/component/as2/it/As2Test.java | 2 ++
integration-tests/pom.xml | 2 +-
poms/bom/pom.xml | 4 ++++
poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++++
poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++++
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++++
tooling/scripts/test-categories.yaml | 1 +
9 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/integration-tests/as2/src/main/java/org/apache/camel/quarkus/component/as2/it/As2CertificateHelper.java b/integration-tests/as2/src/main/java/org/apache/camel/quarkus/component/as2/it/As2CertificateHelper.java
index 5a66ebec0d..e4e905f6af 100644
--- a/integration-tests/as2/src/main/java/org/apache/camel/quarkus/component/as2/it/As2CertificateHelper.java
+++ b/integration-tests/as2/src/main/java/org/apache/camel/quarkus/component/as2/it/As2CertificateHelper.java
@@ -76,7 +76,7 @@ public class As2CertificateHelper {
kpg.initialize(1024, new SecureRandom());
- String issueDN = "O=Earth 2 Software, C=E2";
+ String issueDN = "O=Punkhorn Software, C=US";
KeyPair issueKP = kpg.generateKeyPair();
X509Certificate issueCert = makeCertificate(
issueKP, issueDN, issueKP, issueDN);
@@ -84,7 +84,7 @@ public class As2CertificateHelper {
//
// certificate we sign against
//
- String signingDN = "CN=Shekdon, E=test@gmail.com, O=Earth 2 Software, C=E2";
+ String signingDN = "CN=Shekdon, E=test@gmail.com, O=Punkhorn Software, C=US";
signingKP = kpg.generateKeyPair();
signingCert = makeCertificate(
signingKP, signingDN, issueKP, issueDN);
@@ -145,7 +145,9 @@ public class As2CertificateHelper {
HTTP_SOCKET_TIMEOUT,
HTTP_CONNECTION_TIMEOUT,
HTTP_CONNECTION_POOL_SIZE,
- HTTP_CONNECTION_POOL_TTL);
+ HTTP_CONNECTION_POOL_TTL,
+ null,
+ null);
return clientConnection;
}
diff --git a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Receiver.java b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Receiver.java
index aa49b00fab..b014c81c57 100644
--- a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Receiver.java
+++ b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Receiver.java
@@ -133,7 +133,7 @@ public class As2Receiver {
SERVER_FQDN, port, AS2SignatureAlgorithm.SHA256WITHRSA,
serverCertList.toArray(new Certificate[0]), serverSigningKP.getPrivate(), serverSigningKP.getPrivate(),
MDN_MESSAGE_TEMPLATE,
- new Certificate[] { clientCert });
+ new Certificate[] { clientCert }, null);
RequestHandler handler = new RequestHandler();
serverConnection.listen("/", handler);
diff --git a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Test.java b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Test.java
index b5837b5bcb..d0a1c20ec5 100644
--- a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Test.java
+++ b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Test.java
@@ -31,6 +31,7 @@ import org.apache.camel.quarkus.component.as2.it.transport.ServerResult;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,6 +92,7 @@ public class As2Test {
clientTest(As2Helper.createEncryptedRequest());
}
+ @Disabled("https://github.com/apache/camel-quarkus/issues/4492")
@Test
public void clientMultipartSignedTest() throws Exception {
ClientResult clientResult = clientTest(As2Helper.createMultipartSignedRequest());
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index b4f8dba44b..34a4ae4fed 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -57,7 +57,7 @@
<module>activemq</module>
<module>amqp</module>
<module>arangodb</module>
- <!--<module>as2</module> https://github.com/apache/camel-quarkus/issues/4492 -->
+ <module>as2</module>
<module>atlasmap</module>
<module>avro</module>
<!--<module>avro-rpc</module>-->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 32c877f1b9..3b18587f9a 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -136,6 +136,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-debug-jdk18on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index f6cfd2f523..1b6428fbcd 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -84,6 +84,10 @@
<groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>commons-logging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>bcprov-debug-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index dabdc1256e..ef198c46c9 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -84,6 +84,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-debug-jdk18on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 2caf1e2863..c269e6a2bd 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -84,6 +84,10 @@
<groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>commons-logging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>bcprov-debug-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index d5762c07b4..a14f32a974 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -152,6 +152,7 @@ group-09:
- spring-rabbitmq
- xpath
group-10:
+ - as2
- aws2-quarkus-client-grouped
- atlasmap
- braintree