Compare commits

...

12 Commits

Author SHA1 Message Date
Travis CI User
f6b3b62841 [maven-release-plugin][skip ci] prepare release v1.8 2019-07-27 14:13:28 +00:00
Alex Mukha
46c59e50f6 Fix response status in node rendition request 2019-07-27 14:51:15 +01:00
Alex Mukha
7870db5370 Fix response status in person activities request 2019-07-27 14:50:35 +01:00
Alex Mukha
78a8d8d6cb Fix response status in node rendition request 2019-07-27 14:44:56 +01:00
Travis CI User
60083c6145 [maven-release-plugin][skip ci] prepare for next development iteration 2019-07-27 12:36:01 +00:00
Travis CI User
c9a6c633ed [maven-release-plugin][skip ci] prepare release v1.7 2019-07-27 12:35:55 +00:00
Alex Mukha
1de92e61c4 Fix response status in node rendition request 2019-07-27 13:23:00 +01:00
Alex Mukha
e246eb31cf Add email address of release bot [skip ci] 2019-06-20 19:05:46 +01:00
Travis CI User
4261615fb4 [maven-release-plugin][skip ci] prepare for next development iteration 2019-06-07 16:02:43 +00:00
Travis CI User
6cc81beab5 [maven-release-plugin][skip ci] prepare release v1.6 2019-06-07 16:02:37 +00:00
Alex Mukha
9a77903d8c Update utility to 3.0.0 (#1) 2019-06-07 16:45:28 +01:00
Travis CI User
0049eefcdb [maven-release-plugin][skip ci] prepare for next development iteration 2019-06-05 10:08:07 +00:00
4 changed files with 10 additions and 8 deletions

View File

@@ -31,5 +31,7 @@ jobs:
script:
# Use full history for release
- git checkout -B "${TRAVIS_BRANCH}"
# Add email to link commits to user
- git config user.email "${GIT_EMAIL}"
# Skip building of release commits
- mvn --batch-mode -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform
- mvn --batch-mode -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform

View File

@@ -4,7 +4,7 @@
<groupId>org.alfresco.tas</groupId>
<artifactId>restapi</artifactId>
<name>alfresco-tas-restapi</name>
<version>1.5</version>
<version>1.8</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId>
@@ -28,7 +28,7 @@
<suiteXmlFile>src/main/resources/shared-resources/testCount.xml</suiteXmlFile>
<maven.build.sourceVersion>11</maven.build.sourceVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tas.utility.version>2.0.25</tas.utility.version>
<tas.utility.version>3.0.0</tas.utility.version>
<rest-assured.version>3.3.0</rest-assured.version>
<httpclient-osgi-version>4.5.2</httpclient-osgi-version>
<json-path.version>3.3.0</json-path.version>
@@ -50,7 +50,7 @@
<connection>scm:git:https://github.com/Alfresco/alfresco-tas-restapi.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-tas-restapi.git</developerConnection>
<url>https://github.com/Alfresco/alfresco-tas-restapi</url>
<tag>v1.5</tag>
<tag>v1.8</tag>
</scm>
<issueManagement>

View File

@@ -382,7 +382,7 @@ public class Node extends ModelRequest<Node>
public void createNodeRenditionIfNotExists(String renditionId) throws Exception
{
getNodeRendition(renditionId);
if (HttpStatus.OK.toString().equals(restWrapper.getStatusCode()))
if (Integer.valueOf(restWrapper.getStatusCode()).equals(HttpStatus.OK.value()))
{
String postBody = JsonBodyGenerator.keyValueJson("id", renditionId);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/renditions", repoModel.getNodeRef());
@@ -415,7 +415,7 @@ public class Node extends ModelRequest<Node>
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/renditions/{renditionId}",repoModel.getNodeRef(), renditionId);
RestRenditionInfoModel renditions = restWrapper.processModel(RestRenditionInfoModel.class, request);
int retry = 0;
if (restWrapper.getStatusCode().equals(HttpStatus.OK.toString()))
if (Integer.valueOf(restWrapper.getStatusCode()).equals(HttpStatus.OK.value()))
{
while (renditions.getStatus().equals("NOT_CREATED") && retry < Utility.retryCountSeconds - 8)
{
@@ -442,7 +442,7 @@ public class Node extends ModelRequest<Node>
renditionId);
RestResponse response = restWrapper.process(request);
int retry = 0;
while (response.getStatusCode().equals(HttpStatus.NOT_FOUND.toString()) && retry < Utility.retryCountSeconds)
while (Integer.valueOf(response.getStatusCode()).equals(HttpStatus.NOT_FOUND.value()) && retry < Utility.retryCountSeconds)
{
Utility.waitToLoopTime(1);
response = restWrapper.process(request);

View File

@@ -81,7 +81,7 @@ public class People extends ModelRequest<People>
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/activities?{parameters}", this.person.getUsername(), restWrapper.getParameters());
RestActivityModelsCollection activityCollection = restWrapper.processModels(RestActivityModelsCollection.class, request);
int retry = 0;
if (restWrapper.getStatusCode().equals(HttpStatus.OK.toString()))
if (Integer.valueOf(restWrapper.getStatusCode()).equals(HttpStatus.OK.value()))
{
while ((activityCollection.isEmpty() || activityCollection.getPagination().getCount() != expectedNoOfEntries) && retry < Utility.retryCountSeconds + 20)
{