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

Merge rice 1.0 kfs face-to-face branch into KFS trunk

    Details

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

      Description

      Now that Rice 1.0 is targeting the trunk of KFS, we can merge the branch the rice team created last week into the trunk of KFS.

      The url of that branch is:

      https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-20090520-br/

        Attachments

          Activity

          Hide
          ewestfal Eric Westfall added a comment -

          Merging from revision 23708:

          $ svn log --stop-on-copy https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-20090520-br/
          ...
          r23708 | ewestfal | 2009-05-20 16:13:02 -0400 (Wed, 20 May 2009) | 1 line

          Creating the a new KFS branch for the Rice team to work on for 1.0 tasks
          ------------------------------------------------------------------------

          Show
          ewestfal Eric Westfall added a comment - Merging from revision 23708: $ svn log --stop-on-copy https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-20090520-br/ ... r23708 | ewestfal | 2009-05-20 16:13:02 -0400 (Wed, 20 May 2009) | 1 line Creating the a new KFS branch for the Rice team to work on for 1.0 tasks ------------------------------------------------------------------------
          Hide
          ewestfal Eric Westfall added a comment -

          Merge command will be:

          svn merge -r 23708:HEAD https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-20090520-br/

          Show
          ewestfal Eric Westfall added a comment - Merge command will be: svn merge -r 23708:HEAD https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-20090520-br/
          Hide
          ewestfal Eric Westfall added a comment -

          Merge output below:

          $ svn merge -r 23708:HEAD https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-20090520-br/
          U test/unit/src/org/kuali/kfs/sys/dataaccess/MismatchedForeignKeyTest.java
          U test/unit/src/org/kuali/kfs/sys/dataaccess/UnitTestSqlDao.java
          U work/src/org/kuali/kfs/coa/document/OrgReviewRoleMaintainableImpl.java
          U work/src/org/kuali/kfs/coa/document/ChartMaintainableImpl.java
          U work/src/org/kuali/kfs/gl/document/GeneralLedgerCorrectionProcessDocument.java
          U work/src/org/kuali/kfs/pdp/businessobject/defaultvalue/NextAchAccountIdentifierFinder.java
          U work/src/org/kuali/kfs/pdp/businessobject/defaultvalue/NextCustomerProfileIdFinder.java
          U work/src/org/kuali/kfs/fp/document/AuxiliaryVoucherDocument.java
          U work/src/org/kuali/kfs/fp/document/CashManagementDocument.java
          U work/src/org/kuali/kfs/fp/document/AdvanceDepositDocument.java
          U work/src/org/kuali/kfs/fp/document/ProcurementCardDocument.java
          U work/src/org/kuali/kfs/fp/document/DistributionOfIncomeAndExpenseDocument.java
          U work/src/org/kuali/kfs/fp/document/InternalBillingDocument.java
          U work/src/org/kuali/kfs/fp/document/GeneralErrorCorrectionDocument.java
          U work/src/org/kuali/kfs/fp/document/CashReceiptDocument.java
          U work/src/org/kuali/kfs/module/ld/document/LaborLedgerPostingDocumentBase.java
          U work/src/org/kuali/kfs/module/ld/document/LaborJournalVoucherDocument.java
          U work/src/org/kuali/kfs/module/ld/document/LaborCorrectionDocument.java
          U work/src/org/kuali/kfs/module/cam/businessobject/defaultvalue/NextAssetNumberFinder.java
          U work/src/org/kuali/kfs/module/cam/document/AssetMaintainableImpl.java
          U work/src/org/kuali/kfs/module/cam/document/AssetPaymentDocument.java
          U work/src/org/kuali/kfs/module/cam/document/AssetLocationGlobalMaintainableImpl.java
          U work/src/org/kuali/kfs/module/cam/document/EquipmentLoanOrReturnDocument.java
          U work/src/org/kuali/kfs/module/cam/document/gl/CamsGeneralLedgerPendingEntrySourceBase.java
          U work/src/org/kuali/kfs/module/cam/document/AssetTransferDocument.java
          U work/src/org/kuali/kfs/module/cam/document/AssetRetirementGlobalMaintainableImpl.java
          U work/src/org/kuali/kfs/module/cam/document/AssetGlobalMaintainableImpl.java
          U work/src/org/kuali/kfs/module/ar/document/PaymentApplicationDocument.java
          U work/src/org/kuali/kfs/module/ar/document/CustomerCreditMemoDocument.java
          C work/src/org/kuali/kfs/module/ar/document/CustomerInvoiceDocument.java
          U work/src/org/kuali/kfs/module/ar/document/service/impl/CustomerServiceImpl.java
          U work/src/org/kuali/kfs/module/ar/document/service/impl/CustomerAddressServiceImpl.java
          U work/src/org/kuali/kfs/module/ar/document/CustomerMaintenableImpl.java
          U work/src/org/kuali/kfs/module/ar/document/CustomerInvoiceWriteoffDocument.java
          U work/src/org/kuali/kfs/module/bc/spring-bc.xml
          U work/src/org/kuali/kfs/module/bc/document/BudgetConstructionDocument.java
          U work/src/org/kuali/kfs/module/ec/document/EffortCertificationDocument.java
          U work/src/org/kuali/kfs/module/purap/businessobject/PurchaseOrderItem.java
          U work/src/org/kuali/kfs/module/purap/document/CorrectionReceivingDocument.java
          U work/src/org/kuali/kfs/module/purap/document/ReceivingDocumentBase.java
          U work/src/org/kuali/kfs/module/purap/document/AccountsPayableDocumentBase.java
          U work/src/org/kuali/kfs/module/purap/document/RequisitionDocument.java
          U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderPaymentHoldDocument.java
          U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderRetransmitDocument.java
          U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderVoidDocument.java
          U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderRemoveHoldDocument.java
          U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderCloseDocument.java
          U work/src/org/kuali/kfs/module/purap/document/ContractManagerAssignmentDocument.java
          U work/src/org/kuali/kfs/module/purap/document/LineItemReceivingDocument.java
          U work/src/org/kuali/kfs/module/purap/document/VendorCreditMemoDocument.java
          C work/src/org/kuali/kfs/module/purap/document/PurchaseOrderDocument.java
          U work/src/org/kuali/kfs/module/purap/document/ReceivingAddressMaintainableImpl.java
          U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderReopenDocument.java
          U work/src/org/kuali/kfs/module/purap/document/service/impl/PurchasingServiceImpl.java
          U work/src/org/kuali/kfs/module/purap/document/service/impl/PurchaseOrderServiceImpl.java
          U work/src/org/kuali/kfs/module/purap/document/PaymentRequestDocument.java
          C work/src/org/kuali/kfs/module/purap/document/PurchaseOrderAmendmentDocument.java
          U work/src/org/kuali/kfs/module/cg/businessobject/defaultvalue/NextProposalNumberFinder.java
          U work/src/org/kuali/kfs/module/cg/businessobject/defaultvalue/NextCloseNumberFinder.java
          U work/src/org/kuali/kfs/module/cg/businessobject/defaultvalue/NextAgencyNumberFinder.java
          U work/src/org/kuali/kfs/module/cg/businessobject/defaultvalue/NextSubcontractorNumberFinder.java
          U work/src/org/kuali/kfs/module/cg/document/AwardMaintainableImpl.java
          U work/src/org/kuali/kfs/module/cg/document/RoutingFormDocument.java
          U work/src/org/kuali/kfs/vnd/document/VendorMaintainableImpl.java
          U work/src/org/kuali/kfs/sys/document/FinancialSystemTransactionalDocumentBase.java
          U work/src/org/kuali/kfs/sys/document/FinancialSystemMaintenanceDocument.java
          U work/src/org/kuali/kfs/sys/document/GeneralLedgerPostingDocumentBase.java
          D work/web-root/WEB-INF/lib/rice-impl-0.9.4-SNAPSHOT.jar
          D work/web-root/WEB-INF/lib/rice-api-0.9.4-SNAPSHOT.jar
          A work/web-root/WEB-INF/lib/rice-impl-1.0.0-SNAPSHOT.jar
          A work/web-root/WEB-INF/lib/rice-api-1.0.0-SNAPSHOT.jar
          U build.properties

          Show
          ewestfal Eric Westfall added a comment - Merge output below: $ svn merge -r 23708:HEAD https://test.kuali.org/svn/kfs/branches/kfs-rice-facetoface-20090520-br/ U test/unit/src/org/kuali/kfs/sys/dataaccess/MismatchedForeignKeyTest.java U test/unit/src/org/kuali/kfs/sys/dataaccess/UnitTestSqlDao.java U work/src/org/kuali/kfs/coa/document/OrgReviewRoleMaintainableImpl.java U work/src/org/kuali/kfs/coa/document/ChartMaintainableImpl.java U work/src/org/kuali/kfs/gl/document/GeneralLedgerCorrectionProcessDocument.java U work/src/org/kuali/kfs/pdp/businessobject/defaultvalue/NextAchAccountIdentifierFinder.java U work/src/org/kuali/kfs/pdp/businessobject/defaultvalue/NextCustomerProfileIdFinder.java U work/src/org/kuali/kfs/fp/document/AuxiliaryVoucherDocument.java U work/src/org/kuali/kfs/fp/document/CashManagementDocument.java U work/src/org/kuali/kfs/fp/document/AdvanceDepositDocument.java U work/src/org/kuali/kfs/fp/document/ProcurementCardDocument.java U work/src/org/kuali/kfs/fp/document/DistributionOfIncomeAndExpenseDocument.java U work/src/org/kuali/kfs/fp/document/InternalBillingDocument.java U work/src/org/kuali/kfs/fp/document/GeneralErrorCorrectionDocument.java U work/src/org/kuali/kfs/fp/document/CashReceiptDocument.java U work/src/org/kuali/kfs/module/ld/document/LaborLedgerPostingDocumentBase.java U work/src/org/kuali/kfs/module/ld/document/LaborJournalVoucherDocument.java U work/src/org/kuali/kfs/module/ld/document/LaborCorrectionDocument.java U work/src/org/kuali/kfs/module/cam/businessobject/defaultvalue/NextAssetNumberFinder.java U work/src/org/kuali/kfs/module/cam/document/AssetMaintainableImpl.java U work/src/org/kuali/kfs/module/cam/document/AssetPaymentDocument.java U work/src/org/kuali/kfs/module/cam/document/AssetLocationGlobalMaintainableImpl.java U work/src/org/kuali/kfs/module/cam/document/EquipmentLoanOrReturnDocument.java U work/src/org/kuali/kfs/module/cam/document/gl/CamsGeneralLedgerPendingEntrySourceBase.java U work/src/org/kuali/kfs/module/cam/document/AssetTransferDocument.java U work/src/org/kuali/kfs/module/cam/document/AssetRetirementGlobalMaintainableImpl.java U work/src/org/kuali/kfs/module/cam/document/AssetGlobalMaintainableImpl.java U work/src/org/kuali/kfs/module/ar/document/PaymentApplicationDocument.java U work/src/org/kuali/kfs/module/ar/document/CustomerCreditMemoDocument.java C work/src/org/kuali/kfs/module/ar/document/CustomerInvoiceDocument.java U work/src/org/kuali/kfs/module/ar/document/service/impl/CustomerServiceImpl.java U work/src/org/kuali/kfs/module/ar/document/service/impl/CustomerAddressServiceImpl.java U work/src/org/kuali/kfs/module/ar/document/CustomerMaintenableImpl.java U work/src/org/kuali/kfs/module/ar/document/CustomerInvoiceWriteoffDocument.java U work/src/org/kuali/kfs/module/bc/spring-bc.xml U work/src/org/kuali/kfs/module/bc/document/BudgetConstructionDocument.java U work/src/org/kuali/kfs/module/ec/document/EffortCertificationDocument.java U work/src/org/kuali/kfs/module/purap/businessobject/PurchaseOrderItem.java U work/src/org/kuali/kfs/module/purap/document/CorrectionReceivingDocument.java U work/src/org/kuali/kfs/module/purap/document/ReceivingDocumentBase.java U work/src/org/kuali/kfs/module/purap/document/AccountsPayableDocumentBase.java U work/src/org/kuali/kfs/module/purap/document/RequisitionDocument.java U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderPaymentHoldDocument.java U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderRetransmitDocument.java U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderVoidDocument.java U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderRemoveHoldDocument.java U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderCloseDocument.java U work/src/org/kuali/kfs/module/purap/document/ContractManagerAssignmentDocument.java U work/src/org/kuali/kfs/module/purap/document/LineItemReceivingDocument.java U work/src/org/kuali/kfs/module/purap/document/VendorCreditMemoDocument.java C work/src/org/kuali/kfs/module/purap/document/PurchaseOrderDocument.java U work/src/org/kuali/kfs/module/purap/document/ReceivingAddressMaintainableImpl.java U work/src/org/kuali/kfs/module/purap/document/PurchaseOrderReopenDocument.java U work/src/org/kuali/kfs/module/purap/document/service/impl/PurchasingServiceImpl.java U work/src/org/kuali/kfs/module/purap/document/service/impl/PurchaseOrderServiceImpl.java U work/src/org/kuali/kfs/module/purap/document/PaymentRequestDocument.java C work/src/org/kuali/kfs/module/purap/document/PurchaseOrderAmendmentDocument.java U work/src/org/kuali/kfs/module/cg/businessobject/defaultvalue/NextProposalNumberFinder.java U work/src/org/kuali/kfs/module/cg/businessobject/defaultvalue/NextCloseNumberFinder.java U work/src/org/kuali/kfs/module/cg/businessobject/defaultvalue/NextAgencyNumberFinder.java U work/src/org/kuali/kfs/module/cg/businessobject/defaultvalue/NextSubcontractorNumberFinder.java U work/src/org/kuali/kfs/module/cg/document/AwardMaintainableImpl.java U work/src/org/kuali/kfs/module/cg/document/RoutingFormDocument.java U work/src/org/kuali/kfs/vnd/document/VendorMaintainableImpl.java U work/src/org/kuali/kfs/sys/document/FinancialSystemTransactionalDocumentBase.java U work/src/org/kuali/kfs/sys/document/FinancialSystemMaintenanceDocument.java U work/src/org/kuali/kfs/sys/document/GeneralLedgerPostingDocumentBase.java D work/web-root/WEB-INF/lib/rice-impl-0.9.4-SNAPSHOT.jar D work/web-root/WEB-INF/lib/rice-api-0.9.4-SNAPSHOT.jar A work/web-root/WEB-INF/lib/rice-impl-1.0.0-SNAPSHOT.jar A work/web-root/WEB-INF/lib/rice-api-1.0.0-SNAPSHOT.jar U build.properties
          Hide
          ewestfal Eric Westfall added a comment -

          This has been completed.

          Show
          ewestfal Eric Westfall added a comment - This has been completed.
          Hide
          ewestfal Eric Westfall added a comment -

          Bulk change of all Rice 1.0 issues to closed after public release.

          Show
          ewestfal Eric Westfall added a comment - Bulk change of all Rice 1.0 issues to closed after public release.

            People

            • Assignee:
              ewestfal Eric Westfall
              Reporter:
              ewestfal Eric Westfall
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Time Tracking

                Estimated:
                Original Estimate - 1 hour
                1h
                Remaining:
                Remaining Estimate - 1 hour
                1h
                Logged:
                Time Spent - Not Specified
                Not Specified