mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-05-19 17:14:47 +00:00
Merge branch 'master' of github.com:Alfresco/alfresco-transform-core into MNT-23285-Typos_in_AIO_container
This commit is contained in:
commit
5efc26612f
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@ -121,13 +121,10 @@ public class MTLSConfig {
|
|||||||
|
|
||||||
private RestTemplate createRestTemplateWithSslContext(SSLContextBuilder sslContextBuilder) throws NoSuchAlgorithmException, KeyManagementException {
|
private RestTemplate createRestTemplateWithSslContext(SSLContextBuilder sslContextBuilder) throws NoSuchAlgorithmException, KeyManagementException {
|
||||||
SSLContext sslContext = sslContextBuilder.build();
|
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);
|
HttpClientBuilder httpClientBuilder = HttpClients.custom().setSSLSocketFactory(sslContextFactory);
|
||||||
if(hostNameVerificationDisabled)
|
|
||||||
{
|
|
||||||
httpClientBuilder.setSSLHostnameVerifier(new NoopHostnameVerifier());
|
|
||||||
}
|
|
||||||
CloseableHttpClient httpClient = httpClientBuilder.build();
|
CloseableHttpClient httpClient = httpClientBuilder.build();
|
||||||
ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
|
ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
|
||||||
return new RestTemplate(requestFactory);
|
return new RestTemplate(requestFactory);
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -141,7 +141,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.5.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<includeGroupIds>${project.groupId}</includeGroupIds>
|
<includeGroupIds>${project.groupId}</includeGroupIds>
|
||||||
<includeArtifactIds>alfresco-transform-imagemagick,alfresco-transform-libreoffice,alfresco-transform-misc,alfresco-transform-pdf-renderer,alfresco-transform-tika</includeArtifactIds>
|
<includeArtifactIds>alfresco-transform-imagemagick,alfresco-transform-libreoffice,alfresco-transform-misc,alfresco-transform-pdf-renderer,alfresco-transform-tika</includeArtifactIds>
|
||||||
@ -240,7 +240,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@ -170,7 +170,7 @@ public class MTLSConfig {
|
|||||||
SSLParameters sslParameters = sslEngine.getSSLParameters();
|
SSLParameters sslParameters = sslEngine.getSSLParameters();
|
||||||
if(hostNameVerificationDisabled)
|
if(hostNameVerificationDisabled)
|
||||||
{
|
{
|
||||||
sslParameters.setEndpointIdentificationAlgorithm(null);
|
sslParameters.setEndpointIdentificationAlgorithm("");
|
||||||
} else {
|
} else {
|
||||||
sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
|
sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
|
||||||
}
|
}
|
||||||
@ -180,13 +180,10 @@ public class MTLSConfig {
|
|||||||
|
|
||||||
private RestTemplate createRestTemplateWithSslContext(SSLContextBuilder sslContextBuilder) throws NoSuchAlgorithmException, KeyManagementException {
|
private RestTemplate createRestTemplateWithSslContext(SSLContextBuilder sslContextBuilder) throws NoSuchAlgorithmException, KeyManagementException {
|
||||||
SSLContext sslContext = sslContextBuilder.build();
|
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);
|
HttpClientBuilder httpClientBuilder = HttpClients.custom().setSSLSocketFactory(sslContextFactory);
|
||||||
if(hostNameVerificationDisabled)
|
|
||||||
{
|
|
||||||
httpClientBuilder.setSSLHostnameVerifier(new NoopHostnameVerifier());
|
|
||||||
}
|
|
||||||
CloseableHttpClient httpClient = httpClientBuilder.build();
|
CloseableHttpClient httpClient = httpClientBuilder.build();
|
||||||
ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
|
ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
|
||||||
return new RestTemplate(requestFactory);
|
return new RestTemplate(requestFactory);
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package org.alfresco.transform.base;
|
package org.alfresco.transform.base;
|
||||||
|
|
||||||
|
import org.apache.http.conn.ssl.NoopHostnameVerifier;
|
||||||
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
|
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
|
||||||
import org.apache.http.impl.client.CloseableHttpClient;
|
import org.apache.http.impl.client.CloseableHttpClient;
|
||||||
import org.apache.http.impl.client.HttpClients;
|
import org.apache.http.impl.client.HttpClients;
|
||||||
@ -23,12 +24,18 @@ import java.security.cert.CertificateException;
|
|||||||
public class MtlsTestUtils {
|
public class MtlsTestUtils {
|
||||||
|
|
||||||
private static final boolean MTLS_ENABLED = Boolean.parseBoolean(System.getProperty("test-mtls-enabled"));
|
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()
|
public static boolean isMtlsEnabled()
|
||||||
{
|
{
|
||||||
return MTLS_ENABLED;
|
return MTLS_ENABLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean isHostnameVerificationDisabled()
|
||||||
|
{
|
||||||
|
return HOSTNAME_VERIFICATION_DISABLED;
|
||||||
|
}
|
||||||
|
|
||||||
public static CloseableHttpClient httpClientWithMtls() throws NoSuchAlgorithmException, KeyManagementException, UnrecoverableKeyException, KeyStoreException, IOException, CertificateException
|
public static CloseableHttpClient httpClientWithMtls() throws NoSuchAlgorithmException, KeyManagementException, UnrecoverableKeyException, KeyStoreException, IOException, CertificateException
|
||||||
{
|
{
|
||||||
String keyStoreFile = System.getProperty("test-client-keystore-file");
|
String keyStoreFile = System.getProperty("test-client-keystore-file");
|
||||||
@ -52,7 +59,9 @@ public class MtlsTestUtils {
|
|||||||
.loadTrustMaterial(trustStore, trustStorePassword);
|
.loadTrustMaterial(trustStore, trustStorePassword);
|
||||||
|
|
||||||
SSLContext sslContext = sslContextBuilder.build();
|
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();
|
return HttpClients.custom().setSSLSocketFactory(sslContextFactory).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -114,7 +114,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@ -123,7 +123,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
<log>Apache ActiveMQ 5.* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -106,7 +106,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@ -115,7 +115,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
<log>Apache ActiveMQ 5.* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -110,7 +110,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@ -119,7 +119,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
<log>Apache ActiveMQ 5.* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -102,7 +102,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@ -111,7 +111,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
<log>Apache ActiveMQ 5.* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@ -82,7 +82,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>joda-time</groupId>
|
<groupId>joda-time</groupId>
|
||||||
<artifactId>joda-time</artifactId>
|
<artifactId>joda-time</artifactId>
|
||||||
<version>2.11.0</version>
|
<version>2.12.5</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- for Apache Tika Parsers - eg. encrypted PDF -->
|
<!-- for Apache Tika Parsers - eg. encrypted PDF -->
|
||||||
@ -198,7 +198,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<images>
|
<images>
|
||||||
<image>
|
<image>
|
||||||
<name>alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8</name>
|
<name>alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8</name>
|
||||||
<run>
|
<run>
|
||||||
<hostname>activemq</hostname>
|
<hostname>activemq</hostname>
|
||||||
<ports>
|
<ports>
|
||||||
@ -207,7 +207,7 @@
|
|||||||
<port>61616:61616</port>
|
<port>61616:61616</port>
|
||||||
</ports>
|
</ports>
|
||||||
<wait>
|
<wait>
|
||||||
<log>Apache ActiveMQ 5.17.1 .* started</log>
|
<log>Apache ActiveMQ 5.* started</log>
|
||||||
<time>20000</time>
|
<time>20000</time>
|
||||||
<kill>500</kill>
|
<kill>500</kill>
|
||||||
<shutdown>100</shutdown>
|
<shutdown>100</shutdown>
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@ -112,21 +112,8 @@
|
|||||||
<version>2.0.1.alfresco-2</version>
|
<version>2.0.1.alfresco-2</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>third-party-licenses</id>
|
<id>project-license</id>
|
||||||
<goals>
|
<phase>none</phase>
|
||||||
<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>
|
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
@ -141,7 +128,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>3.2.2</version>
|
<version>3.3.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
|
68
pom.xml
68
pom.xml
@ -3,33 +3,32 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-transform-core</artifactId>
|
<artifactId>alfresco-transform-core</artifactId>
|
||||||
<version>3.1.0-A6-SNAPSHOT</version>
|
<version>3.2.0-A2-SNAPSHOT</version>
|
||||||
<name>Alfresco Transform Core</name>
|
<name>Alfresco Transform Core</name>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>2.7.10</version>
|
<version>2.7.11</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>11</java.version>
|
<java.version>17</java.version>
|
||||||
<maven.compiler.source>11</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>11</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
|
|
||||||
<image.tag>latest</image.tag>
|
<image.tag>latest</image.tag>
|
||||||
<dependency.pdfbox.version>2.0.26</dependency.pdfbox.version>
|
<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>
|
<env.project_version>${project.version}</env.project_version>
|
||||||
<dependency.activemq.version>5.17.1</dependency.activemq.version>
|
<dependency.activemq.version>5.17.4</dependency.activemq.version>
|
||||||
<dependency.jackson.version>2.14.0-rc1</dependency.jackson.version>
|
<dependency.jackson.version>2.15.1</dependency.jackson.version>
|
||||||
<dependency.jackson-databind.version>2.14.0-rc1</dependency.jackson-databind.version>
|
<dependency.cxf.version>4.0.1</dependency.cxf.version>
|
||||||
<dependency.cxf.version>3.5.3</dependency.cxf.version>
|
|
||||||
<dependency.tika.version>2.4.1</dependency.tika.version>
|
<dependency.tika.version>2.4.1</dependency.tika.version>
|
||||||
<dependency.poi.version>5.2.2</dependency.poi.version>
|
<dependency.poi.version>5.2.2</dependency.poi.version>
|
||||||
<dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.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>
|
<parent.core.deploy.skip>false</parent.core.deploy.skip>
|
||||||
</properties>
|
</properties>
|
||||||
@ -125,7 +124,7 @@
|
|||||||
<connection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</connection>
|
<connection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</connection>
|
||||||
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</developerConnection>
|
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</developerConnection>
|
||||||
<url>https://github.com/Alfresco/alfresco-transform-core</url>
|
<url>https://github.com/Alfresco/alfresco-transform-core</url>
|
||||||
<tag>3.1.0-A2-SNAPSHOT</tag>
|
<tag>3.2.0-A1-SNAPSHOT</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
@ -178,34 +177,11 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<!-- Jackson -->
|
<!-- Jackson -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson</groupId>
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-bom</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>
|
|
||||||
<version>${dependency.jackson.version}</version>
|
<version>${dependency.jackson.version}</version>
|
||||||
|
<scope>import</scope>
|
||||||
|
<type>pom</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Active MQ client -->
|
<!-- Active MQ client -->
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -223,18 +199,18 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.junrar</groupId>
|
<groupId>com.github.junrar</groupId>
|
||||||
<artifactId>junrar</artifactId>
|
<artifactId>junrar</artifactId>
|
||||||
<version>7.5.3</version>
|
<version>7.5.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-compress</artifactId>
|
<artifactId>commons-compress</artifactId>
|
||||||
<version>1.21</version>
|
<version>1.23.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Jsoup -->
|
<!-- Jsoup -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jsoup</groupId>
|
<groupId>org.jsoup</groupId>
|
||||||
<artifactId>jsoup</artifactId>
|
<artifactId>jsoup</artifactId>
|
||||||
<version>1.15.3</version>
|
<version>1.16.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -245,12 +221,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpclient</artifactId>
|
<artifactId>httpclient</artifactId>
|
||||||
<version>4.5.13</version>
|
<version>4.5.14</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpmime</artifactId>
|
<artifactId>httpmime</artifactId>
|
||||||
<version>4.5.13</version>
|
<version>4.5.14</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.yaml</groupId>
|
<groupId>org.yaml</groupId>
|
||||||
@ -311,7 +287,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>license-maven-plugin</artifactId>
|
<artifactId>license-maven-plugin</artifactId>
|
||||||
<version>2.0.1.alfresco-2</version>
|
<version>2.0.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<inceptionYear>2005</inceptionYear>
|
<inceptionYear>2005</inceptionYear>
|
||||||
<organizationName>Alfresco Software Limited</organizationName>
|
<organizationName>Alfresco Software Limited</organizationName>
|
||||||
@ -394,7 +370,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.fabric8</groupId>
|
<groupId>io.fabric8</groupId>
|
||||||
<artifactId>docker-maven-plugin</artifactId>
|
<artifactId>docker-maven-plugin</artifactId>
|
||||||
<version>0.40.2</version>
|
<version>0.42.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user