Compare commits

...

33 Commits

Author SHA1 Message Date
alfresco-build
5dab6b19bd [maven-release-plugin][skip ci] prepare release 23.2.2.1 2024-06-20 16:45:21 +00:00
Eva Vasques
455b41107c Trigger release and [skip tests] 2024-06-20 17:42:14 +01:00
Eva Vasques
bc31e818d5 MNT-24321 Transfer Service Exception Handling (#2573) (#2702)
* Mark method deserialize in ExceptionJsonSerializer as deprecated
* Remove usage of jsonErrorSerializer

(cherry picked from commit c31158a113)
2024-06-19 17:44:27 +01:00
kcichonczyk
75f40fcdc3 [ACS-7321] ATS/AIS version bump to java11 compatible 2024-03-28 12:44:31 +01:00
mpichura
cda5e50b2a Creating hotfix branch release/23.2 for 23.2.1 ACS release [skip ci] 2024-03-01 15:03:59 +01:00
alfresco-build
2f1668244b [maven-release-plugin][skip ci] prepare release 23.2.0.60 2024-02-26 13:57:12 +00:00
mpichura
0934f94238 ACS-6884: Bump api-explorer version to 23.2.0 (GA) 2024-02-26 14:22:07 +01:00
alfresco-build
c700920627 [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-26 07:47:45 +00:00
alfresco-build
a9ce4ea402 [maven-release-plugin][skip ci] prepare release 23.2.0.59 2024-02-26 07:47:42 +00:00
MohinishSah
fa36f29782 updating Gdrive and AOS GA version 2024-02-26 12:42:05 +05:30
alfresco-build
c64494ca05 [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-23 17:32:24 +00:00
alfresco-build
52963c5f99 [maven-release-plugin][skip ci] prepare release 23.2.0.58 2024-02-23 17:32:22 +00:00
mpichura
53f5f00274 PRODDEL-7905: Bump api-explorer version to 23.2.0-A1 2024-02-23 17:56:22 +01:00
mpichura
072f475482 PRODDEL-7905: Bump api-explorer version to 23.2.0-A1 2024-02-23 17:51:26 +01:00
alfresco-build
b362029e85 [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-23 07:45:52 +00:00
alfresco-build
f5438cece1 [maven-release-plugin][skip ci] prepare release 23.2.0.57 2024-02-23 07:45:50 +00:00
Kacper Magdziarz
e85d73fd26 [ACS-6773] Propagate ATS-4.1.0 (#2470) 2024-02-23 08:10:48 +01:00
alfresco-build
59506dfe7d [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-21 11:49:34 +00:00
alfresco-build
dea6049bc0 [maven-release-plugin][skip ci] prepare release 23.2.0.56 2024-02-21 11:49:32 +00:00
Domenico Sibilio
7a64964644 Bump org.apache.commons:commons-compress from 1.25.0 to 1.26.0 (#2454) (#2464)
Bumps org.apache.commons:commons-compress from 1.25.0 to 1.26.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-21 12:14:44 +01:00
alfresco-build
3d2bfe6b08 [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-21 07:54:36 +00:00
alfresco-build
01ec63cf33 [maven-release-plugin][skip ci] prepare release 23.2.0.55 2024-02-21 07:54:33 +00:00
rrajoria
05425e3cbe Update googledrive to 4.1.0-A2 2024-02-21 12:39:15 +05:30
alfresco-build
2a80d17c9d [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-20 14:09:13 +00:00
alfresco-build
e7ea900096 [maven-release-plugin][skip ci] prepare release 23.2.0.54 2024-02-20 14:09:10 +00:00
Krystian Dabrowski
89847d260d ACS-6113: Fix secondary parents to never be set to null (#2460) (#2461)
(cherry picked from commit 859492ae1e)
2024-02-20 14:12:56 +01:00
alfresco-build
0bb31fe4ba [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-20 12:53:37 +00:00
alfresco-build
4e2d3e899a [maven-release-plugin][skip ci] prepare release 23.2.0.53 2024-02-20 12:53:34 +00:00
Damian Ujma
72965f81a8 ACS-6601 Bump AOS to 3.0.0-A1 (#2458) 2024-02-20 13:16:46 +01:00
alfresco-build
7d84505c44 [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-20 06:34:28 +00:00
alfresco-build
c5a753ebb8 [maven-release-plugin][skip ci] prepare release 23.2.0.52 2024-02-20 06:34:26 +00:00
rrajoria
24236be595 Revert googledrive version to 4.0.0 2024-02-20 11:28:12 +05:30
mpichura
5d0055d9aa Creating release branch release/stabilization/23.2 for 23.2.0 ACS release [skip ci] 2024-02-19 16:33:50 +01:00
28 changed files with 96 additions and 78 deletions

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<build>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<modules>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<properties>

View File

@@ -5,7 +5,7 @@
# Version label
version.major=23
version.minor=2
version.revision=0
version.revision=2
version.label=
# Edition label

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<build>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<modules>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<dependencies>

View File

@@ -9,6 +9,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
</project>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<modules>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<organization>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<developers>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<developers>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<properties>

20
pom.xml
View File

@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
<packaging>pom</packaging>
<name>Alfresco Community Repo Parent</name>
@@ -25,7 +25,7 @@
<properties>
<acs.version.major>23</acs.version.major>
<acs.version.minor>2</acs.version.minor>
<acs.version.revision>0</acs.version.revision>
<acs.version.revision>2</acs.version.revision>
<acs.version.label />
<amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -51,10 +51,10 @@
<dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
<dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
<dependency.activiti.version>5.23.0</dependency.activiti.version>
<dependency.alfresco-transform-core.version>5.1.0-A1</dependency.alfresco-transform-core.version>
<dependency.alfresco-transform-service.version>4.1.0-A1</dependency.alfresco-transform-service.version>
<dependency.alfresco-transform-core.version>5.1.1-A1</dependency.alfresco-transform-core.version>
<dependency.alfresco-transform-service.version>4.1.1-A1</dependency.alfresco-transform-service.version>
<dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
<dependency.acs-event-model.version>0.0.26</dependency.acs-event-model.version>
<dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>
<dependency.aspectj.version>1.9.20.1</dependency.aspectj.version>
<dependency.spring.version>6.0.14</dependency.spring.version>
@@ -88,7 +88,7 @@
<dependency.camel.version>4.0.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
<dependency.netty.version>4.1.96.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
<dependency.activemq.version>5.18.3</dependency.activemq.version>
<dependency.apache-compress.version>1.25.0</dependency.apache-compress.version>
<dependency.apache-compress.version>1.26.0</dependency.apache-compress.version>
<dependency.awaitility.version>4.2.0</dependency.awaitility.version>
<dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.version>
<dependency.swagger-parser.version>1.0.67</dependency.swagger-parser.version>
@@ -112,9 +112,9 @@
<dependency.jakarta-ee-json-impl.version>1.1.4</dependency.jakarta-ee-json-impl.version>
<dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
<dependency.json-smart.version>2.5.0</dependency.json-smart.version>
<alfresco.googledrive.version>4.1.0-A1</alfresco.googledrive.version>
<alfresco.aos-module.version>2.0.0</alfresco.aos-module.version>
<alfresco.api-explorer.version>23.1.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
<alfresco.googledrive.version>4.1.0</alfresco.googledrive.version>
<alfresco.aos-module.version>3.0.0</alfresco.aos-module.version>
<alfresco.api-explorer.version>23.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
<alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
<license-maven-plugin.version>2.0.1</license-maven-plugin.version>
@@ -151,7 +151,7 @@
<connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
<url>https://github.com/Alfresco/alfresco-community-repo</url>
<tag>HEAD</tag>
<tag>23.2.2.1</tag>
</scm>
<distributionManagement>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.2.0.52-SNAPSHOT</version>
<version>23.2.2.1</version>
</parent>
<dependencies>

View File

@@ -53,8 +53,6 @@ import org.alfresco.service.cmr.transfer.TransferTarget;
import org.alfresco.service.cmr.transfer.TransferVersion;
import org.alfresco.util.HttpClientHelper;
import org.alfresco.util.PropertyCheck;
import org.alfresco.util.json.ExceptionJsonSerializer;
import org.alfresco.util.json.JsonSerializer;
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient;
@@ -73,8 +71,10 @@ import org.apache.commons.httpclient.protocol.DefaultProtocolSocketFactory;
import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONArray;
import org.json.JSONObject;
/**
@@ -102,7 +102,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
private Protocol httpsProtocol = new Protocol(HTTPS_SCHEME_NAME, (ProtocolSocketFactory) new SSLProtocolSocketFactory(), DEFAULT_HTTPS_PORT);
private Map<String,Protocol> protocolMap = null;
private HttpMethodFactory httpMethodFactory = null;
private JsonSerializer<Throwable, JSONObject> jsonErrorSerializer;
private ContentService contentService;
@@ -125,7 +124,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
httpClient = new HttpClient();
httpClient.setHttpConnectionManager(new MultiThreadedHttpConnectionManager());
httpMethodFactory = new StandardHttpMethodFactoryImpl();
jsonErrorSerializer = new ExceptionJsonSerializer();
// Create an HTTP Proxy Host if appropriate system properties are set
httpProxyHost = HttpClientHelper.createProxyHost("http.proxyHost", "http.proxyPort", DEFAULT_HTTP_PORT);
@@ -852,7 +850,27 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
*/
private Throwable rehydrateError(JSONObject errorJSON)
{
return jsonErrorSerializer.deserialize(errorJSON);
if (errorJSON == null)
{
return null;
}
String errorMessage = errorJSON.optString("errorMessage", StringUtils.EMPTY);
String errorId = errorJSON.optString("alfrescoMessageId", null);
Object[] errorParams = new Object[0];
JSONArray errorParamArray = errorJSON.optJSONArray("alfrescoMessageParams");
if (errorParamArray != null)
{
int length = errorParamArray.length();
errorParams = new Object[length];
for (int i = 0; i < length; ++i)
{
errorParams[i] = errorParamArray.getString(i);
}
}
return new TransferException(errorId == null ? errorMessage : errorId, errorParams);
}
public void setContentService(ContentService contentService)
@@ -870,11 +888,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
this.httpMethodFactory = httpMethodFactory;
}
public void setJsonErrorSerializer(JsonSerializer<Throwable, JSONObject> jsonErrorSerializer)
{
this.jsonErrorSerializer = jsonErrorSerializer;
}
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;

View File

@@ -41,7 +41,8 @@ import org.json.JSONObject;
public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONObject>
{
private final static Log log = LogFactory.getLog(ExceptionJsonSerializer.class);
@Deprecated
@Override
public Throwable deserialize(JSONObject errorJSON)
{
@@ -89,38 +90,42 @@ public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONOb
catch (ClassNotFoundException e)
{
errorClass = Exception.class;
}
Constructor<?> constructor = null;
try
{
try
{
constructor = errorClass.getConstructor(String.class, Object[].class);
createdObject = constructor.newInstance(errorId, errorParams);
}
catch (NoSuchMethodException e)
{
try
{
constructor = errorClass.getConstructor(String.class);
createdObject = constructor.newInstance(errorId == null ? errorMessage : errorId);
}
catch (NoSuchMethodException e1)
{
try
{
constructor = errorClass.getConstructor();
createdObject = constructor.newInstance();
}
catch (NoSuchMethodException e2)
{
}
}
}
}
catch(Exception ex)
{
//We don't need to do anything here. Code below will fix things up
}
if (Throwable.class.isAssignableFrom(errorClass))
{
Constructor<?> constructor = null;
try
{
try
{
constructor = errorClass.getConstructor(String.class, Object[].class);
createdObject = constructor.newInstance(errorId, errorParams);
}
catch (NoSuchMethodException e)
{
try
{
constructor = errorClass.getConstructor(String.class);
createdObject = constructor.newInstance(errorId == null ? errorMessage : errorId);
}
catch (NoSuchMethodException e1)
{
try
{
constructor = errorClass.getConstructor();
createdObject = constructor.newInstance();
}
catch (NoSuchMethodException e2)
{
}
}
}
}
catch (Exception ex)
{
// We don't need to do anything here. Code below will fix things up
}
}
if (createdObject == null || !Throwable.class.isAssignableFrom(createdObject.getClass()))
{

View File

@@ -3,7 +3,7 @@
repository.name=Main Repository
# Schema number
version.schema=19100
version.schema=19102
# Directory configuration