diff --git a/deprecated/alfresco-transformer-base/pom.xml b/deprecated/alfresco-transformer-base/pom.xml
index de672263..24016daf 100644
--- a/deprecated/alfresco-transformer-base/pom.xml
+++ b/deprecated/alfresco-transformer-base/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/MTLSConfig.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/MTLSConfig.java
index 86867ae6..e0446bd6 100644
--- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/MTLSConfig.java
+++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/MTLSConfig.java
@@ -121,13 +121,10 @@ public class MTLSConfig {
private RestTemplate createRestTemplateWithSslContext(SSLContextBuilder sslContextBuilder) throws NoSuchAlgorithmException, KeyManagementException {
SSLContext sslContext = sslContextBuilder.build();
- SSLConnectionSocketFactory sslContextFactory = new SSLConnectionSocketFactory(sslContext);
+ SSLConnectionSocketFactory sslContextFactory = hostNameVerificationDisabled ? new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE)
+ : new SSLConnectionSocketFactory(sslContext);
HttpClientBuilder httpClientBuilder = HttpClients.custom().setSSLSocketFactory(sslContextFactory);
- if(hostNameVerificationDisabled)
- {
- httpClientBuilder.setSSLHostnameVerifier(new NoopHostnameVerifier());
- }
CloseableHttpClient httpClient = httpClientBuilder.build();
ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
return new RestTemplate(requestFactory);
diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml
index e74aa64a..1c11b15f 100644
--- a/engines/aio/pom.xml
+++ b/engines/aio/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
@@ -141,7 +141,7 @@
org.apache.maven.plugins
maven-dependency-plugin
- 3.3.0
+ 3.5.0
${project.groupId}
alfresco-transform-imagemagick,alfresco-transform-libreoffice,alfresco-transform-misc,alfresco-transform-pdf-renderer,alfresco-transform-tika
@@ -240,7 +240,7 @@
- alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+ alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
activemq
diff --git a/engines/base/pom.xml b/engines/base/pom.xml
index 3aaccf89..106e7f39 100644
--- a/engines/base/pom.xml
+++ b/engines/base/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java b/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
index a7830169..9e7d7b64 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
@@ -170,7 +170,7 @@ public class MTLSConfig {
SSLParameters sslParameters = sslEngine.getSSLParameters();
if(hostNameVerificationDisabled)
{
- sslParameters.setEndpointIdentificationAlgorithm(null);
+ sslParameters.setEndpointIdentificationAlgorithm("");
} else {
sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
}
@@ -180,13 +180,10 @@ public class MTLSConfig {
private RestTemplate createRestTemplateWithSslContext(SSLContextBuilder sslContextBuilder) throws NoSuchAlgorithmException, KeyManagementException {
SSLContext sslContext = sslContextBuilder.build();
- SSLConnectionSocketFactory sslContextFactory = new SSLConnectionSocketFactory(sslContext);
+ SSLConnectionSocketFactory sslContextFactory = hostNameVerificationDisabled ? new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE)
+ : new SSLConnectionSocketFactory(sslContext);
HttpClientBuilder httpClientBuilder = HttpClients.custom().setSSLSocketFactory(sslContextFactory);
- if(hostNameVerificationDisabled)
- {
- httpClientBuilder.setSSLHostnameVerifier(new NoopHostnameVerifier());
- }
CloseableHttpClient httpClient = httpClientBuilder.build();
ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
return new RestTemplate(requestFactory);
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java b/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
index ecaea580..63f8ffdd 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
@@ -1,5 +1,6 @@
package org.alfresco.transform.base;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
@@ -23,12 +24,18 @@ import java.security.cert.CertificateException;
public class MtlsTestUtils {
private static final boolean MTLS_ENABLED = Boolean.parseBoolean(System.getProperty("test-mtls-enabled"));
+ private static final boolean HOSTNAME_VERIFICATION_DISABLED = Boolean.parseBoolean(System.getProperty("test-client-disable-hostname-verification"));
public static boolean isMtlsEnabled()
{
return MTLS_ENABLED;
}
+ public static boolean isHostnameVerificationDisabled()
+ {
+ return HOSTNAME_VERIFICATION_DISABLED;
+ }
+
public static CloseableHttpClient httpClientWithMtls() throws NoSuchAlgorithmException, KeyManagementException, UnrecoverableKeyException, KeyStoreException, IOException, CertificateException
{
String keyStoreFile = System.getProperty("test-client-keystore-file");
@@ -52,7 +59,9 @@ public class MtlsTestUtils {
.loadTrustMaterial(trustStore, trustStorePassword);
SSLContext sslContext = sslContextBuilder.build();
- SSLConnectionSocketFactory sslContextFactory = new SSLConnectionSocketFactory(sslContext);
+ SSLConnectionSocketFactory sslContextFactory = HOSTNAME_VERIFICATION_DISABLED ? new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE)
+ : new SSLConnectionSocketFactory(sslContext);
+
return HttpClients.custom().setSSLSocketFactory(sslContextFactory).build();
}
diff --git a/engines/example/pom.xml b/engines/example/pom.xml
index e8ad7c8a..3337c981 100644
--- a/engines/example/pom.xml
+++ b/engines/example/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
@@ -114,7 +114,7 @@
- alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+ alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
activemq
@@ -123,7 +123,7 @@
61616:61616
- Apache ActiveMQ 5.17.1 .* started
+ Apache ActiveMQ 5.* started
500
100
diff --git a/engines/imagemagick/pom.xml b/engines/imagemagick/pom.xml
index af649d0e..b688f2b5 100644
--- a/engines/imagemagick/pom.xml
+++ b/engines/imagemagick/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
@@ -106,7 +106,7 @@
- alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+ alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
activemq
@@ -115,7 +115,7 @@
61616:61616
- Apache ActiveMQ 5.17.1 .* started
+ Apache ActiveMQ 5.* started
500
100
diff --git a/engines/libreoffice/pom.xml b/engines/libreoffice/pom.xml
index 184cdb5a..0d8038e3 100644
--- a/engines/libreoffice/pom.xml
+++ b/engines/libreoffice/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
@@ -110,7 +110,7 @@
- alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+ alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
activemq
@@ -119,7 +119,7 @@
61616:61616
- Apache ActiveMQ 5.17.1 .* started
+ Apache ActiveMQ 5.* started
500
100
diff --git a/engines/misc/pom.xml b/engines/misc/pom.xml
index 68b21fa1..ea328e1e 100644
--- a/engines/misc/pom.xml
+++ b/engines/misc/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
diff --git a/engines/pdfrenderer/pom.xml b/engines/pdfrenderer/pom.xml
index 05a3493a..c596baff 100644
--- a/engines/pdfrenderer/pom.xml
+++ b/engines/pdfrenderer/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
@@ -102,7 +102,7 @@
- alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+ alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
activemq
@@ -111,7 +111,7 @@
61616:61616
- Apache ActiveMQ 5.17.1 .* started
+ Apache ActiveMQ 5.* started
500
100
diff --git a/engines/tika/pom.xml b/engines/tika/pom.xml
index 855fd338..531793f6 100644
--- a/engines/tika/pom.xml
+++ b/engines/tika/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
../../pom.xml
@@ -82,7 +82,7 @@
joda-time
joda-time
- 2.11.0
+ 2.12.5
@@ -198,7 +198,7 @@
- alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+ alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
activemq
@@ -207,7 +207,7 @@
61616:61616
- Apache ActiveMQ 5.17.1 .* started
+ Apache ActiveMQ 5.* started
500
100
diff --git a/model/pom.xml b/model/pom.xml
index 322e604f..f3264956 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -8,7 +8,7 @@
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
@@ -112,21 +112,8 @@
2.0.1.alfresco-2
- third-party-licenses
-
- add-third-party
- download-licenses
-
- generate-resources
-
- true
- provided,test
- org.alfresco
- true
- https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt
- https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt
- https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties
-
+ project-license
+ none
@@ -141,7 +128,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.2.2
+ 3.3.0
diff --git a/pom.xml b/pom.xml
index cb2ffcc7..5480e7cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,33 +3,32 @@
4.0.0
org.alfresco
alfresco-transform-core
- 3.1.0-A6-SNAPSHOT
+ 3.2.0-A2-SNAPSHOT
Alfresco Transform Core
pom
org.springframework.boot
spring-boot-starter-parent
- 2.7.10
+ 2.7.11
- 11
- 11
- 11
+ 17
+ 17
+ 17
latest
2.0.26
- 3.0.1.14
+ 3.0.1.16
${project.version}
- 5.17.1
- 2.14.0-rc1
- 2.14.0-rc1
- 3.5.3
+ 5.17.4
+ 2.15.1
+ 4.0.1
2.4.1
5.2.2
5.2.3
- 1.33
+ 2.0
false
@@ -125,7 +124,7 @@
scm:git:https://github.com/Alfresco/alfresco-transform-core.git
scm:git:https://github.com/Alfresco/alfresco-transform-core.git
https://github.com/Alfresco/alfresco-transform-core
- 3.1.0-A2-SNAPSHOT
+ 3.2.0-A1-SNAPSHOT
@@ -178,34 +177,11 @@
- com.fasterxml.jackson.core
- jackson-annotations
- ${dependency.jackson.version}
-
-
- com.fasterxml.jackson.core
- jackson-databind
- ${dependency.jackson-databind.version}
-
-
- com.fasterxml.jackson.core
- jackson-core
- ${dependency.jackson.version}
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jdk8
- ${dependency.jackson.version}
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
- ${dependency.jackson.version}
-
-
- com.fasterxml.jackson.module
- jackson-module-parameter-names
+ com.fasterxml.jackson
+ jackson-bom
${dependency.jackson.version}
+ import
+ pom
@@ -223,18 +199,18 @@
com.github.junrar
junrar
- 7.5.3
+ 7.5.4
org.apache.commons
commons-compress
- 1.21
+ 1.23.0
org.jsoup
jsoup
- 1.15.3
+ 1.16.1
@@ -245,12 +221,12 @@
org.apache.httpcomponents
httpclient
- 4.5.13
+ 4.5.14
org.apache.httpcomponents
httpmime
- 4.5.13
+ 4.5.14
org.yaml
@@ -311,7 +287,7 @@
org.codehaus.mojo
license-maven-plugin
- 2.0.1.alfresco-2
+ 2.0.1
2005
Alfresco Software Limited
@@ -394,7 +370,7 @@
io.fabric8
docker-maven-plugin
- 0.40.2
+ 0.42.1