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

Update to ACS 6.0.1.2

Browse Source
This commit is contained in:
Rodica Sutu
2019-04-19 15:13:59 +01:00
parent e311f8c0ca
commit 11d48c0c36
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -464,7 +464,7 @@
<alfresco.db.username>alfresco</alfresco.db.username> <alfresco.db.username>alfresco</alfresco.db.username>
<alfresco.groupId>org.alfresco</alfresco.groupId> <alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.share.artifactId>share</alfresco.share.artifactId> <alfresco.share.artifactId>share</alfresco.share.artifactId>
<alfresco-spring-webscripts.version>6.19</alfresco-spring-webscripts.version> <alfresco-spring-webscripts.version>6.20</alfresco-spring-webscripts.version>
<api.explorer.version>6.0.7-ga</api.explorer.version> <api.explorer.version>6.0.7-ga</api.explorer.version>
<!-- Set this here and override it in the community and enterprise modules. --> <!-- Set this here and override it in the community and enterprise modules. -->
<alfresco.version>0.0</alfresco.version> <alfresco.version>0.0</alfresco.version>

2
rm-community/rm-community-repo/.env Normal file
View File

@@ -0,0 +1,2 @@
SOLR6_TAG=1.1.1
POSTGRES_TAG=10.1

9
rm-community/rm-community-repo/docker-compose.yml
View File

@@ -26,6 +26,11 @@ services:
-Dftp.dataPortFrom=30000 -Dftp.dataPortFrom=30000
-Dftp.dataPortTo=30099 -Dftp.dataPortTo=30099
-Dcifs.enabled=true -Dcifs.enabled=true
-Dcsrf.filter.enabled=false
-Dalfresco.host=localhost
-Dalfresco.port.ssl=80
-Dalfresco.protocol=http
-Dalfresco.port=8080
" "
ports: ports:
- 8080:8080 - 8080:8080
@@ -36,7 +41,7 @@ services:
- "30000-30099:30000-30099" - "30000-30099:30000-30099"
postgres: postgres:
image: library/postgres:10.1 image: library/postgres:${POSTGRES_TAG}
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco - POSTGRES_USER=alfresco
@@ -45,7 +50,7 @@ services:
- 5432:5432 - 5432:5432
solr6: solr6:
image: alfresco/alfresco-search-services:1.1.1 image: alfresco/alfresco-search-services:${SOLR6_TAG}
environment: environment:
#Solr needs to know how to register itself with Alfresco #Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco - SOLR_ALFRESCO_HOST=alfresco

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

@@ -46,8 +46,6 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.extensions.webscripts.GUID; import org.springframework.extensions.webscripts.GUID;
import javax.xml.soap.Node;
/** /**
* Integration test for RM-4804 * Integration test for RM-4804
* *