inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-6746 cherry picking merge request from RM-6790

Browse Source
This commit is contained in:
Claudia Agache
2019-04-03 09:44:57 +01:00
committed by Ross Gale
parent 8aeb41d83d
commit f70e3f92f1
7 changed files with 88 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
pom.xml
View File

@@ -31,7 +31,7 @@
</ciManagement> </ciManagement>
<prerequisites> <prerequisites>
<maven>3.2.5</maven> <maven>3.3.9</maven>
</prerequisites> </prerequisites>
<repositories> <repositories>
@@ -131,7 +131,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version> <version>3.1.1</version>
<executions> <executions>
<!-- Unzips the docflex/javadoc doclet --> <!-- Unzips the docflex/javadoc doclet -->
<execution> <execution>
@@ -157,11 +157,13 @@
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version> <version>${maven.javadoc.version}</version>
<configuration> <configuration>
<doclet>com.docflex.javadoc.Doclet</doclet> <doclet>com.docflex.javadoc.Doclet</doclet>
<docletPath>${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar</docletPath> <docletPath>${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar</docletPath>
<additionalparam> <doclint>none</doclint>
<additionalOptions>
-license ${settings.localRepository}/com/docflex/docflex-alfresco-license/1.0/docflex-alfresco-license-1.0.license -license ${settings.localRepository}/com/docflex/docflex-alfresco-license/1.0/docflex-alfresco-license-1.0.license
-template ${project.build.directory}/docflex-javadoc-${docflex.version}/templates/JavadocPro/FramedDoc.tpl -template ${project.build.directory}/docflex-javadoc-${docflex.version}/templates/JavadocPro/FramedDoc.tpl
-nodialog -nodialog
@@ -169,7 +171,8 @@
-p:filter.byAnns.include.classes=org.alfresco.api.AlfrescoPublicApi -p:filter.byAnns.include.classes=org.alfresco.api.AlfrescoPublicApi
-p:docTitle "${project.name} ${project.version} Public API" -p:docTitle "${project.name} ${project.version} Public API"
-p:windowTitle "${project.name} ${project.version} Public API" -p:windowTitle "${project.name} ${project.version} Public API"
</additionalparam>
</additionalOptions>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
@@ -471,19 +474,21 @@
<share.client.contextPath>/share</share.client.contextPath> <share.client.contextPath>/share</share.client.contextPath>
<maven.javadoc.version>3.1.0</maven.javadoc.version>
<maven.war.plugin.version>2.6</maven.war.plugin.version>
<maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies> <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
<maven.build.sourceVersion>1.8</maven.build.sourceVersion> <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
<maven.build.testSourceVersion>1.8</maven.build.testSourceVersion> <maven.build.testSourceVersion>1.8</maven.build.testSourceVersion>
<maven.buildhelper.version>1.9.1</maven.buildhelper.version> <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
<maven.compiler.version>3.2</maven.compiler.version> <maven.compiler.version>3.8.0</maven.compiler.version>
<maven.enforcer.plugin>1.4</maven.enforcer.plugin> <maven.enforcer.plugin>3.0.0-M2</maven.enforcer.plugin>
<maven.resources.version>2.7</maven.resources.version> <maven.resources.version>3.1.0</maven.resources.version>
<maven.tomcat.port>8080</maven.tomcat.port> <maven.tomcat.port>8080</maven.tomcat.port>
<jackson.version>2.9.8</jackson.version> <jackson.version>2.9.8</jackson.version>
<fabric8.docker.version>0.25.0</fabric8.docker.version> <fabric8.docker.version>0.25.0</fabric8.docker.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<postgresql.version>42.2.1</postgresql.version> <postgresql.version>42.2.5</postgresql.version>
<postgresql.port>5432</postgresql.port> <postgresql.port>5432</postgresql.port>
<mysql.version>5.1.40</mysql.version> <mysql.version>5.1.40</mysql.version>
<mysql.port>3306</mysql.port> <mysql.port>3306</mysql.port>
@@ -512,6 +517,8 @@
<image.name>imageNameNotSet</image.name> <image.name>imageNameNotSet</image.name>
<image.tag>latest</image.tag> <image.tag>latest</image.tag>
<image.registry>quay.io</image.registry> <image.registry>quay.io</image.registry>
<javax-jaxb.version>2.3.0</javax-jaxb.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@@ -552,6 +559,27 @@
<version>4.12</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- XML jars removed in Java 11 but are provided by alfresco-content-services -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${javax-jaxb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${javax-jaxb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
<version>6.2.99</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@@ -559,7 +587,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>1.4</version>
<executions> <executions>
<execution> <execution>
<id>enforce-java</id> <id>enforce-java</id>
@@ -569,7 +596,7 @@
<configuration> <configuration>
<rules> <rules>
<requireJavaVersion> <requireJavaVersion>
<version>1.8</version> <version>[1.8.0,)</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
@@ -619,7 +646,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration> <configuration>
<includes> <includes>
<include>**/*UnitTest.java</include> <include>**/*UnitTest.java</include>
@@ -640,25 +666,26 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>${maven.javadoc.version}</version>
<configuration>
<doclint>none</doclint>
</configuration>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
<configuration>
<doclint>none</doclint>
</configuration>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version> <version>3.1.0</version>
<executions> <executions>
<execution> <execution>
<id>default-clean</id> <id>default-clean</id>
@@ -697,7 +724,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.3</version> <version>3.7.1</version>
<executions> <executions>
<execution> <execution>
<id>default-site</id> <id>default-site</id>
@@ -773,7 +800,12 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version> <version>2.22.1</version>
<configuration>
<argLine>
--illegal-access=permit
</argLine>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
@@ -781,11 +813,11 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.5</version> <version>3.1.0</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version> <version>3.1.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
@@ -871,7 +903,12 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>2.19</version> <version>2.22.1</version>
<configuration>
<argLine>
--illegal-access=permit
</argLine>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
@@ -901,14 +938,14 @@
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<configuration> <configuration>
<additionalparam>-Xdoclint:none</additionalparam> <doclint>none</doclint>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>1.8</version> <version>1.16</version>
<configuration> <configuration>
<verbose>${license.verbose}</verbose> <verbose>${license.verbose}</verbose>
@@ -1000,7 +1037,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.5</version> <version>${maven.war.plugin.version}</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
@@ -1019,11 +1056,11 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version> <version>3.1.0</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.9</version> <version>3.1.1</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-archetype-plugin</artifactId> <artifactId>maven-archetype-plugin</artifactId>

13
rm-automation/rm-automation-community-rest-api/pom.xml
View File

@@ -13,9 +13,9 @@
<properties> <properties>
<maven.build.sourceVersion>1.8</maven.build.sourceVersion> <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
<alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share> <ags.share>alfresco-governance-services-community-share</ags.share>
<alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo> <ags.repo>alfresco-governance-services-community-repo</ags.repo>
<tas.restapi.version>5.2.0-10</tas.restapi.version> <tas.restapi.version>6.0.0.3</tas.restapi.version>
<fluent.json.version>2.0.0</fluent.json.version> <fluent.json.version>2.0.0</fluent.json.version>
</properties> </properties>
@@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.16.10</version> <version>1.18.6</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- FIXME: Remove this dependency once RMUserAPI.java has been refactored --> <!-- FIXME: Remove this dependency once RMUserAPI.java has been refactored -->
@@ -73,5 +73,10 @@
<artifactId>alfresco-testng</artifactId> <artifactId>alfresco-testng</artifactId>
<version>1.1</version> <version>1.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.1</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

6
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
View File

@@ -27,6 +27,8 @@
package org.alfresco.rest.core.v0; package org.alfresco.rest.core.v0;
import java.io.IOException; import java.io.IOException;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
@@ -44,6 +46,10 @@ public class APIUtils
{ {
/** Logger for this class. */ /** Logger for this class. */
private static final Logger LOGGER = LoggerFactory.getLogger(APIUtils.class); private static final Logger LOGGER = LoggerFactory.getLogger(APIUtils.class);
/** The ISO instant formatter that formats or parses an instant in UTC, such as '2011-12-03T10:15:305Z'
* similar with {@link DateTimeFormatter#ISO_INSTANT}, but with only 3 nanoseconds*/
public static final DateTimeFormatter ISO_INSTANT_FORMATTER =
new DateTimeFormatterBuilder().appendInstant(3).toFormatter();
/** Private constructor for helper class. */ /** Private constructor for helper class. */
private APIUtils() private APIUtils()

6
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java
View File

@@ -27,6 +27,7 @@
package org.alfresco.rest.v0; package org.alfresco.rest.v0;
import static org.alfresco.dataprep.AlfrescoHttpClient.MIME_TYPE_JSON; import static org.alfresco.dataprep.AlfrescoHttpClient.MIME_TYPE_JSON;
import static org.alfresco.rest.core.v0.APIUtils.ISO_INSTANT_FORMATTER;
import static org.apache.http.HttpStatus.SC_OK; import static org.apache.http.HttpStatus.SC_OK;
import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertNotNull;
@@ -37,7 +38,6 @@ import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.time.Instant; import java.time.Instant;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -341,7 +341,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
requestParams.put("nodeRef", recNodeRef); requestParams.put("nodeRef", recNodeRef);
if (date != null) if (date != null)
{ {
String thisMoment = date.format(DateTimeFormatter.ISO_INSTANT); String thisMoment = date.format(ISO_INSTANT_FORMATTER);
requestParams.put("params", new JSONObject() requestParams.put("params", new JSONObject()
.put("asOfDate", new JSONObject() .put("asOfDate", new JSONObject()
.put("iso8601", thisMoment) .put("iso8601", thisMoment)
@@ -368,7 +368,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
requestParams.put("name", RM_ACTIONS.COMPLETE_EVENT.getAction()); requestParams.put("name", RM_ACTIONS.COMPLETE_EVENT.getAction());
requestParams.put("nodeRef", recNodeRef); requestParams.put("nodeRef", recNodeRef);
date = (date != null) ? date : Instant.now(); date = (date != null) ? date : Instant.now();
String formattedDate = DateTimeFormatter.ISO_INSTANT.format(date); String formattedDate = ISO_INSTANT_FORMATTER.format(date);
requestParams.put("params", new JSONObject() requestParams.put("params", new JSONObject()
.put("eventName", event.getEventName()) .put("eventName", event.getEventName())
.put("eventCompletedBy", user) .put("eventCompletedBy", user)

1
rm-automation/rm-automation-community-rest-api/src/main/resources/config.properties
View File

@@ -1,2 +1,3 @@
alfresco.server=localhost alfresco.server=localhost
alfresco.port=8080
rest.rmPath=alfresco/api/-default-/public/gs/versions/1 rest.rmPath=alfresco/api/-default-/public/gs/versions/1

1
rm-community/rm-community-repo/pom.xml
View File

@@ -265,6 +265,7 @@
<attachClasses>true</attachClasses> <attachClasses>true</attachClasses>
<attachConfig>true</attachConfig> <attachConfig>true</attachConfig>
<includeDependencies>true</includeDependencies> <includeDependencies>true</includeDependencies>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

2
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java
View File

@@ -111,7 +111,7 @@ public class DestroyContentTest extends BaseRMTestCase
Map<QName, Serializable> props = new HashMap<QName, Serializable>(1); Map<QName, Serializable> props = new HashMap<QName, Serializable>(1);
props.put(ContentModel.PROP_TITLE, GUID.generate()); props.put(ContentModel.PROP_TITLE, GUID.generate());
InputStream is = System.class.getResourceAsStream("/alfresco/test/content/Image.jpg"); InputStream is = DestroyContentTest.class.getResourceAsStream("/alfresco/test/content/Image.jpg");
subRecord = utils.createRecord(destroyableFolder, GUID.generate(), props, MimetypeMap.MIMETYPE_IMAGE_JPEG, is); subRecord = utils.createRecord(destroyableFolder, GUID.generate(), props, MimetypeMap.MIMETYPE_IMAGE_JPEG, is);