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

Merge KC JPA fixes from 0.9.3 to 0.9.3.1 then into 0.9.4

    Details

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

      Description

      Nate made some fixes on 0.9.3, these need to be put onto 0.9.3.1 then merged into 0.9.4 so that Scott's team can begin the JPA work.

        Attachments

          Activity

          Hide
          ewestfal Eric Westfall added a comment -

          Merge command from 0.9.3 to 0.9.3.1 will be:

          svn merge -r 4924:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-br

          Show
          ewestfal Eric Westfall added a comment - Merge command from 0.9.3 to 0.9.3.1 will be: svn merge -r 4924:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-br
          Hide
          ewestfal Eric Westfall added a comment -

          Merge result from 0.9.3 to 0.9.3.1:

          U core/src/main/java/org/kuali/rice/jpa/criteria/Criteria.java
          U core/src/main/java/org/kuali/rice/jpa/criteria/QueryByCriteria.java
          U core/src/main/java/org/kuali/rice/util/OrmUtils.java
          U pom.xml
          U kns/src/main/java/org/kuali/core/bo/DocumentType.java
          U kns/src/main/java/org/kuali/core/dao/jpa/BusinessObjectDaoJpa.java
          U kns/src/main/java/org/kuali/core/dao/jpa/PersistenceDaoJpa.java
          U kns/src/main/java/org/kuali/core/lookup/LookupUtils.java
          U kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java
          U kns/src/main/resources/META-INF/kns-persistence.xml
          U ken/src/main/resources/KENSpringBeans.xml
          U ksb/src/main/resources/KSBSpringBeans.xml
          U kim/src/main/resources/KIMSpringBeans.xml
          U kom/src/main/resources/KOMSpringBeans.xml
          U kew/src/main/resources/org/kuali/workflow/resources/KewSpringBeans.xml

          Show
          ewestfal Eric Westfall added a comment - Merge result from 0.9.3 to 0.9.3.1: U core/src/main/java/org/kuali/rice/jpa/criteria/Criteria.java U core/src/main/java/org/kuali/rice/jpa/criteria/QueryByCriteria.java U core/src/main/java/org/kuali/rice/util/OrmUtils.java U pom.xml U kns/src/main/java/org/kuali/core/bo/DocumentType.java U kns/src/main/java/org/kuali/core/dao/jpa/BusinessObjectDaoJpa.java U kns/src/main/java/org/kuali/core/dao/jpa/PersistenceDaoJpa.java U kns/src/main/java/org/kuali/core/lookup/LookupUtils.java U kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java U kns/src/main/resources/META-INF/kns-persistence.xml U ken/src/main/resources/KENSpringBeans.xml U ksb/src/main/resources/KSBSpringBeans.xml U kim/src/main/resources/KIMSpringBeans.xml U kom/src/main/resources/KOMSpringBeans.xml U kew/src/main/resources/org/kuali/workflow/resources/KewSpringBeans.xml
          Hide
          ewestfal Eric Westfall added a comment -

          Merge command for 0.9.3.1 to 0.9.4 will be:

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

          Show
          ewestfal Eric Westfall added a comment - Merge command for 0.9.3.1 to 0.9.4 will be: svn merge -r 4717:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-1-br
          Hide
          ewestfal Eric Westfall added a comment -

          Output from merge...yuck:

          C scripts/createproject.groovy
          Skipped missing target: 'core/src/main/java/org/kuali/rice/jpa/criteria/Criteria.java'
          Skipped missing target: 'core/src/main/java/org/kuali/rice/jpa/criteria/QueryByCriteria.java'
          Skipped missing target: 'core/src/main/java/org/kuali/rice/jpa/criteria'
          Skipped missing target: 'core/src/main/java/org/kuali/rice/jpa'
          Skipped missing target: 'core/src/main/java/org/kuali/rice/util/OrmUtils.java'
          Skipped missing target: 'core/src/main/java/org/kuali/rice/util'
          Skipped missing target: 'core/src/main/java/org/kuali/rice'
          Skipped missing target: 'core/src/main/java/org/kuali'
          Skipped missing target: 'core/src/main/java/org'
          Skipped missing target: 'core/src/main/java'
          Skipped missing target: 'core/src/main'
          Skipped missing target: 'core/src'
          Skipped missing target: 'core/pom.xml'
          Skipped missing target: 'core'
          C pom.xml
          Skipped missing target: 'kns/src/main/java/org/kuali/core/bo/DocumentType.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/bo'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/dao/jpa/BusinessObjectDaoJpa.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/dao/jpa/PersistenceDaoJpa.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/dao/jpa'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/dao'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/lookup/LookupUtils.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/lookup'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts/form/KualiTransactionalDocumentFormBase.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts/form'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts/action'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/web'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/document/authorization/TransactionalDocumentAuthorizerBase.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/document/authorization/TransactionalDocumentActionFlags.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/document/authorization'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/document/TransactionalDocument.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/document/TransactionalDocumentBase.java'
          Skipped missing target: 'kns/src/main/java/org/kuali/core/document'
          Skipped missing target: 'kns/src/main/java/org/kuali/core'
          Skipped missing target: 'kns/src/main/java/org/kuali'
          Skipped missing target: 'kns/src/main/java/org'
          Skipped missing target: 'kns/src/main/java'
          Skipped missing target: 'kns/src/main/resources/META-INF/kns-persistence.xml'
          Skipped missing target: 'kns/src/main/resources/META-INF'
          Skipped missing target: 'kns/src/main/resources'
          Skipped missing target: 'kns/src/main'
          C kns/pom.xml
          Skipped missing target: 'kcb/src/main/java/org/kuali/rice/kcb/KCBInitializer.java'
          Skipped missing target: 'kcb/src/main/java/org/kuali/rice/kcb'
          Skipped missing target: 'kcb/src/main/java/org/kuali/rice'
          Skipped missing target: 'kcb/src/main/java/org/kuali'
          Skipped missing target: 'kcb/src/main/java/org'
          Skipped missing target: 'kcb/src/main/java'
          Skipped missing target: 'kcb/src/main'
          C kcb/pom.xml
          Skipped missing target: 'tools/src/test/java/org/kuali/workflow/tools/xml/XmlGenTest.java'
          Skipped missing target: 'tools/src/test/java/org/kuali/workflow/tools/xml'
          Skipped missing target: 'tools/src/test/java/org/kuali/workflow/tools'
          Skipped missing target: 'tools/src/test/java/org/kuali/workflow'
          Skipped missing target: 'tools/src/test/java/org/kuali'
          Skipped missing target: 'tools/src/test/java/org'
          Skipped missing target: 'tools/src/test/java'
          Skipped missing target: 'tools/src/test'
          Skipped missing target: 'tools/src'
          Skipped missing target: 'tools/pom.xml'
          Skipped missing target: 'tools'
          Skipped missing target: 'testharness/pom.xml'
          Skipped missing target: 'testharness'
          Skipped missing target: 'kim-authn-sesn/pom.xml'
          Skipped missing target: 'kim-authn-sesn'
          Skipped missing target: 'kcb-api/pom.xml'
          Skipped missing target: 'kcb-api'
          Skipped missing target: 'shared/pom.xml'
          Skipped missing target: 'shared'
          Skipped missing target: 'server/pom.xml'
          Skipped missing target: 'server'
          Skipped missing target: 'kim-authn-client/pom.xml'
          Skipped missing target: 'kim-authn-client'
          Skipped missing target: 'ken/src/main/resources/KENSpringBeans.xml'
          Skipped missing target: 'ken/src/main/resources'
          Skipped missing target: 'ken/src/main'
          C ken/pom.xml
          Skipped missing target: 'ksb/src/main/resources/KSBSpringBeans.xml'
          Skipped missing target: 'ksb/src/main/resources/KSBThinClientSpringBeans.xml'
          Skipped missing target: 'ksb/src/main/resources'
          Skipped missing target: 'ksb/src/main'
          C ksb/pom.xml
          Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service/PrincipalServiceTest.java'
          Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service/RoleServiceTest.java'
          Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service/PersonServiceTest.java'
          Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service/GroupServiceTest.java'
          Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service'
          Skipped missing target: 'kim/src/main/resources/KIMSpringBeans.xml'
          Skipped missing target: 'kim/src/main/resources'
          Skipped missing target: 'kim/src/main'
          C kim/pom.xml
          Skipped missing target: 'ken-api/pom.xml'
          Skipped missing target: 'ken-api'
          Skipped missing target: 'kom/src/main/resources/KOMSpringBeans.xml'
          Skipped missing target: 'kom/src/main/resources'
          Skipped missing target: 'kom/src/main'
          Skipped missing target: 'kom/src'
          Skipped missing target: 'kom/pom.xml'
          Skipped missing target: 'kom'
          Skipped missing target: 'kew/src/main/resources/org/kuali/workflow/resources/KewSpringBeans.xml'
          Skipped missing target: 'kew/src/main/resources/org/kuali/workflow/resources'
          Skipped missing target: 'kew/src/main/resources/org/kuali/workflow'
          Skipped missing target: 'kew/src/main/resources/org/kuali'
          Skipped missing target: 'kew/src/main/resources/org'
          Skipped missing target: 'kew/src/main/resources'
          Skipped missing target: 'kew/src/main'
          C kew/pom.xml
          Skipped missing target: 'kim-api/pom.xml'
          Skipped missing target: 'kim-api'
          Skipped missing target: 'kom-api/pom.xml'
          Skipped missing target: 'kom-api'

          Show
          ewestfal Eric Westfall added a comment - Output from merge...yuck: C scripts/createproject.groovy Skipped missing target: 'core/src/main/java/org/kuali/rice/jpa/criteria/Criteria.java' Skipped missing target: 'core/src/main/java/org/kuali/rice/jpa/criteria/QueryByCriteria.java' Skipped missing target: 'core/src/main/java/org/kuali/rice/jpa/criteria' Skipped missing target: 'core/src/main/java/org/kuali/rice/jpa' Skipped missing target: 'core/src/main/java/org/kuali/rice/util/OrmUtils.java' Skipped missing target: 'core/src/main/java/org/kuali/rice/util' Skipped missing target: 'core/src/main/java/org/kuali/rice' Skipped missing target: 'core/src/main/java/org/kuali' Skipped missing target: 'core/src/main/java/org' Skipped missing target: 'core/src/main/java' Skipped missing target: 'core/src/main' Skipped missing target: 'core/src' Skipped missing target: 'core/pom.xml' Skipped missing target: 'core' C pom.xml Skipped missing target: 'kns/src/main/java/org/kuali/core/bo/DocumentType.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/bo' Skipped missing target: 'kns/src/main/java/org/kuali/core/dao/jpa/BusinessObjectDaoJpa.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/dao/jpa/PersistenceDaoJpa.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/dao/jpa' Skipped missing target: 'kns/src/main/java/org/kuali/core/dao' Skipped missing target: 'kns/src/main/java/org/kuali/core/lookup/LookupUtils.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/lookup' Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts/form/KualiTransactionalDocumentFormBase.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts/form' Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts/action' Skipped missing target: 'kns/src/main/java/org/kuali/core/web/struts' Skipped missing target: 'kns/src/main/java/org/kuali/core/web' Skipped missing target: 'kns/src/main/java/org/kuali/core/document/authorization/TransactionalDocumentAuthorizerBase.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/document/authorization/TransactionalDocumentActionFlags.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/document/authorization' Skipped missing target: 'kns/src/main/java/org/kuali/core/document/TransactionalDocument.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/document/TransactionalDocumentBase.java' Skipped missing target: 'kns/src/main/java/org/kuali/core/document' Skipped missing target: 'kns/src/main/java/org/kuali/core' Skipped missing target: 'kns/src/main/java/org/kuali' Skipped missing target: 'kns/src/main/java/org' Skipped missing target: 'kns/src/main/java' Skipped missing target: 'kns/src/main/resources/META-INF/kns-persistence.xml' Skipped missing target: 'kns/src/main/resources/META-INF' Skipped missing target: 'kns/src/main/resources' Skipped missing target: 'kns/src/main' C kns/pom.xml Skipped missing target: 'kcb/src/main/java/org/kuali/rice/kcb/KCBInitializer.java' Skipped missing target: 'kcb/src/main/java/org/kuali/rice/kcb' Skipped missing target: 'kcb/src/main/java/org/kuali/rice' Skipped missing target: 'kcb/src/main/java/org/kuali' Skipped missing target: 'kcb/src/main/java/org' Skipped missing target: 'kcb/src/main/java' Skipped missing target: 'kcb/src/main' C kcb/pom.xml Skipped missing target: 'tools/src/test/java/org/kuali/workflow/tools/xml/XmlGenTest.java' Skipped missing target: 'tools/src/test/java/org/kuali/workflow/tools/xml' Skipped missing target: 'tools/src/test/java/org/kuali/workflow/tools' Skipped missing target: 'tools/src/test/java/org/kuali/workflow' Skipped missing target: 'tools/src/test/java/org/kuali' Skipped missing target: 'tools/src/test/java/org' Skipped missing target: 'tools/src/test/java' Skipped missing target: 'tools/src/test' Skipped missing target: 'tools/src' Skipped missing target: 'tools/pom.xml' Skipped missing target: 'tools' Skipped missing target: 'testharness/pom.xml' Skipped missing target: 'testharness' Skipped missing target: 'kim-authn-sesn/pom.xml' Skipped missing target: 'kim-authn-sesn' Skipped missing target: 'kcb-api/pom.xml' Skipped missing target: 'kcb-api' Skipped missing target: 'shared/pom.xml' Skipped missing target: 'shared' Skipped missing target: 'server/pom.xml' Skipped missing target: 'server' Skipped missing target: 'kim-authn-client/pom.xml' Skipped missing target: 'kim-authn-client' Skipped missing target: 'ken/src/main/resources/KENSpringBeans.xml' Skipped missing target: 'ken/src/main/resources' Skipped missing target: 'ken/src/main' C ken/pom.xml Skipped missing target: 'ksb/src/main/resources/KSBSpringBeans.xml' Skipped missing target: 'ksb/src/main/resources/KSBThinClientSpringBeans.xml' Skipped missing target: 'ksb/src/main/resources' Skipped missing target: 'ksb/src/main' C ksb/pom.xml Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service/PrincipalServiceTest.java' Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service/RoleServiceTest.java' Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service/PersonServiceTest.java' Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service/GroupServiceTest.java' Skipped missing target: 'kim/src/test/java/org/kuali/rice/kim/service' Skipped missing target: 'kim/src/main/resources/KIMSpringBeans.xml' Skipped missing target: 'kim/src/main/resources' Skipped missing target: 'kim/src/main' C kim/pom.xml Skipped missing target: 'ken-api/pom.xml' Skipped missing target: 'ken-api' Skipped missing target: 'kom/src/main/resources/KOMSpringBeans.xml' Skipped missing target: 'kom/src/main/resources' Skipped missing target: 'kom/src/main' Skipped missing target: 'kom/src' Skipped missing target: 'kom/pom.xml' Skipped missing target: 'kom' Skipped missing target: 'kew/src/main/resources/org/kuali/workflow/resources/KewSpringBeans.xml' Skipped missing target: 'kew/src/main/resources/org/kuali/workflow/resources' Skipped missing target: 'kew/src/main/resources/org/kuali/workflow' Skipped missing target: 'kew/src/main/resources/org/kuali' Skipped missing target: 'kew/src/main/resources/org' Skipped missing target: 'kew/src/main/resources' Skipped missing target: 'kew/src/main' C kew/pom.xml Skipped missing target: 'kim-api/pom.xml' Skipped missing target: 'kim-api' Skipped missing target: 'kom-api/pom.xml' Skipped missing target: 'kom-api'
          Hide
          ewestfal Eric Westfall added a comment -

          Because of the package refactoring at the begginning of 0.9.4, all of this had to be merged by hand. This has been done and committed to 0.9.4.

          Show
          ewestfal Eric Westfall added a comment - Because of the package refactoring at the begginning of 0.9.4, all of this had to be merged by hand. This has been done and committed to 0.9.4.
          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:
              0 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