RM: update build scripts on HEAD to pull 4.2.b as depedant Alfresco version

* fix compile error in test script
  * remove erronious char from file header



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@43841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2012-11-22 00:58:25 +00:00
parent 36303d5de9
commit f32decd42d
5 changed files with 26 additions and 10 deletions

View File

@@ -92,11 +92,20 @@ subprojects {
} }
mavenCentral() mavenCentral()
maven { maven {
url "https://artifacts.alfresco.com/nexus/content/groups/internal" url alfrescoMavenUrl
credentials {
username 'bamboo'
password 'b@mb00'
} }
maven {
url alfrescoEnterpriseMavenUrl
credentials {
username alfrescoEnterpriseMavenUser
password alfrescoEnterpriseMavenPwd
}
}
maven {
url 'https://artifacts.alfresco.com/nexus/content/groups/public-snapshots'
}
maven {
url 'https://repository.jboss.org/nexus/content/groups/public'
} }
} }

View File

@@ -2,4 +2,12 @@ groupid=alfresco
packageName=rm packageName=rm
version=2.1.0 version=2.1.0
build=dev build=dev
alfrescoBaseVersion=4.0.2
alfrescoMavenUrl=https://artifacts.alfresco.com/nexus/content/groups/public/
alfrescoEnterpriseMavenUrl=https://artifacts.alfresco.com/nexus/content/groups/internal
alfrescoEnterpriseMavenUser=
alfrescoEnterpriseMavenPwd=
# set to org.alfresco.enterprise when enterprise version required
alfrescoGroupId=org.alfresco
alfrescoBaseVersion=4.2.b

View File

@@ -12,8 +12,8 @@ dependencies {
testRuntime files(configDir) testRuntime files(configDir)
testRuntime files(testResourceDir) testRuntime files(testResourceDir)
testRuntime group: 'org.alfresco.enterprise', name: 'alfresco', version: alfrescoBaseVersion, type: 'war' testRuntime group: alfrescoGroupId, name: 'alfresco', version: alfrescoBaseVersion, type: 'war'
testRuntime group: 'org.alfresco.enterprise', name: 'alfresco-solr', version: alfrescoBaseVersion, type: 'zip' testRuntime group: alfrescoGroupId, name: 'alfresco-solr', version: alfrescoBaseVersion, type: 'zip'
} }
task fetchSOLR(type:Copy) { task fetchSOLR(type:Copy) {

View File

@@ -1,5 +1,5 @@
/* /*
` * Copyright (C) 2005-2012 Alfresco Software Limited. * Copyright (C) 2005-2012 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -27,7 +27,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.namespace.QName;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;

View File

@@ -21,8 +21,8 @@ package org.alfresco.module.org_alfresco_module_rm.test;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.alfresco.module.org_alfresco_module_rm.script.DataSetPost;
import org.alfresco.module.org_alfresco_module_rm.test.webscript.BootstraptestDataRestApiTest; import org.alfresco.module.org_alfresco_module_rm.test.webscript.BootstraptestDataRestApiTest;
import org.alfresco.module.org_alfresco_module_rm.test.webscript.DataSetPostTest;
import org.alfresco.module.org_alfresco_module_rm.test.webscript.DataSetsGetTest; import org.alfresco.module.org_alfresco_module_rm.test.webscript.DataSetsGetTest;
import org.alfresco.module.org_alfresco_module_rm.test.webscript.DispositionRestApiTest; import org.alfresco.module.org_alfresco_module_rm.test.webscript.DispositionRestApiTest;
import org.alfresco.module.org_alfresco_module_rm.test.webscript.EventRestApiTest; import org.alfresco.module.org_alfresco_module_rm.test.webscript.EventRestApiTest;
@@ -55,7 +55,7 @@ public class WebScriptTestSuite extends TestSuite
suite.addTestSuite(RmRestApiTest.class); suite.addTestSuite(RmRestApiTest.class);
suite.addTestSuite(RoleRestApiTest.class); suite.addTestSuite(RoleRestApiTest.class);
suite.addTestSuite(DataSetsGetTest.class); suite.addTestSuite(DataSetsGetTest.class);
suite.addTestSuite(DataSetPost.class); suite.addTestSuite(DataSetPostTest.class);
return suite; return suite;
} }
} }