[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[emfcompare-build] [Hudson] Build failed in Hudson: master-build-on-egit-logical-nighlty » mars,JDK_1.8.0_Latest #574
|
See <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars,jdk=JDK_1.8.0_Latest/574/changes>
Changes:
[Philip Langer] Fix NPE in NotifyingXMLHelper.setValue()
------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 574
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@77d5a87d
Using strategy: Default
Git Exe: git
Last Built Revision: Revision 8ed4ef9f3032aee0aead5245f36d22126b56bc77 (origin/master)
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@77d5a87d
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision 0f1fcf759299dc61c23ac1fbe64c8927c15e0c95 (origin/master)
Checking out Revision 0f1fcf759299dc61c23ac1fbe64c8927c15e0c95 (origin/master)
Starting xvnc
[JDK_1.8.0_Latest] $ Xvnc :203 -geometry 1024x768 -depth 24 -ac -SecurityTypes none -noreset
[JDK_1.8.0_Latest] $ /bin/sh -xe /tmp/hudson1322708762890907562.sh
+ echo 'We de-activate the git tests for now as they currently fail.'
We de-activate the git tests for now as they currently fail.
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/93726 patch-set 5'
>> Cherry-picking https://git.eclipse.org/r/#/c/93726 patch-set 5
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/26/93726/5
Xvnc TigerVNC 1.4.1 - built ??? ?? ???? ??:??:??
Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)
See http://www.tigervnc.org for information on TigerVNC.
Underlying X server release 11502000, The X.Org Foundation
Initializing built-in extension VNC-EXTENSION
Initializing built-in extension Generic Event Extension
Initializing built-in extension SHAPE
Initializing built-in extension MIT-SHM
Initializing built-in extension XInputExtension
Initializing built-in extension XTEST
Initializing built-in extension BIG-REQUESTS
Initializing built-in extension SYNC
Initializing built-in extension XKEYBOARD
Initializing built-in extension XC-MISC
Initializing built-in extension XFIXES
Initializing built-in extension RENDER
Initializing built-in extension RANDR
Initializing built-in extension COMPOSITE
Initializing built-in extension DAMAGE
Initializing built-in extension MIT-SCREEN-SAVER
Initializing built-in extension DOUBLE-BUFFER
Initializing built-in extension RECORD
Initializing built-in extension DPMS
Initializing built-in extension Present
Initializing built-in extension X-Resource
Initializing built-in extension XVideo
Initializing built-in extension XVideo-MotionCompensation
Initializing built-in extension GLX
Tue Jun 13 00:30:27 2017
vncext: VNC extension running!
vncext: Listening for VNC connections on all interface(s), port 6103
vncext: created VNC server for screen 0
[dix] Could not init font path element /usr/share/fonts/TTF/, removing from list!
[dix] Could not init font path element /usr/share/fonts/OTF/, removing from list!
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/26/93726/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 6c4f4a0] [514079] Implement Mirroring: Swap left/right side in merge viewers
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
16 files changed, 1294 insertions(+), 23 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/MirroredMergeActionTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MirrorUtil.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/MirroredTableContentMergeViewerContentProvider.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/MirroredEMFCompareTextMergeViewerContentProvider.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/MirroredTreeContentMergeViewerContentProvider.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/93041/ patch-set 11'
>> Cherry-picking https://git.eclipse.org/r/#/c/93041/ patch-set 11
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/41/93041/11
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/41/93041/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD bb180ce] [514382] Pre-Merge on conflict can lead to data loss
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
4 files changed, 175 insertions(+), 8 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/EMFResourceMappingMergerPreMergeTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/data/premerge/bug_preMergeWithConflict.zip
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/93188 patch-set 20'
>> Cherry-picking https://git.eclipse.org/r/#/c/93188 patch-set 20
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/88/93188/20
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/88/93188/20 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 528e32f] [512677] Register EMFModelProvider for new Papyrus resources
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
4 files changed, 204 insertions(+), 2 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/modelprovider/EMFModelProviderRegistrationTest.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/94454 patch-set 8'
>> Cherry-picking https://git.eclipse.org/r/#/c/94454 patch-set 8
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/54/94454/8
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/54/94454/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD cd38338] [514767] Provide preferences to configure comparison editor behavior
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
13 files changed, 507 insertions(+), 89 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/NoSelectedItemCompareInput.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/NoSelectedItemViewerCreator.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/preferences/EditorPreferencePage.java
delete mode 100644 plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EditorPreferencePage.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/91499 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/91499 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/99/91499/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/99/91499/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 830070d] Add progress reporting for post processors
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
6 files changed, 107 insertions(+), 21 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/91910 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/91910 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/10/91910/3
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/10/91910/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 3e867d5] Relax Compare Considerations of IMergeViewerItems
Author: Stefan Dirix <sdirix@xxxxxxxxxxxxxxxxx>
1 file changed, 7 insertions(+), 1 deletion(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/92881 patch-set 11'
>> Cherry-picking https://git.eclipse.org/r/#/c/92881 patch-set 11
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/81/92881/11
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/81/92881/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD d1293ff] [514415] Relationships between diffs should be cached
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
31 files changed, 1666 insertions(+), 300 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/IDiffRelationshipComputerChange.java
create mode 100644 plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/DiffRelationshipComputerChange.java
create mode 100644 plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffRelationshipComputerTest.java
delete mode 100644 plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDependenciesUtil.java
create mode 100644 plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/CachingDiffRelationshipComputer.java
create mode 100644 plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/DiffRelationshipComputer.java
create mode 100644 plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/IDiffRelationshipComputer.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/91551 patch-set 3'
>> Cherry-picking https://git.eclipse.org/r/#/c/91551 patch-set 3
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/51/91551/3
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/51/91551/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD f2e4613] [487151] Accept all non-conflicting changes fails to merge some diffs
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
22 files changed, 806 insertions(+), 14 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore
create mode 100644 plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore
create mode 100644 plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/e3/conflict_e3_left.nodes
create mode 100644 plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/e3/conflict_e3_origin.nodes
create mode 100644 plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/e3/conflict_e3_right.nodes
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/95470 patch-set 5'
>> Cherry-picking https://git.eclipse.org/r/#/c/95470 patch-set 5
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/70/95470/5
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/70/95470/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 10329e9] [515581] Make test plug-ins available from the update-site
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
17 files changed, 550 insertions(+), 2 deletions(-)
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/.project
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/.settings/org.eclipse.core.resources.prefs
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/.settings/org.eclipse.core.runtime.prefs
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/about.html
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/build.properties
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/copyright.txt
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/epl-v10.html
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/feature.properties
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/feature.xml
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/modeling32.png
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/pom.xml
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/sourceTemplateFeature/copyright.txt
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/sourceTemplateFeature/epl-v10.html
create mode 100644 packaging/org.eclipse.emf.compare.tests-feature/sourceTemplateFeature/feature.properties
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/96231 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/96231 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/31/96231/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/31/96231/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 8a56f49] [516060] Opaque Action Body conflict resolution results in wrong body
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
2 files changed, 85 insertions(+), 20 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/98811 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/98811 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/11/98811/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/11/98811/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD fba3ea1] [516524] Use more efficient feature look-up in ReferenceUtil
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 43 insertions(+), 29 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/98812 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/98812 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/11/98812/1
fatal: Couldn't find remote ref refs/changes/11/98812/1
fatal: The remote end hung up unexpectedly
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/98881 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/98881 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/81/98881/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/81/98881/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD c5466c5] Ignore NavigatableTest.bigTree() as it always seems to run out of memory
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 2 insertions(+)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/98982/ patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/98982/ patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/82/98982/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/82/98982/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 9f93b33... Fix NPE in NotifyingXMLHelper.setValue()
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Terminating xvnc.
Recording test results
Archiving artifacts
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
