mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-08-07 17:48:35 +00:00
ATS-488 : Remove alfresco-core dependency (#90)
- remove *alfresco-core* dependency - remove *alfresco-data-model* dependency - replace _TempFileProvider_ with local implementation - duplicate _RuntimeExec_ and _ExecParameterTokenizer_ from alfresco-core - partially duplicate _MimetypeMap_ from alfresco-data-model
This commit is contained in:
@@ -46,24 +46,9 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-core</artifactId>
|
||||
<!--
|
||||
TODO temp workaround for ATS-481 / REPO-4514 (exclude: dom4j.dom4j 1.6.1 / include org.dom4j.dom4j 2.1.1)
|
||||
TODO remove this workaround once transitive dependencies have been fixed (surf-core-configservice -> alfresco-core)
|
||||
-->
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>dom4j</groupId>
|
||||
<artifactId>dom4j</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.dom4j</groupId>
|
||||
<artifactId>dom4j</artifactId>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
@@ -1,34 +0,0 @@
|
||||
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
|
||||
#-------------------------------------------------------------------------------
|
||||
# Already used licenses in project :
|
||||
# - Apache 2
|
||||
# - Apache 2.0
|
||||
# - Apache License 2.0
|
||||
# - Apache License, Version 2.0
|
||||
# - Apache License, version 2.0
|
||||
# - BSD 3-clause New License
|
||||
# - CDDL + GPLv2 with classpath exception
|
||||
# - CDDL 1.1
|
||||
# - CDDL+GPL License
|
||||
# - CDDL/GPLv2+CE
|
||||
# - Eclipse Distribution License - v 1.0
|
||||
# - Eclipse Public License - v 1.0
|
||||
# - GNU Lesser General Public License
|
||||
# - GNU Lesser General Public License v2.1
|
||||
# - GPL2 w/ CPE
|
||||
# - MIT License
|
||||
# - MIT license
|
||||
# - Public Domain, per Creative Commons CC0
|
||||
# - Sun Binary Code License Agreement
|
||||
# - The Apache License, Version 2.0
|
||||
# - The Apache Software License, Version 2.0
|
||||
# - The JSON License
|
||||
# - The MIT License
|
||||
#-------------------------------------------------------------------------------
|
||||
# Please fill the missing licenses for dependencies :
|
||||
#
|
||||
#
|
||||
#Tue Jul 09 13:36:53 EEST 2019
|
||||
javax.transaction--jta--1.1=Sun Binary Code License Agreement
|
||||
commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0
|
||||
org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0
|
@@ -37,7 +37,6 @@ import java.util.StringTokenizer;
|
||||
import javax.annotation.PostConstruct;
|
||||
import javax.annotation.PreDestroy;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
|
||||
import org.artofsolving.jodconverter.office.OfficeException;
|
||||
import org.artofsolving.jodconverter.office.OfficeManager;
|
||||
@@ -163,7 +162,7 @@ public class JodConverterSharedInstance implements JodConverter
|
||||
File tmp = new File(templateProfileDir);
|
||||
if (!tmp.isDirectory())
|
||||
{
|
||||
throw new AlfrescoRuntimeException(
|
||||
throw new RuntimeException(
|
||||
"OpenOffice template profile directory " + templateProfileDir + " does not exist.");
|
||||
}
|
||||
this.templateProfileDir = tmp;
|
||||
|
@@ -26,6 +26,7 @@
|
||||
*/
|
||||
package org.alfresco.transformer;
|
||||
|
||||
import static org.alfresco.transformer.executors.RuntimeExec.ExecutionResult;
|
||||
import static org.hamcrest.Matchers.containsString;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
@@ -56,7 +57,6 @@ import org.alfresco.transform.client.model.TransformRequest;
|
||||
import org.alfresco.transformer.executors.LibreOfficeJavaExecutor;
|
||||
import org.alfresco.transformer.model.FileRefEntity;
|
||||
import org.alfresco.transformer.model.FileRefResponse;
|
||||
import org.alfresco.util.exec.RuntimeExec;
|
||||
import org.artofsolving.jodconverter.office.OfficeException;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -81,7 +81,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
|
||||
public class LibreOfficeControllerTest extends AbstractTransformerControllerTest
|
||||
{
|
||||
@Mock
|
||||
private RuntimeExec.ExecutionResult mockExecutionResult;
|
||||
private ExecutionResult mockExecutionResult;
|
||||
|
||||
@SpyBean
|
||||
private LibreOfficeJavaExecutor javaExecutor;
|
||||
|
Reference in New Issue
Block a user