Uploaded image for project: 'Kuali Rice Development'
  1. Kuali Rice Development
  2. KULRICE-3885

Merge the final changes of Rice 1.0.1.1 into 1.0.x

    Details

    • Type: Task
    • Status: Closed
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 1.0.2
    • Component/s: Source Control
    • Labels:
      None

      Description

      We need to merge the latest changes from 1.0.1.1 branch into the 1.0.x branch for KC/KS.

      See these notes on the subversion merge process:

      https://test.kuali.org/confluence/x/KYApAQ

      Remember to make DB changes to master KC database.

        Attachments

          Activity

          Hide
          jjhanso Jeremy Hanson added a comment -

          Here is the merge command:

          svn merge -r 10833:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-1-1-br

          Show
          jjhanso Jeremy Hanson added a comment - Here is the merge command: svn merge -r 10833:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-1-1-br
          Hide
          jjhanso Jeremy Hanson added a comment -

          merge output:

          C:\java\projects\rice-1.0.kc>svn merge -r 10833:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-1-1-br
          — Merging r10834 through r11560 into '.':
          U ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.java
          Conflict discovered in 'ksb/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C ksb\pom.xml
          U kim\src\test\java\org\kuali\rice\kim\test\service\UiDocumentServiceImplTest.java
          U kim\src\test\java\org\kuali\rice\kim\test\service\IdentityArchiveServiceTest.java
          D kim\src\test\java\org\kuali\rice\kim\test\service\RoleServiceImplTest.java
          A kim\src\test\java\org\kuali\rice\kim\service
          A kim\src\test\java\org\kuali\rice\kim\service\impl
          A kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.java
          U kim\src\test\resources\org\kuali\rice\kim\test\DefaultSuiteTestData.sql
          U kim\src\test\resources\org\kuali\rice\kim\test\DefaultSuiteTestData.xml
          Conflict discovered in 'kim/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C kim\pom.xml
          U kew\src\test\java\org\kuali\rice\kew\mail\EmailContentServiceTest.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\xml\StandardGenericXMLSearchableAttributeRangesTest.java
          U kew\src\test\java\org\kuali\rice\kew\docsearch\xml\StandardGenericXMLSearchableAttributeTest.java
          U kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousTestSplit.java
          U kew\src\test\java\org\kuali\rice\kew\xml\export\DocumentTypeXmlExporterTest.java
          U kew\src\test\java\org\kuali\rice\kew\rule\RuleTestUtils.java
          Conflict discovered in 'kew/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C kew\pom.xml
          A scripts\dataset\dist-build.properties
          A scripts\dataset\dist-impex-build.properties
          U scripts\dataset\demo-server-dataset-cleanup.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\01-04-2010.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-02-2009.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-04-2009.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-22-2009.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-07-2009.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-16-2009.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\02-02-2010.sql
          U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-09-2009.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\final\update_final_mysql.sql
          A scripts\upgrades\1.0.1 to 1.0.1.1\final\update_final_oracle.sql
          Conflict discovered in 'scripts/createproject.groovy'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C scripts\createproject.groovy
          Conflict discovered in 'pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C pom.xml
          U kns\src\test\java\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.java
          U kns\src\test\java\org\kuali\rice\kns\test\document\AccountStateKeyValues.java
          U kns\src\test\java\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.java
          U kns\src\test\java\org\kuali\rice\kns\service\NamespaceWildcardAllowedAndOrStringExactMatchPermissionTypeServiceImplTest.java
          U kns\src\test\java\org\kuali\rice\kns\workflow\SearchAttributeIndexRequestTest.java
          U kns\src\test\java\org\kuali\rice\kns\workflow\DataDictionarySearchableAttributeTest.java
          U kns\src\test\java\org\kuali\rice\kns\web\format\DateFormatterTest.java
          Conflict discovered in 'kns/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C kns\pom.xml
          U build.xml
          Conflict discovered in 'kcb/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C kcb\pom.xml
          U NOTICE.txt
          U impl\src\main\java\org\kuali\rice\ksb\messaging\FlattenedServiceDefinition.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\BusClientFailureProxy.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\quartz\KSBSchedulerFactoryBean.java
          U impl\src\main\java\org\kuali\rice\ksb\messaging\RemoteResourceServiceLocatorImpl.java
          U impl\src\main\java\org\kuali\rice\kim\bo\entity\impl\KimEntityExternalIdentifierImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityManagementNotificationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleManagementServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.java'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/PermissionServiceImpl.java'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimRoleDaoOjb.java
          U impl\src\main\java\org\kuali\rice\kim\config\KIMThinClientConfigurer.java
          U impl\src\main\java\org\kuali\rice\kim\lookup\KimTypeLookupableHelperServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kim\document\IdentityManagementPersonDocument.java
          U impl\src\main\java\org\kuali\rice\kew\doctype\bo\DocumentType.java
          U impl\src\main\java\org\kuali\rice\kew\actionlist\web\ActionListAction.java
          U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttributeDateTimeValue.java
          U impl\src\main\java\org\kuali\rice\kew\edl\components\NoteConfigComponent.java
          U impl\src\main\java\org\kuali\rice\kew\routeheader\service\impl\WorkflowDocumentServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kew\rule\web\DocumentConfigurationViewAction.java
          U impl\src\main\java\org\kuali\rice\kew\rule\FlexRM.java
          U impl\src\main\java\org\kuali\rice\kew\rule\RuleRoutingAttribute.java
          U impl\src\main\java\org\kuali\rice\core\service\impl\DemonstrationGradeEncryptionServiceImpl.java
          U impl\src\main\java\org\kuali\rice\core\config\event\RiceConfigEventListener.java
          U impl\src\main\java\org\kuali\rice\core\config\RiceConfigurerBase.java
          A impl\src\main\java\org\kuali\rice\core\config\spring\ConfigPropertyFactoryBean.java
          A impl\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java
          U impl\src\main\java\org\kuali\rice\kns\inquiry\KualiInquirableImpl.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\AbstractStaticConfigurationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\BusinessObjectAuthorizationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\service\impl\MaintenanceDocumentDictionaryServiceImpl.java
          Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/service/impl/DictionaryValidationServiceImpl.java'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C impl\src\main\java\org\kuali\rice\kns\service\impl\DictionaryValidationServiceImpl.java
          U impl\src\main\java\org\kuali\rice\kns\util\MessageMap.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiPropertyMessageResources.java
          U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiRequestProcessor.java
          U impl\src\main\resources\META-INF\test-config-defaults.xml
          Conflict discovered in 'impl/src/main/resources/META-INF/common-config-defaults.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C impl\src\main\resources\META-INF\common-config-defaults.xml
          U impl\src\main\resources\org\kuali\rice\ksb\config\KSBSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\ksb\config\KSBThinClientSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentAffiliation.xml
          U impl\src\main\resources\org\kuali\rice\kim\config\KIMThinClientSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml
          U impl\src\main\resources\org\kuali\rice\kew\ApplicationResources.properties
          U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\AttributeReferenceDummy.xml
          U impl\src\main\resources\org\kuali\rice\kns\config\KNSSpringBeans.xml
          Conflict discovered in 'impl/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C impl\pom.xml
          U api\src\main\java\org\kuali\rice\kim\service\PermissionService.java
          U api\src\main\java\org\kuali\rice\kim\service\PermissionUpdateService.java
          U api\src\main\java\org\kuali\rice\kim\service\IdentityManagementNotificationService.java
          U api\src\main\java\org\kuali\rice\kim\service\RoleManagementService.java
          U api\src\main\java\org\kuali\rice\kim\service\RoleService.java
          U api\src\main\java\org\kuali\rice\kim\service\RoleUpdateService.java
          U api\src\main\java\org\kuali\rice\kew\util\KEWConstants.java
          U api\src\main\java\org\kuali\rice\core\resourceloader\BaseResourceLoader.java
          Conflict discovered in 'api/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C api\pom.xml
          U README.txt
          Conflict discovered in 'ken/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C ken\pom.xml
          U web\src\main\config\standalone-config\WEB-INF\struts-config.xml
          U web\src\main\webapp\kew\WEB-INF\jsp\ActionList\ActionList.jsp
          U web\src\main\webapp\WEB-INF\struts-config.xml
          Conflict discovered in 'web/src/main/webapp/kr/WEB-INF/struts-config.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C web\src\main\webapp\kr\WEB-INF\struts-config.xml
          Conflict discovered in 'web/pom.xml'.
          Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
          C web\pom.xml
          U web\RiceHelp.zip
          Summary of conflicts:
          Text conflicts: 16

          I'm have the conflicts taken care of and I'm now unit testing to make sure things are working correctly. There were some major conflict on the RoleServiceImpl, and I need to make sure everything is correct.

          Show
          jjhanso Jeremy Hanson added a comment - merge output: C:\java\projects\rice-1.0.kc>svn merge -r 10833:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-1-1-br — Merging r10834 through r11560 into '.': U ksb\src\test\java\org\kuali\rice\ksb\messaging\ServiceUpdateAndRemovalTest.java Conflict discovered in 'ksb/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb\pom.xml U kim\src\test\java\org\kuali\rice\kim\test\service\UiDocumentServiceImplTest.java U kim\src\test\java\org\kuali\rice\kim\test\service\IdentityArchiveServiceTest.java D kim\src\test\java\org\kuali\rice\kim\test\service\RoleServiceImplTest.java A kim\src\test\java\org\kuali\rice\kim\service A kim\src\test\java\org\kuali\rice\kim\service\impl A kim\src\test\java\org\kuali\rice\kim\service\impl\RoleServiceImplTest.java U kim\src\test\resources\org\kuali\rice\kim\test\DefaultSuiteTestData.sql U kim\src\test\resources\org\kuali\rice\kim\test\DefaultSuiteTestData.xml Conflict discovered in 'kim/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kim\pom.xml U kew\src\test\java\org\kuali\rice\kew\mail\EmailContentServiceTest.java U kew\src\test\java\org\kuali\rice\kew\docsearch\xml\StandardGenericXMLSearchableAttributeRangesTest.java U kew\src\test\java\org\kuali\rice\kew\docsearch\xml\StandardGenericXMLSearchableAttributeTest.java U kew\src\test\java\org\kuali\rice\kew\actions\ReturnToPreviousTestSplit.java U kew\src\test\java\org\kuali\rice\kew\xml\export\DocumentTypeXmlExporterTest.java U kew\src\test\java\org\kuali\rice\kew\rule\RuleTestUtils.java Conflict discovered in 'kew/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew\pom.xml A scripts\dataset\dist-build.properties A scripts\dataset\dist-impex-build.properties U scripts\dataset\demo-server-dataset-cleanup.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\01-04-2010.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-02-2009.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-04-2009.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-22-2009.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-07-2009.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-16-2009.sql A scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\02-02-2010.sql U scripts\upgrades\1.0.1 to 1.0.1.1\db-updates\12-09-2009.sql A scripts\upgrades\1.0.1 to 1.0.1.1\final\update_final_mysql.sql A scripts\upgrades\1.0.1 to 1.0.1.1\final\update_final_oracle.sql Conflict discovered in 'scripts/createproject.groovy'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C scripts\createproject.groovy Conflict discovered in 'pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C pom.xml U kns\src\test\java\org\kuali\rice\kns\test\document\SearchAttributeIndexTestDocument.java U kns\src\test\java\org\kuali\rice\kns\test\document\AccountStateKeyValues.java U kns\src\test\java\org\kuali\rice\kns\test\document\AccountWithDDAttributesDocument.java U kns\src\test\java\org\kuali\rice\kns\service\NamespaceWildcardAllowedAndOrStringExactMatchPermissionTypeServiceImplTest.java U kns\src\test\java\org\kuali\rice\kns\workflow\SearchAttributeIndexRequestTest.java U kns\src\test\java\org\kuali\rice\kns\workflow\DataDictionarySearchableAttributeTest.java U kns\src\test\java\org\kuali\rice\kns\web\format\DateFormatterTest.java Conflict discovered in 'kns/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns\pom.xml U build.xml Conflict discovered in 'kcb/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kcb\pom.xml U NOTICE.txt U impl\src\main\java\org\kuali\rice\ksb\messaging\FlattenedServiceDefinition.java U impl\src\main\java\org\kuali\rice\ksb\messaging\BusClientFailureProxy.java U impl\src\main\java\org\kuali\rice\ksb\messaging\quartz\KSBSchedulerFactoryBean.java U impl\src\main\java\org\kuali\rice\ksb\messaging\RemoteResourceServiceLocatorImpl.java U impl\src\main\java\org\kuali\rice\kim\bo\entity\impl\KimEntityExternalIdentifierImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\IdentityManagementNotificationServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\service\impl\RoleManagementServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/RoleServiceImpl.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kim\service\impl\RoleServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/PermissionServiceImpl.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kim\service\impl\PermissionServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\dao\impl\KimRoleDaoOjb.java U impl\src\main\java\org\kuali\rice\kim\config\KIMThinClientConfigurer.java U impl\src\main\java\org\kuali\rice\kim\lookup\KimTypeLookupableHelperServiceImpl.java U impl\src\main\java\org\kuali\rice\kim\document\IdentityManagementPersonDocument.java U impl\src\main\java\org\kuali\rice\kew\doctype\bo\DocumentType.java U impl\src\main\java\org\kuali\rice\kew\actionlist\web\ActionListAction.java U impl\src\main\java\org\kuali\rice\kew\docsearch\SearchableAttributeDateTimeValue.java U impl\src\main\java\org\kuali\rice\kew\edl\components\NoteConfigComponent.java U impl\src\main\java\org\kuali\rice\kew\routeheader\service\impl\WorkflowDocumentServiceImpl.java U impl\src\main\java\org\kuali\rice\kew\rule\web\DocumentConfigurationViewAction.java U impl\src\main\java\org\kuali\rice\kew\rule\FlexRM.java U impl\src\main\java\org\kuali\rice\kew\rule\RuleRoutingAttribute.java U impl\src\main\java\org\kuali\rice\core\service\impl\DemonstrationGradeEncryptionServiceImpl.java U impl\src\main\java\org\kuali\rice\core\config\event\RiceConfigEventListener.java U impl\src\main\java\org\kuali\rice\core\config\RiceConfigurerBase.java A impl\src\main\java\org\kuali\rice\core\config\spring\ConfigPropertyFactoryBean.java A impl\src\main\java\org\kuali\rice\core\exception\RiceRemoteServiceConnectionException.java U impl\src\main\java\org\kuali\rice\kns\inquiry\KualiInquirableImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\AbstractStaticConfigurationServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\BusinessObjectAuthorizationServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\service\impl\MaintenanceDocumentDictionaryServiceImpl.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/kns/service/impl/DictionaryValidationServiceImpl.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\java\org\kuali\rice\kns\service\impl\DictionaryValidationServiceImpl.java U impl\src\main\java\org\kuali\rice\kns\util\MessageMap.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiPropertyMessageResources.java U impl\src\main\java\org\kuali\rice\kns\web\struts\action\KualiRequestProcessor.java U impl\src\main\resources\META-INF\test-config-defaults.xml Conflict discovered in 'impl/src/main/resources/META-INF/common-config-defaults.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\src\main\resources\META-INF\common-config-defaults.xml U impl\src\main\resources\org\kuali\rice\ksb\config\KSBSpringBeans.xml U impl\src\main\resources\org\kuali\rice\ksb\config\KSBThinClientSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kim\bo\datadictionary\PersonDocumentAffiliation.xml U impl\src\main\resources\org\kuali\rice\kim\config\KIMThinClientSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\config\KEWSpringBeans.xml U impl\src\main\resources\org\kuali\rice\kew\ApplicationResources.properties U impl\src\main\resources\org\kuali\rice\kns\bo\datadictionary\AttributeReferenceDummy.xml U impl\src\main\resources\org\kuali\rice\kns\config\KNSSpringBeans.xml Conflict discovered in 'impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl\pom.xml U api\src\main\java\org\kuali\rice\kim\service\PermissionService.java U api\src\main\java\org\kuali\rice\kim\service\PermissionUpdateService.java U api\src\main\java\org\kuali\rice\kim\service\IdentityManagementNotificationService.java U api\src\main\java\org\kuali\rice\kim\service\RoleManagementService.java U api\src\main\java\org\kuali\rice\kim\service\RoleService.java U api\src\main\java\org\kuali\rice\kim\service\RoleUpdateService.java U api\src\main\java\org\kuali\rice\kew\util\KEWConstants.java U api\src\main\java\org\kuali\rice\core\resourceloader\BaseResourceLoader.java Conflict discovered in 'api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C api\pom.xml U README.txt Conflict discovered in 'ken/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ken\pom.xml U web\src\main\config\standalone-config\WEB-INF\struts-config.xml U web\src\main\webapp\kew\WEB-INF\jsp\ActionList\ActionList.jsp U web\src\main\webapp\WEB-INF\struts-config.xml Conflict discovered in 'web/src/main/webapp/kr/WEB-INF/struts-config.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C web\src\main\webapp\kr\WEB-INF\struts-config.xml Conflict discovered in 'web/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C web\pom.xml U web\RiceHelp.zip Summary of conflicts: Text conflicts: 16 I'm have the conflicts taken care of and I'm now unit testing to make sure things are working correctly. There were some major conflict on the RoleServiceImpl, and I need to make sure everything is correct.
          Hide
          jjhanso Jeremy Hanson added a comment -

          This is the only sql statement to be run:

          ALTER TABLE ACCT_DD_ATTR_DOC MODIFY ACCT_UPDATE_DT_TM DATE
          /

          Show
          jjhanso Jeremy Hanson added a comment - This is the only sql statement to be run: ALTER TABLE ACCT_DD_ATTR_DOC MODIFY ACCT_UPDATE_DT_TM DATE /
          Hide
          jjhanso Jeremy Hanson added a comment -

          The merge has been completed. I've committed the code and ran the SQL against the master db.

          Show
          jjhanso Jeremy Hanson added a comment - The merge has been completed. I've committed the code and ran the SQL against the master db.

            People

            • Assignee:
              jjhanso Jeremy Hanson
              Reporter:
              jjhanso Jeremy Hanson
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: