Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2016-04-08Fix version.shMatthias Sohn1-2/+16
- don't change version of license-feature in org.eclipse.egit.mylyn-feature/feature.xml - update version of imported plugins org.eclipse.egit.core and org.eclipse.egit.ui in org.eclipse.egit.gitflow-feature/feature.xml - update version of required bundle org.eclipse.jgit in org.eclipse.egit.ui.importer/META-INF/MANIFEST.MF Change-Id: Ie890bf8fcf3c90350c3b9336b9a897981c6e8d64 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-01-19Remove psf feature from tools/version.shMatthias Sohn1-12/+0
This feature is gone since a long time Change-Id: I8c1b156167c88f0c0a1510bca425780da168ba67 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-08-25Update developer tools to point to Mars repositoryChris Price1-18/+18
The p2f file was pointing at a repository URL that no longer exists; this updates it to a more recent one. Bug: 475790 Change-Id: I2f816dee38b50ee2a0210a054124f377a1028863 Signed-off-by: Chris Price <chris@puppetlabs.com>
2015-06-29[oomph] Drop JGit Java 7 bundlesMykola Nikishov1-4/+0
Bundle org.eclipse.jgit.java7 has been merged into org.eclipse.jgit by commit 197e3393a51424fae45e51dce4a649ba26e5a368. Bug: 440357 Change-Id: I6351835e41926031ffcf660e32ba13243fb23137 Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
2015-06-29[oomph] Set API baseline to latest release 4.0.1Mykola Nikishov1-2/+2
Bug: 449232 Change-Id: I1258efc5abde78f4618fd323d8c18ee340e3a6c3 Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
2015-03-09Oomph configuration to setup Eclipse for EGit contributorsMatthias Sohn1-0/+238
In order to enable us maintaining our Oomph configuration ourselves we have to have it in our repository. This is the initial configuration which works but isn't yet perfect. Bug: 461542 Change-Id: I3695cf0b14546d8376a47c85e6c4c23f45eb8227 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-24Merge branch 'stable-3.7'Matthias Sohn1-27/+72
* stable-3.7: Add org.slf4j.api and slf4j-log4j bridge to target platforms Fix UI tests for platform versions newer than Kepler Use Target Platform Definition DSL to generate target platforms Leftover after review 42168: trailing space in StagingView Fix test error in StagingViewTest.testCommitSingleFile Close opened views on teardown to avoid broken StagingView tests Fix test error in StagingViewTest.testMergeConflict Refactoring the way how StagingView reacts on selection. Don't use ModalContext.run(..) during part activation event notification GitLightweightDecorator code cleanup part 1 Make welcome page contribution more consistent Don't apply fonts and colors if they are undefined in current theme Conflicts: tools/egit-developer-tools.p2f Change-Id: I5d892763c88ea23de6444795683af9a3d75fbddc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-23Add org.slf4j.api and slf4j-log4j bridge to target platformsMatthias Sohn1-1/+11
We want to use slf4j in JGit hence add it to the joint target platform. We will use log4j with EGit hence add slf4j-log4j bridge to jgit feature. CQ: 9206 CQ: 9207 CQ: 9241 Bug: 458445 Change-Id: Ie23869aaac37af15e1013e917d966b28cb8caba3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-23Use Target Platform Definition DSL to generate target platformsMatthias Sohn1-30/+60
The "Target Platform Definition DSL and Generator" [1] heavily simplifies maintenance of target platforms. It allows to modularize target platform definitions which eliminates code duplication. The .target files understood by P2 and Tycho are generated from .tpd files which are written in the target platform definition DSL. In order to edit .tpd files and generate .target files install the "Target Platform Definition DSL and Generator" 2.0 or later [2] (Note: on Kepler you also need to add [3] to get Xtext 2.5 which is not available by default on Kepler). This tools is needed only if you need to change the Target Platform definition files (*.targetplatform and *.tpd) and re-generate the *.target files. In normal development you do not need this and can simply use the generated *.target themselves. In addition - update to Mars M5 Orbit repository for 4.5 - use Luna SR2 Orbit p2 repository for platform version Luna and earlier - update hamcrest to 1.3 which is used by swtbot on newer platform versions - update p2f file [1] https://github.com/mbarbero/fr.obeo.releng.targetplatform [2] http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/ [3] http://download.eclipse.org/modeling/tmf/xtext/updates/releases/ Change-Id: Id0dfd18440211141ba8a16bdc7c8ed41f69fa9f4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-10Set minimum required Java version to Java 7Matthias Sohn2-12/+7
Also update the installation instructions. Bug: 458476 Change-Id: I7a2b20bb7d5ec71d63feeb068078bc4a94fa2f24 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2014-05-21Add script to create EGit releaseMatthias Sohn1-0/+51
Change-Id: I39da37f11242afdb328aaa821eb54e3557e3b15e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-09-04Merge branch 'stable-3.0'Matthias Sohn1-16/+21
* stable-3.0: Prepare post 3.0.2-rc2 builds EGit v3.0.2.201309041250-rc2 [historyView] Prevent nested merge and cherry-pick Update build to use CBI jarsigner plugin GitSyncObjectCache erroneously changes the sync state of resources Fix compare editor element label for "file not in commit" RepositoryAction: Only calculate isEnabled if relevant selection changes Add refresh of linked folder to LinkedResourcesTest Fix inefficient implementation of GitScopeOperation [historyView] Prevent nested rebase Fix sorting of files in commit dialog tree Update to Orbit Kepler SR1 release R20130827064939 Improve usability of "Create New Tag" dialog Change-Id: I8d45613fa897bc89067861bf557ac7896806bff3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-27Update to Orbit Kepler SR1 release R20130827064939Matthias Sohn1-16/+21
Also update p2f tools installation file accordingly. Change-Id: Iaf3487e3ab938dbf923bbdeb2f212de13a397a39 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-22Fix version.sh to correctly modify dependenciesMatthias Sohn1-0/+16
The script missed to update the egit and jgit feature dependencies in o.e.e.mylyn.ui.test/pom.xml when setting a new snapshot version. Change-Id: I8fd22f51d7e7ab162891cabe448495f1aa46da2c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-08-10Fix Mylyn weekly update site in egit-developer-tools.p2fRobin Stocker1-1/+1
Change-Id: If960140f1d37c4b5db329f5ade90aa301d1b5c3b Signed-off-by: Robin Stocker <robin@nibor.org>
2013-06-13Fix version.sh to correctly modify dependenciesMatthias Sohn1-0/+16
The script missed to update the egit and jgit feature dependencies in o.e.e.mylyn.ui.test/pom.xml when setting a new snapshot version. Change-Id: I8fd22f51d7e7ab162891cabe448495f1aa46da2c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-03-08Update p2f file for installing tools and JGit/EGit dependenciesMatthias Sohn1-18/+49
Update to latest Orbit release and update dependencies. Change-Id: Ifc92a9c523fd64d7233c890c34686e30f2225145 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2013-01-09Simplify Eclipse setup for EGit developersMatthias Sohn1-0/+130
This provides a quick way to install the tools typically used by JGit/EGit contributors. In addition it provides an alternative to using a target platform for provisioning 3rd party dependencies required to compile and test JGit and EGit. Using a target platform is more accurate as it allows to separate the dependencies of the workbench used for development from the one used for testing. But using a target platform is typically slower since PDE tries to communicate with p2 repositories listed in the target platform. In order to install dependencies and plugins typically used by EGit developers click "Import... > Install > Install Software Items from File" and select this p2f file, then select the bundles you want to install and click OK. Change-Id: I84709b302297e8ad9fb8c1b11d2edb85c7f03c57 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-05-11Update tycho version to 0.14.1Matthias Sohn1-1/+1
Tycho 0.14.1 enforces that artifactId and feature/bundle SymbolicName must match, hence follow recommended migration practice and change groupId of feature projects in order not to change the feature names as this would require a feature migration. Also migrate the p2 repository build from the deprecated packaging type eclipse-update-site to packaging type eclipse-repository. The explicit reference to the egit p2 repository to define the runtime platform for the egit ui tests isn't necessary any longer. JGit-Dependency: I99fc6c2bbb20efbd6514bdd9940f3535707c21bc Change-Id: I5fdbace1075e465b001cc9c5d449f56fb3bb2a21 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-12Fix version.shMatthias Sohn1-1/+1
Change-Id: I3ff6f77507b1dd51a6eca690a509d41168154596 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-10Fix version.shMatthias Sohn1-6/+21
Change-Id: Ie3ef9a73154a5c11e3924201841b4dd52fa9956b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-11Fix version.shMatthias Sohn1-1/+38
Also change sorting in org.eclipse.egit.ui.test/pom.xml to ease finding versions to be changed by version.sh. Change-Id: Ic7518ab2eb65d43c3bdba8f957e82e6700beb95f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-06-16tools/version.sh: Use backup files on Win32Matthias Sohn1-5/+6
Copied from corresponding change in jgit repository. Windows doesn't permit us to edit a file in-place with Perl. So create backup files when we perform the edit, and remove them when we are done. This is a tad slower on POSIX systems, but is much more portable. Change-Id: Ib267092d47b115972139c8ae367acee572d62ccf Also-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-03-19tools/version.sh: Update OSGi manifest filesShawn O. Pearce1-0/+150
Change-Id: I11df35d84f6b95c6035406c35e3b4e44dfe821e8 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-02-04Point EGit to the same formatting profile as JGitShawn O. Pearce1-0/+267
The two projects share a lot of committers, and have the same origin, so their coding style is identical. Ensure we have a sane style configuration within EGit in case a new contributor just picks up the EGit tree and doesn't clone the JGit tree. Change-Id: If4a355e27e1aa5e25ffd082714a36bb4aea90f12 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-09-30Utility to graft old EGit history onto repositoryShawn O. Pearce1-0/+28
This script can be executed by a developer to download and graft on the old EGit history, from before we moved the project to the eclipse.org namespace and the Eclipse Foundation servers. Executing this script is only necessary if you need to run log or blame past the migration boundary, and isn't always recommended when it comes to pushing objects to a remote server. As mentioned in the script, it is best to use a specialized repository with this graft, not your main work repository. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

    Back to the top