[jbossts-issues] [JBoss JIRA] (JBTM-1124) jbosstm/jboss-as merge failed from the upstream

[Tom Jenkinson (JIRA)]

     [ https://issues.jboss.org/browse/JBTM-1124?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Tom Jenkinson resolved JBTM-1124.
---------------------------------

    Resolution: Done


This was the fix:

<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-network</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts</artifactId>
</dependency>
                
> jbosstm/jboss-as merge failed from the upstream
> -----------------------------------------------
>
>                 Key: JBTM-1124
>                 URL: https://issues.jboss.org/browse/JBTM-1124
>             Project: JBoss Transaction Manager
>          Issue Type: Bug
>      Security Level: Public(Everyone can see) 
>          Components: Build System
>            Reporter: Amos Feng
>            Assignee: Tom Jenkinson
>             Fix For: 5.0.0.M2
>
>
> the following error when doing 'git pull --rebase upstream master' on jbosstm/jboss-as(BRANCH_5).
> ...
> Auto-merging pom.xml
> Auto-merging jacorb/pom.xml
> CONFLICT (content): Merge conflict in jacorb/pom.xml
> Auto-merging build/pom.xml
> Auto-merging build/build.xml
> Failed to merge in the changes.
> Patch failed at 0001 5.0.0.M2-SNAPSHOT version of TS
> ...
> jacorb/pom.xm
> ...
> <dependency>
> <<<<<<< HEAD
> <groupId>org.jboss.as</groupId>
> <artifactId>jboss-as-network</artifactId>
> </dependency>
> <dependency>
> <groupId>org.jboss.jbossts</groupId>
> <artifactId>jbossjts</artifactId>
> =======
> <groupId>org.jboss.narayana.jts</groupId>
> <artifactId>narayana-jts</artifactId>
> >>>>>>> 5.0.0.M2-SNAPSHOT version of TS
> </dependency>
> see https://github.com/jbossas/jboss-as/commit/d3fb1ce3f1688a654e19c0e56b7f98e14fd7c137 

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira