inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-05-19 17:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Alfresco/alfresco-transform-core into MNT-23285-Typos_in_AIO_container

Browse Source
This commit is contained in:
atkumar 2023-05-22 16:59:18 +05:30
commit 5efc26612f
14 changed files with 63 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deprecated/alfresco-transformer-base/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

7
deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/MTLSConfig.java
View File

@ -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);

6
engines/aio/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
<version>3.5.0</version>
<configuration>
<includeGroupIds>${project.groupId}</includeGroupIds>
<includeArtifactIds>alfresco-transform-imagemagick,alfresco-transform-libreoffice,alfresco-transform-misc,alfresco-transform-pdf-renderer,alfresco-transform-tika</includeArtifactIds>
@ -240,7 +240,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>

2
engines/base/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

9
engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
View File

@ -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);

11
engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
View File

@ -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();
}

6
engines/example/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -114,7 +114,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>
@ -123,7 +123,7 @@
<port>61616:61616</port>
</ports>
<wait>
<log>Apache ActiveMQ 5.17.1 .* started</log>
<log>Apache ActiveMQ 5.* started</log>
<time>20000</time>
<kill>500</kill>
<shutdown>100</shutdown>

6
engines/imagemagick/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -106,7 +106,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>
@ -115,7 +115,7 @@
<port>61616:61616</port>
</ports>
<wait>
<log>Apache ActiveMQ 5.17.1 .* started</log>
<log>Apache ActiveMQ 5.* started</log>
<time>20000</time>
<kill>500</kill>
<shutdown>100</shutdown>

6
engines/libreoffice/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -110,7 +110,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>
@ -119,7 +119,7 @@
<port>61616:61616</port>
</ports>
<wait>
<log>Apache ActiveMQ 5.17.1 .* started</log>
<log>Apache ActiveMQ 5.* started</log>
<time>20000</time>
<kill>500</kill>
<shutdown>100</shutdown>

2
engines/misc/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

6
engines/pdfrenderer/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -102,7 +102,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>
@ -111,7 +111,7 @@
<port>61616:61616</port>
</ports>
<wait>
<log>Apache ActiveMQ 5.17.1 .* started</log>
<log>Apache ActiveMQ 5.* started</log>
<time>20000</time>
<kill>500</kill>
<shutdown>100</shutdown>

8
engines/tika/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -82,7 +82,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.11.0</version>
<version>2.12.5</version>
</dependency>
<!-- for Apache Tika Parsers - eg. encrypted PDF -->
@ -198,7 +198,7 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
<run>
<hostname>activemq</hostname>
<ports>
@ -207,7 +207,7 @@
<port>61616:61616</port>
</ports>
<wait>
<log>Apache ActiveMQ 5.17.1 .* started</log>
<log>Apache ActiveMQ 5.* started</log>
<time>20000</time>
<kill>500</kill>
<shutdown>100</shutdown>

21
model/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
</parent>
<properties>
@ -112,21 +112,8 @@
<version>2.0.1.alfresco-2</version>
<executions>
<execution>
<id>third-party-licenses</id>
<goals>
<goal>add-third-party</goal>
<goal>download-licenses</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<failOnMissing>true</failOnMissing>
<excludedScopes>provided,test</excludedScopes>
<excludedGroups>org.alfresco</excludedGroups>
<failIfWarning>true</failIfWarning>
<includedLicenses>https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt</includedLicenses>
<licenseMergesUrl>https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/licenseMerges.txt</licenseMergesUrl>
<overrideUrl>https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/override-THIRD-PARTY.properties</overrideUrl>
</configuration>
<id>project-license</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
@ -141,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
<executions>
<execution>
<goals>

68
pom.xml
View File

@ -3,33 +3,32 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>3.1.0-A6-SNAPSHOT</version>
<version>3.2.0-A2-SNAPSHOT</version>
<name>Alfresco Transform Core</name>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.10</version>
<version>2.7.11</version>
</parent>
<properties>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<image.tag>latest</image.tag>
<dependency.pdfbox.version>2.0.26</dependency.pdfbox.version>
<dependency.alfresco-jodconverter-core.version>3.0.1.14</dependency.alfresco-jodconverter-core.version>
<dependency.alfresco-jodconverter-core.version>3.0.1.16</dependency.alfresco-jodconverter-core.version>
<env.project_version>${project.version}</env.project_version>
<dependency.activemq.version>5.17.1</dependency.activemq.version>
<dependency.jackson.version>2.14.0-rc1</dependency.jackson.version>
<dependency.jackson-databind.version>2.14.0-rc1</dependency.jackson-databind.version>
<dependency.cxf.version>3.5.3</dependency.cxf.version>
<dependency.activemq.version>5.17.4</dependency.activemq.version>
<dependency.jackson.version>2.15.1</dependency.jackson.version>
<dependency.cxf.version>4.0.1</dependency.cxf.version>
<dependency.tika.version>2.4.1</dependency.tika.version>
<dependency.poi.version>5.2.2</dependency.poi.version>
<dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.version>
<dependency.snakeyaml.version>1.33</dependency.snakeyaml.version>
<dependency.snakeyaml.version>2.0</dependency.snakeyaml.version>
<parent.core.deploy.skip>false</parent.core.deploy.skip>
</properties>
@ -125,7 +124,7 @@
<connection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</developerConnection>
<url>https://github.com/Alfresco/alfresco-transform-core</url>
<tag>3.1.0-A2-SNAPSHOT</tag>
<tag>3.2.0-A1-SNAPSHOT</tag>
</scm>
<dependencyManagement>
@ -178,34 +177,11 @@
</dependency>
<!-- Jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${dependency.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${dependency.jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${dependency.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${dependency.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${dependency.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${dependency.jackson.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- Active MQ client -->
<dependency>
@ -223,18 +199,18 @@
<dependency>
<groupId>com.github.junrar</groupId>
<artifactId>junrar</artifactId>
<version>7.5.3</version>
<version>7.5.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
<version>1.23.0</version>
</dependency>
<!-- Jsoup -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.3</version>
<version>1.16.1</version>
</dependency>
<dependency>
@ -245,12 +221,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.13</version>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
@ -311,7 +287,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.0.1.alfresco-2</version>
<version>2.0.1</version>
<configuration>
<inceptionYear>2005</inceptionYear>
<organizationName>Alfresco Software Limited</organizationName>
@ -394,7 +370,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.40.2</version>
<version>0.42.1</version>
</plugin>
</plugins>
</pluginManagement>