Fix upstream project version

Merge branch 'master' into feature/REPO-5111_repo_build

# Conflicts:
#	.travis.settings.xml
#	.travis.yml
#	distribution/pom.xml
#	docker-alfresco/Dockerfile
#	docker-alfresco/pom.xml
#	pom.xml
#	public-javadoc/pom.xml
#	scripts/travis/copy_to_release_bucket.sh
#	scripts/travis/maven_release.sh
#	scripts/travis/verify_release_tag.sh
#	tests/environment/.env
#	tests/environment/docker-compose-minimal+transforms.yml
#	tests/pom.xml
#	tests/tas-cmis/pom.xml
#	tests/tas-email/pom.xml
#	tests/tas-integration/pom.xml
#	tests/tas-restapi/pom.xml
#	tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java
#	tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
#	tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java
#	tests/tas-webdav/pom.xml
#	war/pom.xml
#	war/src/main/resources/log4j.properties
This commit is contained in:
Alan Davis
2020-10-04 13:19:34 +01:00
+1 -1
View File
@@ -9,7 +9,7 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>8.300-TEST4</version>
<version>8.300-TEST6</version>
</parent>
<scm>