Uploaded image for project: 'UIMA'
  1. UIMA
  2. UIMA-3404

Correct faulty merge from svn branch "xmlComments"

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: 2.4.2SDK
    • Fix Version/s: 2.5.0SDK
    • Component/s: Core Java Framework
    • Labels:
      None

      Description

      Back in 2011, a branch, "xmlComments" was created to work on issue UIMA-239. It appears that some of the changes made for this and for UIMA-2155 got into the branch, but were never merged into the trunk. Investigation shows the following files and change sets are possibly in need of merging into the current trunk, from these two issues:

      The branch svn history shows two revisions not merged: 1187355 and 1202771.

      Cross checking this with the mentioned UIMA jira issues:
      UIMA-239: found 2 files changed:

      https://fisheye6.atlassian.com/viewrep/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java?r1=&r2=1187355
      https://fisheye6.atlassian.com/viewrep/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java?r1=&r2=1187355

      UIMA-2155:
      Found 1 file changed:
      https://fisheye6.atlassian.com/viewrep/uimaj/branches/xmlComments/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java?r1=&r2=1202771

      For entire xmlComments branch, the full list of changes seems consistent with these above:.
      https://fisheye6.atlassian.com/changelog/~br=xmlComments/uimaj

      Use this information to merge these changes back into trunk.

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                schor Marshall Schor
                Reporter:
                schor Marshall Schor
              • Votes:
                0 Vote for this issue
                Watchers:
                1 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: