Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.egit-feature/feature.xml6
-rw-r--r--org.eclipse.egit-feature/pom.xml2
-rw-r--r--org.eclipse.egit.core.junit/META-INF/MANIFEST.MF30
-rw-r--r--org.eclipse.egit.core.junit/pom.xml2
-rw-r--r--org.eclipse.egit.core.test/META-INF/MANIFEST.MF24
-rw-r--r--org.eclipse.egit.core.test/pom.xml2
-rw-r--r--org.eclipse.egit.core/META-INF/MANIFEST.MF78
-rw-r--r--org.eclipse.egit.core/pom.xml2
-rw-r--r--org.eclipse.egit.doc/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.egit.doc/build-help.xml4
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html9
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html61
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/5.1.html275
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/5.3.html85
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/Updating-This-Document.html55
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/images/EGit_Compare_Editor_Show_Whitespace.pngbin15065 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/images/Egit-commit-sign.pngbin20918 -> 0 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html86
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Contributors.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/Contributors.html)38
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/See-Also.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Contributors.html)29
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Updating-This-Document.html)16
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.pngbin0 -> 62631 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_History_Whitespace.pngbin0 -> 25958 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.pngbin0 -> 29492 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.pngbin0 -> 11233 bytes
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/5.1.html201
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/Updating-This-Document.html55
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/5.3.html83
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html72
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/Contributors.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/Contributors.html)33
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/toc.xml34
-rw-r--r--org.eclipse.egit.doc/pom.xml2
-rw-r--r--org.eclipse.egit.gitflow-feature/feature.xml8
-rw-r--r--org.eclipse.egit.gitflow-feature/pom.xml2
-rw-r--r--org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.egit.gitflow.test/pom.xml2
-rw-r--r--org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF66
-rw-r--r--org.eclipse.egit.gitflow.ui/pom.xml2
-rw-r--r--org.eclipse.egit.gitflow/META-INF/MANIFEST.MF26
-rw-r--r--org.eclipse.egit.gitflow/pom.xml2
-rw-r--r--org.eclipse.egit.mylyn-feature/feature.xml4
-rw-r--r--org.eclipse.egit.mylyn-feature/pom.xml2
-rw-r--r--org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.egit.mylyn.ui.test/pom.xml2
-rw-r--r--org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF26
-rw-r--r--org.eclipse.egit.mylyn.ui/pom.xml2
-rw-r--r--org.eclipse.egit.repository/pom.xml2
-rw-r--r--org.eclipse.egit.source-feature/feature.xml4
-rw-r--r--org.eclipse.egit.source-feature/pom.xml2
-rw-r--r--org.eclipse.egit.target/pom.xml2
-rw-r--r--org.eclipse.egit.ui.test/META-INF/MANIFEST.MF34
-rw-r--r--org.eclipse.egit.ui.test/pom.xml2
-rw-r--r--org.eclipse.egit.ui/META-INF/MANIFEST.MF180
-rw-r--r--org.eclipse.egit.ui/pom.xml2
-rw-r--r--org.eclipse.egit/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.egit/pom.xml2
-rw-r--r--pom.xml4
58 files changed, 573 insertions, 1111 deletions
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
index 7d4234bfd..e94face59 100644
--- a/org.eclipse.egit-feature/feature.xml
+++ b/org.eclipse.egit-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.egit"
label="%featureName"
- version="5.4.0.qualifier"
+ version="5.4.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.egit"
license-feature="org.eclipse.license"
@@ -40,8 +40,8 @@
<import plugin="org.eclipse.jsch.ui" version="1.3.0" match="compatible"/>
<import plugin="org.eclipse.jsch.core" version="1.3.0" match="compatible"/>
<import plugin="com.jcraft.jsch" version="0.1.55" match="compatible"/>
- <import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
- <import feature="org.eclipse.jgit.ssh.apache" version="5.4.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.4.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit.ssh.apache" version="5.4.1" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml
index b1fab4677..e56d71bbb 100644
--- a/org.eclipse.egit-feature/pom.xml
+++ b/org.eclipse.egit-feature/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.egit.feature</groupId>
diff --git a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF
index c94c80985..d840c5a80 100644
--- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF
@@ -4,26 +4,26 @@ Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Automatic-Module-Name: org.eclipse.egit.core.junit
Bundle-SymbolicName: org.eclipse.egit.core.junit
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.8.100,4.0.0)",
org.junit;bundle-version="[4.12.0,5.0.0)"
-Import-Package: org.eclipse.egit.core;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.op;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.dircache;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.junit;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.lib;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.storage.file;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.transport;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.treewalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.util;version="[5.4.0,5.5.0)"
+Import-Package: org.eclipse.egit.core;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.op;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.dircache;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.junit;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.lib;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.storage.file;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.transport;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.treewalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.util;version="[5.4.1,5.5.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.egit.core.test;version="5.4.0";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test"
+Export-Package: org.eclipse.egit.core.test;version="5.4.1";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test"
Bundle-Localization: plugin
diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml
index 0f95997f6..3bdf534fd 100644
--- a/org.eclipse.egit.core.junit/pom.xml
+++ b/org.eclipse.egit.core.junit/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.core.junit</artifactId>
diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
index 448f619ff..5e60c4ee6 100644
--- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org
Automatic-Module-Name: org.eclipse.egit.core.test
Bundle-SymbolicName: org.eclipse.egit.core.test;singleton:=true
Fragment-Host: org.eclipse.egit.core
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
@@ -13,19 +13,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.egit.core.junit;bundle-version="[5.4.0,5.5.0)"
+ org.eclipse.egit.core.junit;bundle-version="[5.4.1,5.5.0)"
Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
net.bytebuddy.agent;version="[1.7.9,2.0.0)",
- org.eclipse.egit.core;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.op;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.project;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.attributes;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.junit;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.lib;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.treewalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.util;version="[5.4.0,5.5.0)",
+ org.eclipse.egit.core;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.op;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.project;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.attributes;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.junit;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.lib;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.treewalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.util;version="[5.4.1,5.5.0)",
org.mockito;version="[2.13.0,3.0.0)",
org.mockito.junit;version="[2.13.0,3.0.0)",
org.mockito.stubbing;version="[2.13.0,3.0.0)"
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index b8db18db8..4fe216b72 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.core.test</artifactId>
diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF
index 071aa6749..3118a05d8 100644
--- a/org.eclipse.egit.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Automatic-Module-Name: org.eclipse.egit.core
Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Bundle-Activator: org.eclipse.egit.core.Activator
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)",
org.eclipse.core.variables;bundle-version="[3.3.0,4.0.0)",
org.eclipse.core.filebuffers;bundle-version="[3.6.0,4.0.0)"
-Export-Package: org.eclipse.egit.core;version="5.4.0";
+Export-Package: org.eclipse.egit.core;version="5.4.1";
x-friends:="org.eclipse.egit.ui,
org.eclipse.egit.ui.test,
org.eclipse.egit.mylyn.ui,
@@ -23,16 +23,16 @@ Export-Package: org.eclipse.egit.core;version="5.4.0";
org.eclipse.mylyn.github.ui,
org.eclipse.mylyn.github.core,
org.eclipse.egit.core.junit",
- org.eclipse.egit.core.attributes;version="5.4.0";uses:="org.eclipse.jgit.lib",
- org.eclipse.egit.core.internal;version="5.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow",
- org.eclipse.egit.core.internal.gerrit;version="5.4.0";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.indexdiff;version="5.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
- org.eclipse.egit.core.internal.job;version="5.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow",
- org.eclipse.egit.core.internal.rebase;version="5.4.0";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.storage;version="5.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test",
- org.eclipse.egit.core.internal.trace;version="5.4.0";x-internal:=true,
- org.eclipse.egit.core.internal.util;version="5.4.0";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.op;version="5.4.0";
+ org.eclipse.egit.core.attributes;version="5.4.1";uses:="org.eclipse.jgit.lib",
+ org.eclipse.egit.core.internal;version="5.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow",
+ org.eclipse.egit.core.internal.gerrit;version="5.4.1";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.indexdiff;version="5.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
+ org.eclipse.egit.core.internal.job;version="5.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow",
+ org.eclipse.egit.core.internal.rebase;version="5.4.1";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.storage;version="5.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test",
+ org.eclipse.egit.core.internal.trace;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.core.internal.util;version="5.4.1";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.op;version="5.4.1";
x-friends:="org.eclipse.egit.ui.test,
org.eclipse.egit.ui,
org.eclipse.egit.gitflow,
@@ -41,39 +41,39 @@ Export-Package: org.eclipse.egit.core;version="5.4.0";
org.eclipse.egit.github.core,
org.eclipse.mylyn.github.ui,
org.eclipse.egit.core.junit",
- org.eclipse.egit.core.project;version="5.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.core.securestorage;version="5.4.0";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.storage;version="5.4.0";
+ org.eclipse.egit.core.project;version="5.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.core.securestorage;version="5.4.1";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.storage;version="5.4.1";
uses:="org.eclipse.core.runtime,
org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.core.resources",
- org.eclipse.egit.core.synchronize;version="5.4.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
- org.eclipse.egit.core.synchronize.dto;version="5.4.0";x-friends:="org.eclipse.egit.ui"
+ org.eclipse.egit.core.synchronize;version="5.4.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
+ org.eclipse.egit.core.synchronize.dto;version="5.4.1";x-friends:="org.eclipse.egit.ui"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.jcraft.jsch;bundle-version="[0.1.53,0.2.0)",
org.eclipse.core.net.proxy;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.attributes;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.diff;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.dircache;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.events;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.lfs;version="[5.4.0,5.5.0)";resolution:=optional,
- org.eclipse.jgit.lib;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.merge;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.storage.file;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.submodule;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.transport;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.transport.sshd;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.treewalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.util;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.util.io;version="[5.4.0,5.5.0)",
+ org.eclipse.jgit.annotations;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.attributes;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.diff;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.dircache;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.events;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.lfs;version="[5.4.1,5.5.0)";resolution:=optional,
+ org.eclipse.jgit.lib;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.merge;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.storage.file;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.submodule;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.transport;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.treewalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.util;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.util.io;version="[5.4.1,5.5.0)",
org.eclipse.jsch.core;bundle-version="[1.3.0,2.0.0)"
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml
index 0398d1fac..915ebd18d 100644
--- a/org.eclipse.egit.core/pom.xml
+++ b/org.eclipse.egit.core/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.core</artifactId>
diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
index 067031725..740697110 100644
--- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
index 6bafeb983..4135bb802 100644
--- a/org.eclipse.egit.doc/build-help.xml
+++ b/org.eclipse.egit.doc/build-help.xml
@@ -44,8 +44,8 @@
>
<path name="EGit/User_Guide" title="EGit User Guide" />
<path name="JGit/User_Guide" title="JGit User Guide" />
- <path name="EGit/New_and_Noteworthy/5.3" title="EGit 5.3 New and Noteworthy" />
- <path name="JGit/New_and_Noteworthy/5.3" title="JGit 5.3 New and Noteworthy" />
+ <path name="EGit/New_and_Noteworthy/5.4" title="EGit 5.4 New and Noteworthy" />
+ <path name="JGit/New_and_Noteworthy/5.4" title="JGit 5.4 New and Noteworthy" />
<path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" />
<path name="EGit/Contributor_Guide" title="EGit Contributor Guide" />
<stylesheet url="book.css" />
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
index f4ec42a81..3a15f0c61 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
@@ -149,8 +149,13 @@
<pre>bazel test --test_tag_filters=api,dfs,revplot,treewalk //...
</pre>
<ul>
- <li>to run build with
- <a href="https://github.com/google/error-prone" target="egit_external">the errorprone static analyzer</a> execute
+ <li>to rerun all tests ignoring cached test results execute</li>
+ </ul>
+ <pre>bazel test //... --cache_test_results=NO
+</pre>
+ <ul>
+ <li>since 5.4.0 builds run with
+ <a href="https://github.com/google/error-prone" target="egit_external">the errorprone static analyzer</a> by default. If you want to enable it for older JGit versions execute
</li>
</ul>
<pre>bazel build --java_toolchain //tools:error_prone_warnings_toolchain :all
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
index 486c1782d..5804bbb11 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
@@ -363,6 +363,64 @@ Change-Id: I71ac4844ab9d2f848352eba9252090c586b4146a
Signed-off-by: Your Name &lt;your.email@example.org&gt;
</pre>
<p>If you use Mylyn to fetch a bug from bugzilla, and then activate the task, the commit message will automatically be formatted exactly like requested above.</p>
+ <h2 id="License_Header">License Header</h2>
+ <p>JGit is licensed under the
+ <a href="https://www.eclipse.org/org/documents/edl-v10.php" target="egit_external">Eclipse Distribution License</a> which is a form of the
+ <a href="https://opensource.org/licenses/BSD-3-Clause" target="egit_external">New BSD License</a>.
+ Use of this license by an Eclipse project requires unanimous approval by the Board of Directors of the Eclipse Foundation
+ which was approved in a
+ <a href="https://www.eclipse.org/org/foundation/boardminutes/2009_09_16_Minutes.php" target="egit_external">meeting of the board in Sep 2009</a>.
+ </p>
+ <p>The license header to be used for JGit is (see this
+ <a href="https://www.eclipse.org/lists/jgit-dev/msg00127.html" target="egit_external">mail thread on the jgit-dev list</a>):
+ </p>
+ <pre>/*
+ * Copyright &#169; YEAR, CONTRIBUTOR
+ * [Copyright &#169; YEAR, CONTRIBUTOR...]
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at <a href="http://www.eclipse.org/org/documents/edl-v10.php" target="egit_external">http://www.eclipse.org/org/documents/edl-v10.php</a>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+</pre>
+ <p>See
+ <a href="http://www.eclipse.org/legal/copyrightandlicensenotice.php" target="egit_external">http://www.eclipse.org/legal/copyrightandlicensenotice.php</a> for more information.
+ </p>
<h2 id="Copyright">Copyright</h2>
<p>When contributing patches, you have to update the copyright section at the beginning of the file if there is one. Please follow the style that is already present in the file. Some examples follow.</p>
<p>When there is only one copyright present (from a person or a company), like this:</p>
@@ -382,9 +440,6 @@ Copyright (C) 2011 Other Name &lt;other@example.org&gt;
Copyright (C) YEAR Your Name &lt;you@example.org&gt;
</pre>
<p>For new files, copy one of the existing headers and start the copyright section with your name.</p>
- <p>Also see
- <a href="http://www.eclipse.org/legal/copyrightandlicensenotice.php" target="egit_external">http://www.eclipse.org/legal/copyrightandlicensenotice.php</a> for more information.
- </p>
<h2 id="Test_before_submitting">Test before submitting</h2>
<p>See the
<a href="#Manual_alpha_testing">Manual alpha testing</a> section for some advice about how to test you work yourself.
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/5.1.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/5.1.html
deleted file mode 100644
index c4bd443ac..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/5.1.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 5.1 New and Noteworthy</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">EGit 5.1 New and Noteworthy</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Contributors.html" title="Contributors">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="EGit">EGit</h1>
- <h2 id="Features">Features</h2>
- <ul>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=339796" target="egit_external">bug 339796</a> History table: let the user define which columns are shown
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529850" target="egit_external">bug 529850</a> Github client: Get user's teams across GitHub organizations
- </li>
- </ul>
- <h2 id="Usability">Usability</h2>
- <ul>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538322" target="egit_external">bug 538322</a> Allow horizontal space in file:// URIishs in GitUrlChecker
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536205" target="egit_external">bug 536205</a> Restrict visibility of Gitflow menu items
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538505" target="egit_external">bug 538505</a> Focus file list in commit editor
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537931" target="egit_external">bug 537931</a> Commit editor: Abbreviate parent SHA-1 with 7 characters
- </li>
- <li>Reorder reflog view context menu</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538490" target="egit_external">bug 538490</a> Icon for "Stash Changes..." menu
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538502" target="egit_external">bug 538502</a> Have ellipsis at "Create patch" menu
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538488" target="egit_external">bug 538488</a> Sort upstream branch configuration case insensitive
- </li>
- <li>Focus default button in PullResultDialog</li>
- <li>Radio button style configuration selection of repository properties</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537200" target="egit_external">bug 537200</a> [staging] use icons for author and committer
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537690" target="egit_external">bug 537690</a> Sort branches before tags in pull result dialog
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537482" target="egit_external">bug 537482</a> Use multi-line text fields for merge and rebase result dialogs
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537672" target="egit_external">bug 537672</a> Commit Editor: use proper create branch and create tag icons
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536324" target="egit_external">bug 536324</a> Handle cancellation of rename detection
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537181" target="egit_external">bug 537181</a> History table: adapt column widths when view size changes
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536863" target="egit_external">bug 536863</a> - No feedback on "Import changed projects"
- </li>
- <li>Add 2 missing icons for cherry-pick and rename branch entrie in reflog</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536799" target="egit_external">bug 536799</a> Disable "Compare with previous" for deletions
- </li>
- <li>Mark more jobs as system or user</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=463906" target="egit_external">bug 463906</a> Better default editor opening for file revisions
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536360" target="egit_external">bug 536360</a> Sort decoration variables alphabetically
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535577" target="egit_external">bug 535577</a> Normalize tag name when typing
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536236" target="egit_external">bug 536236</a> Move clean menu item before garbage collect menu item
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536097" target="egit_external">bug 536097</a> Set RepositoryPropertyPage zero pixel margin
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535678" target="egit_external">bug 535678</a> Improve share wizard window title
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536204" target="egit_external">bug 536204</a> Sort gerrit remote refs naturally
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535742" target="egit_external">bug 535742</a> History view: Activate compare mode by default
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535160" target="egit_external">bug 535160</a> Reveal newly created entry in configuration editor
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533596" target="egit_external">bug 533596</a> Do not display "[NO-HEAD]" for empty repository
- <ul>
- <li>Complete the hovers in the history view</li>
- <li>On the commit ID column, display the full SHA1 and the short commit message.</li>
- </ul>
- </li>
- <li>On the message column, display the short message if not over a ref.</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535171" target="egit_external">bug 535171</a> FetchGerritChangePage: automatic content-assist on paste
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537469" target="egit_external">bug 537469</a> Add missing blank in github wizard labels
- </li>
- </ul>
- <h2 id="Performance_Improvements">Performance Improvements</h2>
- <ul>
- <li>Avoid more UI freezes in ReflogView: redraw once only</li>
- <li>Avoid UI blocks in ReflogView</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536814" target="egit_external">bug 536814</a> Use an asynchronous lightweight decorator in the repositories view
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=485743" target="egit_external">bug 485743</a> Avoid that loading the history blocks updating the commit table
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=440588" target="egit_external">bug 440588</a>,
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=485743" target="egit_external">bug 485743</a> Git history page: move expensive operations in the background
- </li>
- <li>Computing the file diffs</li>
- <li>Preparing to load the history</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535950" target="egit_external">bug 535950</a> Batch resource refreshes
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535856" target="egit_external">bug 535856</a> Speed up staging view tree viewer management
- </li>
- <li>Reload commit info in history only if selection really changed</li>
- </ul>
- <h2 id="Bug_Fixes">Bug Fixes</h2>
- <ul>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538855" target="egit_external">bug 538855</a> Don't log an error on save in comparisons if resource out of sync
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538846" target="egit_external">bug 538846</a> Don't auto-refresh projects with missing .project file
- </li>
- <li>Gitflow: Fix that EGit allowed starting features with diverging develop branches</li>
- <li>Fix Findbugs RV_NEGATING_RESULT_OF_COMPARETO</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538492" target="egit_external">bug 538492</a> Fix NPE in git model synchronization
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537959" target="egit_external">bug 537959</a> Fix layout and title in CommitSelectionDialog
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537937" target="egit_external">bug 537937</a> Replace PlotWalk usage by RevWalk
- </li>
- <li>Fix comparison of SWTCommit to detect changed selection</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537813" target="egit_external">bug 537813</a> Avoid refresh on up-to-date pull operation
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537900" target="egit_external">bug 537900</a> Remove "Change-Id" line properly on CR-LF operating systems
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537492" target="egit_external">bug 537492</a> Fix filter in reflog view
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537790" target="egit_external">bug 537790</a> Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dss
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537331" target="egit_external">bug 537331</a> Hide $GIT_DIR and friends from JGit
- </li>
- <li>Fix wrapping label in DateFormatPreferencePage</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536880" target="egit_external">bug 536880</a> Ensure IProjects are not refreshed via IFile handles
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536799" target="egit_external">bug 536799</a> Fix "Compare with Previous" in history view and commit editor outline
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536471" target="egit_external">bug 536471</a> Fix error marker updates in staging view
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533019" target="egit_external">bug 533019</a> Staging view: update author/committer on config changes
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536472" target="egit_external">bug 536472</a> Do not refresh projects that use a PessimisticResourceRuleFactory
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536357" target="egit_external">bug 536357</a> Fix history preference page field editor layout
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533005" target="egit_external">bug 533005</a> Disable commit buttons immediately on committing
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536356" target="egit_external">bug 536356</a> Fix DatePreferencePage which did not wrap explanation label
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536240" target="egit_external">bug 536240</a> Fix sort order in Staging view
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535749" target="egit_external">bug 535749</a> Fix StagingView which wrongly sorted by state initially
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=532940" target="egit_external">bug 532940</a> History search: use CSS for text field background color
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535796" target="egit_external">bug 535796</a> Fix CommitUI.getSelectedFiles()
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531489" target="egit_external">bug 531489</a> Add version tag prefix for closing gitflow hotfix
- </li>
- </ul>
- <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
- <ul>
- <li>Fixed: GitFlow test launch config: Added missing dependencies</li>
- <li>Update Orbit 2018-09 to R20180905201904</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538414" target="egit_external">bug 538414</a> Use new TPD update site
- </li>
- <li>Update Photon orbit repository to R20180606145124</li>
- <li>Update to spotbugs 3.1.6</li>
- <li>Organize OSGi manifests</li>
- <li>Update Jetty to 9.4.11.v20180605</li>
- <li>Update org.apache.httpcomponents.httpclient to 4.5.5.v20180409-1525</li>
- <li>Update org.apache.httpcomponents.httpcore to 4.4.9.v20180409-1525</li>
- <li>Fix validation errors for all target platforms</li>
- <li>[releng] Update Oomph API baseline</li>
- <li>Update Maven plugins
- <ul>
- <li>eclipse-jarsigner-plugin 1.1.5</li>
- <li>jboss repository-utils 1.1.0</li>
- <li>maven-pmd-plugin 3.10.0</li>
- <li>maven-resources-plugin 3.1.0</li>
- <li>spotbugs-maven-plugin 3.1.3.1</li>
- </ul>
- </li>
- <li>Upgrade Tycho to 1.2.0</li>
- </ul><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Contributors.html" title="Contributors">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/5.3.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/5.3.html
deleted file mode 100644
index 92b580c61..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/5.3.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 5.3 New and Noteworthy</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">EGit 5.3 New and Noteworthy</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Contributors.html" title="Contributors">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="EGit">EGit</h1>
- <h2 id="Requires_Eclipse_Neon">Requires Eclipse Neon</h2>
- <p>EGit 5.3.0 requires Eclipse Neon (4.6) or better. If you use an older version of Eclipse, you are recommended to upgrade the complete Eclipse IDE.</p>
- <h2 id="GPG-signing_Commits">GPG-signing Commits</h2>
- <p>EGit 5.3.0 can sign commits with GPG.</p>
- <p>
- <img alt="Screenshot of the EGit Staging View with the new &quot;Sign commit&quot; icon" border="0" src="images/Egit-commit-sign.png"/>
- </p>
- <p>The new icon in the upper right will allow you to toggle commit signing on or off. The default is read from the Git configuration. If the config option <code>commit.gpgsign</code> is set to <code>true</code>, the button will be selected by default. The value of <code>user.signingkey</code> will be used to determine the signing key. If the value is unset, the email address of the committer will be used to lookup the key. If no key can be found a commit will fail.</p>
- <p>Keys will be looked up from your GPG keyring (either <code>~/.gnupg/pubring.kbx</code> or <code>~/.gnupg/secring.gpg</code>; on Windows the directory <code>%APPDATA%\gnupg</code> is used&mdash;if it exists&mdash;instead of <code>~/.gnupg</code>). </p>
- <p>See the following GitHub help pages for help on GPG signing keys:</p>
- <ul>
- <li>
- <a href="https://help.github.com/articles/generating-a-new-gpg-key/" target="egit_external">Generating a new GPG key</a>
- </li>
- <li>
- <a href="https://help.github.com/articles/telling-git-about-your-signing-key/" target="egit_external">Telling Git about your signing key</a>
- </li>
- <li>
- <a href="https://help.github.com/articles/associating-an-email-with-your-gpg-key/" target="egit_external">Associating an email with your GPG key</a>
- </li>
- </ul>
- <h2 id="SSH_Library">SSH Library</h2>
- <p>In the last release we had introduced a new SSH client based on the
- <a href="https://mina.apache.org/sshd-project/" target="egit_external">Apache MINA sshd</a> library as an alternative to the JSch-based client. In EGit 5.3.0 the default settings are switched: by default, the Apache MINA implementation is used.
- </p>
- <p>We plan to remove the old JSch SSH implementation completely in a future release of EGit.</p>
- <h2 id="Compare_and_Merge_Editors">Compare and Merge Editors</h2>
- <p>Text comparisons in Eclipse have been improved to make "Show Whitespace" work in more cases.</p>
- <p>Also, concurrent editing of a file in a merge editor and in another editor open on the same file has been improved and works now better and even for files not in the Eclipse workspace.</p>
- <p>
- <img alt="Screenshot of a Java comparison in Eclipse (workspace against index) showing whitespace on the index side" border="0" src="images/EGit_Compare_Editor_Show_Whitespace.png"/>
- </p>
- <p>Note that both showing whitespace and concurrent editing depend not only on the way EGit sets up the comparison (which is what we improved) but also on the actual editors being used. These editors are beyond the control of EGit. With files not in the Eclipse workspace, one may encounter Platform
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=214351" target="egit_external">bug 214351</a> when a file is open in another editor.
- </p>
- <h2 id="Other_Changes">Other Changes</h2>
- <p>EGit 5.3.0 includes lots of less noticeable improvements in the UI, plus a number of bug fixes. We also made a number of performance improvements. The complete list of new features and bug fixes is available in the
- <a href="https://projects.eclipse.org/projects/technology.egit/releases/5.3.0/" target="egit_external">release notes</a>.
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Contributors.html" title="Contributors">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/Updating-This-Document.html
deleted file mode 100644
index 3269d4156..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/Updating-This-Document.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 5.3 New and Noteworthy - Updating This Document</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Updating This Document</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Contributors.html" title="Contributors">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right"></td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Contributors</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top"></td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Updating_This_Document">Updating This Document</h1>
- <p> This document is maintained in a collaborative wiki. If you wish to
- update or modify this document please visit
-
- <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.3" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.3</a>
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Contributors.html" title="Contributors">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="5.3.html" title="EGit 5.3 New and Noteworthy">
- <img alt="EGit 5.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right"></td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Contributors</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top"></td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/images/EGit_Compare_Editor_Show_Whitespace.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/images/EGit_Compare_Editor_Show_Whitespace.png
deleted file mode 100644
index 8483c7074..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/images/EGit_Compare_Editor_Show_Whitespace.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/images/Egit-commit-sign.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/images/Egit-commit-sign.png
deleted file mode 100644
index 9b5fbfd4e..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/images/Egit-commit-sign.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html
new file mode 100644
index 000000000..28e3cae05
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/5.4.html
@@ -0,0 +1,86 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>EGit 5.4 New and Noteworthy</title>
+ <link type="text/css" rel="stylesheet" href="../../../book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">EGit 5.4 New and Noteworthy</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Contributors.html" title="Contributors">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributors</td>
+ </tr>
+ </table><hr class="navigation-separator"/>
+ <h1 id="EGit">EGit</h1>
+ <h2 id="SSH_Library">SSH Library</h2>
+ <p>EGit 5.4.0 can now handle
+ <i>encrypted</i> new-style OpenSSH private keys, for instance password-protected ed25519 keys, when the "Apache MINA sshd" SSH client is used. (There's a preference setting in the main EGit preference page under
+ <i>Preferences&rarr;Team&rarr;Git</i> to choose between "Apache MINA sshd" (default) and the older "JSch" library.)
+ </p>
+ <dl>
+ <dd>On Java versions older than 8u161, you may need to download and install the
+ <a href="https://www.oracle.com/technetwork/java/javase/downloads/jce-all-download-5170447.html" target="egit_external">"JCE Unlimited Strength Jurisdiction Policy Files"</a> for this to work. OpenSSH uses the AES encryption with 256bit keys, which is available in older Java only with this extension. On newer Java versions, "unlimited strength" encryption is enabled by default, so you need not do anything.
+ </dd>
+ </dl>
+ <p>We plan to remove the old JSch SSH implementation completely in a future release of EGit.</p>
+ <h2 id="Filtering_Content_from_the_Git_Repositories_View">Filtering Content from the Git Repositories View</h2>
+ <p>The Git Repositories view can now be configured to show less nodes.</p>
+ <p>
+ <img alt="Screenshot showing the &quot;Filters and Customization...&quot; entry in the view menu of the Git Repositories view" border="0" src="images/EGit_Repo_View_Filters.png"/>
+ </p>
+ <p>In the view menu of the Git Repositories view, choose the "Filters and Customization..." entry. This will open a dialog where you can choose which information should be suppressed:</p>
+ <p>
+ <img alt="Screenshot of the &quot;Filters and Customization&quot; dialog of the Git Repositories view" border="0" src="images/EGit_Repo_View_Filters_Dialog.png"/>
+ </p>
+ <p>Checked node types will
+ <i>not</i> be shown in the Git Repositories view. Note that the top repositories nodes and the local branches node cannot be hidden.
+ </p>
+ <h2 id="Checking_out_Files_from_a_Commit">Checking out Files from a Commit</h2>
+ <p>In the Git History view there is a new command in the context menu on the file list to check out the selected file versions from that commit. This can be useful to revert individual files to an earlier state, or to a state on another branch.</p>
+ <p>
+ <img alt="Screenshot of the Git History view showing the new check-out command." border="0" src="images/Check_Out_This_Version.png"/>
+ </p>
+ <p>This command is also available in the Commit Viewer (also for stashes), and in the outline view of the Commit Viewer's unified diff page. The check-out skips files deleted in that commit and submodules contained in the selection. If the check-out would overwrite uncommitted changes, such as when a file to be checked out is modified in the workspace, the user is asked to confirm overwriting.</p>
+ <h2 id="Showing_Whitespace_Characters_in_the_Diff_in_the_History_View">Showing Whitespace Characters in the Diff in the History View</h2>
+ <p>The diff viewer in the Git History view can now show whitespace characters:</p>
+ <p>
+ <img alt="Screenshot of the Git History view with the context menu on the diff viewer visible and showing whitespace characters in the diff viewer." border="0" src="images/EGit_History_Whitespace.png"/>
+ </p>
+ <p>The diff viewer is located in the bottom-left part of the view, below the commit message. When files changed in a commit are selected in the file list bottom-right, the diff viewer shows a unified diff of the changes made to those files in that commit. (For performance reasons, the diff is truncated after 10'000 lines; to see a full unified diff, open the commit in the Commit Viewer via the context menu in the commit table.)</p>
+ <p>This diff viewer has now a little context menu where the user can enable or disable showing whitespace characters.</p>
+ <h2 id="Other_Changes">Other Changes</h2>
+ <p>EGit 5.4.0 includes lots of less noticeable improvements in the UI, plus a number of bug fixes. The complete list of new features and bug fixes is available in the
+ <a href="https://projects.eclipse.org/projects/technology.egit/releases/5.4.0/" target="egit_external">release notes</a>.
+ </p><hr class="navigation-separator"/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Contributors.html" title="Contributors">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributors</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Contributors.html
index 8bbd977c0..124a61365 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.3/Contributors.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Contributors.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 5.3 New and Noteworthy - Contributors</title>
+ <title>EGit 5.4 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,57 +12,55 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="5.3.html" title="EGit 5.3 New and Noteworthy">
+ <a href="5.4.html" title="EGit 5.4 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
+ <a href="See-Also.html" title="See Also">
<img alt="Next" border="0" src="../../../images/next.gif"/>
</a>
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 5.3 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 5.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ <td style="width: 20%" align="right" valign="top">See Also</td>
</tr>
</table><hr class="navigation-separator"/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 10 developers worked on this release:</p>
- <p>Christian W. Damus,
- Frédéric Cilia,
- Gunnar Wagenknecht,
- Lars Vogel,
- Luca Andreatta,
- Matthias Becker,
+ <p>The following 8 developers worked on this release:</p>
+ <p>Alexander Nittka,
+ Andrey Loskutov,
+ Carsten Hammer,
+ George Gastaldi,
Matthias Sohn,
Michael Keppler,
- Thomas Wolf,
- Tim Neumann</p><hr class="navigation-separator"/>
+ Peter Severin,
+ Thomas Wolf</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="5.3.html" title="EGit 5.3 New and Noteworthy">
+ <a href="5.4.html" title="EGit 5.4 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="5.3.html" title="EGit 5.3 New and Noteworthy">
- <img alt="EGit 5.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="5.4.html" title="EGit 5.4 New and Noteworthy">
+ <img alt="EGit 5.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
+ <a href="See-Also.html" title="See Also">
<img alt="Next" border="0" src="../../../images/next.gif"/>
</a>
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 5.3 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 5.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ <td style="width: 20%" align="right" valign="top">See Also</td>
</tr>
</table>
</body>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/See-Also.html
index 03c3e3811..68d3dd629 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Contributors.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/See-Also.html
@@ -2,17 +2,17 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 5.1 New and Noteworthy - Contributors</title>
+ <title>EGit 5.4 New and Noteworthy - See Also</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
- <th style="width: 100%" align="center" colspan="3">Contributors</th>
+ <th style="width: 100%" align="center" colspan="3">See Also</th>
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="5.1.html" title="EGit 5.1 New and Noteworthy">
+ <a href="Contributors.html" title="Contributors">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -24,30 +24,25 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 5.1 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">Contributors</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
</tr>
</table><hr class="navigation-separator"/>
- <h1 id="Contributors">Contributors</h1>
- <p>The following 7 developers worked on this release:</p>
- <p>David Pursehouse,
- Luís Copetti,
- Mat Booth,
- Matthias Sohn,
- Max Hohenegger,
- Michael Keppler,
- Thomas Wolf</p><hr class="navigation-separator"/>
+ <h1 id="See_Also">See Also</h1>
+ <p>See also the
+ <a href="../../../JGit/New_and_Noteworthy/5.4/5.4.html" title="JGit/New_and_Noteworthy/5.4">new features in JGit</a> for additional information.
+ </p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="5.1.html" title="EGit 5.1 New and Noteworthy">
+ <a href="Contributors.html" title="Contributors">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="5.1.html" title="EGit 5.1 New and Noteworthy">
- <img alt="EGit 5.1 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="5.4.html" title="EGit 5.4 New and Noteworthy">
+ <img alt="EGit 5.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
@@ -57,7 +52,7 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 5.1 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">Contributors</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html
index e5b7ea801..1f3de396b 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.1/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>EGit 5.1 New and Noteworthy - Updating This Document</title>
+ <title>EGit 5.4 New and Noteworthy - Updating This Document</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="Contributors.html" title="Contributors">
+ <a href="See-Also.html" title="See Also">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -20,7 +20,7 @@
<td style="width: 20%" align="right"></td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">Contributors</td>
+ <td style="width: 20%" align="left" valign="top">See Also</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top"></td>
</tr>
@@ -29,24 +29,24 @@
<p> This document is maintained in a collaborative wiki. If you wish to
update or modify this document please visit
- <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.1" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.1</a>
+ <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.4" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.4</a>
</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="Contributors.html" title="Contributors">
+ <a href="See-Also.html" title="See Also">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="5.1.html" title="EGit 5.1 New and Noteworthy">
- <img alt="EGit 5.1 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="5.4.html" title="EGit 5.4 New and Noteworthy">
+ <img alt="EGit 5.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right"></td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">Contributors</td>
+ <td style="width: 20%" align="left" valign="top">See Also</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top"></td>
</tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.png
new file mode 100644
index 000000000..6722feea0
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/Check_Out_This_Version.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_History_Whitespace.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_History_Whitespace.png
new file mode 100644
index 000000000..024c7984f
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_History_Whitespace.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.png
new file mode 100644
index 000000000..731af394d
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.png
new file mode 100644
index 000000000..e06e34563
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.4/images/EGit_Repo_View_Filters_Dialog.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/5.1.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/5.1.html
deleted file mode 100644
index 96fcbfcec..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/5.1.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 5.1 New and Noteworthy</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">JGit 5.1 New and Noteworthy</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="JGit">JGit</h1>
- <h2 id="Features">Features</h2>
- <ul>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=434085" target="egit_external">bug 434085</a> Use the same default diff.renameLimit = 400 like native git
- </li>
- <li>Parse signature of GPG-signed commits</li>
- <li>Replace fetch.useminimalnegotation flag with fetch.maxhaves flag</li>
- <li>Protocol V2
- <ul>
- <li>FetchV2Request: Rename shallowSince to deepenSince</li>
- <li>Add fetch support to ProtocolV2Hook</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=534847" target="egit_external">bug 534847</a> Introduce ProtocolV2Hook
- </li>
- <li>Fetch protocol v2: Respond with shallow-info before wanted-refs</li>
- <li>Support protocol v2 want-ref in UploadPack</li>
- </ul>
- </li>
- <li>Allow overriding DfsPackDescription comparator for scanning packs</li>
- <li>Make DfsConfig public</li>
- <li>Add ls-files CLI command</li>
- <li>RepoCommand: Support remove-project node in the manifest parser</li>
- <li>RepoCommand: record remote branch, group, shallow bit by default</li>
- <li>SubmoduleAddCommand: Add API to specify the submodule name</li>
- </ul>
- <h2 id="Performance_Improvements">Performance Improvements</h2>
- <ul>
- <li>Seek references by prefix in reftable</li>
- <li>Fix a GC scalability issue when selecting commit bitmaps</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=485743" target="egit_external">bug 485743</a> Avoid expensive getAllRefsByPeeledObjectId() in PlotWalk constructor
- </li>
- </ul>
- <h2 id="Bug_Fixes">Bug Fixes</h2>
- <ul>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536318" target="egit_external">bug 536318</a> Fix replacement quoting for replaceAll in filter command
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537969" target="egit_external">bug 537969</a> Fix atomic lock file creation on NFS configured via option core.supportsAtomicCreateNewFile
- </li>
- <li>GC: Avoid logging errors when deleting non-empty folders</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538286" target="egit_external">bug 538286</a> Fix NoSuchFileException in GC.deleteTempPacksIdx()
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538285" target="egit_external">bug 538285</a> Fix NoSuchFileException during directory cleanup in RefDirectory
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529400" target="egit_external">bug 529400</a> Fix fetching with duplicate ref updates
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529314" target="egit_external">bug 529314</a> Fetch(Process): should tolerate duplicate refspecs
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538068" target="egit_external">bug 538068</a> SubmoduleDeinitTest fails on Windows
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538068" target="egit_external">bug 538068</a> FilterCommandsTest fails on Windows
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=538068" target="egit_external">bug 538068</a> ReceivePackAdvertiseRefsHookTest.testSuccess() fails on Windows
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537969" target="egit_external">bug 537969</a> Fix wrong warning message in case of lock failures
- </li>
- <li>Fix GC run in foreground to not use executor</li>
- <li>Fix unpredictable ordering of entries in .gitmodules.</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537410" target="egit_external">bug 537410</a> Fix ResolveMerger: rebase with autocrlf=true, direct checkout
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537790" target="egit_external">bug 537790</a> Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dss
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536324" target="egit_external">bug 536324</a> Abort rename detection in a timely manner if cancelled
- </li>
- <li>RepoCommand: Use project names instead of paths for the submodule name</li>
- <li>Send only 1 flush pkt at the end of v2 fetch</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=499543" target="egit_external">bug 499543</a> Fix NPE in BlameGenerator.getSourceStart()
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=537166" target="egit_external">bug 537166</a> HttpClientConnection.getHeaderFields should support multiple values for same header
- </li>
- <li>Always send refs' objects despite "filter" in pack</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536880" target="egit_external">bug 536880</a> ResolveMerger: don't try needlessly to delete directories
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=526111" target="egit_external">bug 526111</a> Ensure RacyGitTests don't raise false negatives
- </li>
- <li>GC: Trim more EWAHCompressedBitmaps to free unused memory</li>
- <li>Make Reftable seek* and has* method names more consistent</li>
- <li>Add progress monitor step to first phase of GC commit selection</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=536541" target="egit_external">bug 536541</a> Add response message, if any, on HTTP status 404
- </li>
- <li>Correctly handle initialization of shallow commits</li>
- <li>CleanCommand: don't fire WorkingTreeModifiedEvent on dry run</li>
- <li>DfsPackDescription: Disallow null PackSource</li>
- </ul>
- <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
- <ul>
- <li>Update Orbit 2018-09 to R20180905201904</li>
- <li>Update Photon orbit repository to R20180606145124</li>
- <li>Bazel: Use hyphen instead of underscore in external repository names</li>
- <li>Update bazel dependencies to match maven dependencies</li>
- <li>Update Jetty to 9.4.11.v20180605</li>
- <li>Update org.apache.commons.codec to 1.10.0.v20180409-1845</li>
- <li>Update org.apache.commons.logging to 1.2.0.v20180409-1502</li>
- <li>Update org.apache.httpcomponents.httpclient to 4.5.5.v20180409-1525</li>
- <li>Update org.apache.httpcomponents.httpcore to 4.4.9.v20180409-1525</li>
- <li>Update Maven plugins
- <ul>
- <li>build-helper-maven-plugin 3.0.0</li>
- <li>eclipse-jarsigner-plugin 1.1.5</li>
- <li>jacoco-maven-plugin 0.8.1</li>
- <li>maven-clean-plugin 3.1.0</li>
- <li>maven-compiler-plugin 3.8.0</li>
- <li>maven-jar-plugin 3.1.2</li>
- <li>maven-pmd-plugin 3.10.0</li>
- <li>maven-resources-plugin 3.1.0</li>
- <li>maven-shade-plugin 3.1.1</li>
- <li>maven-site-plugin 3.7.1</li>
- <li>maven-surefire-plugin 2.21.0</li>
- <li>maven-surefire-report-plugin 2.21.0</li>
- <li>plexus-compiler-javac 2.8.4</li>
- <li>spotbugs-maven-plugin 3.1.6</li>
- <li>wagon-ssh 3.1.0</li>
- </ul>
- </li>
- <li>Upgrade Tycho to 1.2.0</li>
- </ul>
- <h2 id="Contributors">Contributors</h2>
- <p>The following 19 contributors worked on this release:</p>
- <p>Andrey Loskutov,
- Christian Halstrick,
- Dave Borowitz,
- David Pursehouse,
- David Turner,
- Gabriel Couto,
- Gunnar Wagenknecht,
- Han-Wen Nienhuys,
- Ivan Frade,
- Jonathan Nieder,
- Jonathan Tan,
- Markus Duft,
- Masaya Suzuki,
- Matthias Sohn,
- Michael Keppler,
- Minh Thai,
- René Scheibe,
- Terry Parker,
- Thomas Wolf</p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/Updating-This-Document.html
deleted file mode 100644
index 8764aa8a2..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.1/Updating-This-Document.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 5.1 New and Noteworthy - Updating This Document</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Updating This Document</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="5.1.html" title="JGit 5.1 New and Noteworthy">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right"></td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">JGit 5.1 New and Noteworthy</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top"></td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Updating_This_Document">Updating This Document</h1>
- <p> This document is maintained in a collaborative wiki. If you wish to
- update or modify this document please visit
-
- <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.1" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.1</a>
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="5.1.html" title="JGit 5.1 New and Noteworthy">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="5.1.html" title="JGit 5.1 New and Noteworthy">
- <img alt="JGit 5.1 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right"></td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">JGit 5.1 New and Noteworthy</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top"></td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/5.3.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/5.3.html
deleted file mode 100644
index 49778223c..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/5.3.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 5.3 New and Noteworthy</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">JGit 5.3 New and Noteworthy</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Contributors.html" title="Contributors">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="JGit">JGit</h1>
- <h2 id="Features">Features</h2>
- <ul>
- <li>Expose the filter blob limit in UploadPack</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=542611" target="egit_external">bug 542611</a> Enable cloning only specific tags
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=543152" target="egit_external">bug 543152</a> SshdSessionFactory: generalize providing default keys
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=543579" target="egit_external">bug 543579</a> Allow to check for signing key
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=382212" target="egit_external">bug 382212</a> Implement signing commits using BouncyCastle
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=382212" target="egit_external">bug 382212</a> Add signing options to commit CLI
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=382212" target="egit_external">bug 382212</a> Allow CommitCommand to sign commits
- </li>
- <li>RefDatabase/Ref: Add versioning to reference database</li>
- </ul>
- <h2 id="Performance_Improvements">Performance Improvements</h2>
- <ul>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=543739" target="egit_external">bug 543739</a> Reduce contention on PackFile.idx() function.
- </li>
- <li>UploadPack: Read wanted refs in one shot</li>
- <li>Lazily open ReadableChannel in BlockBasedFile.getOrLoadBlock</li>
- <li>Lock DfsBlockCache while loading object references to avoid concurrent index loading</li>
- <li>RefDirectory: Look up several exact refs in one shot</li>
- </ul>
- <h2 id="Other_Changes">Other Changes</h2>
- <p>The complete list of new features and bug fixes is available in the
- <a href="https://projects.eclipse.org/projects/technology.jgit/releases/5.3.0/" target="egit_external">release notes</a>.
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Contributors.html" title="Contributors">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html
new file mode 100644
index 000000000..88932e0b9
--- /dev/null
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/5.4.html
@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>JGit 5.4 New and Noteworthy</title>
+ <link type="text/css" rel="stylesheet" href="../../../book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">JGit 5.4 New and Noteworthy</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Contributors.html" title="Contributors">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributors</td>
+ </tr>
+ </table><hr class="navigation-separator"/>
+ <h1 id="JGit">JGit</h1>
+ <h2 id="SSH_Library">SSH Library</h2>
+ <p>Bundle <code>org.eclipse.jgit.ssh.apache</code>, introduced in JGit 5.2.0 and implementing a new SSH session factory based on
+ <a href="https://mina.apache.org/sshd-project/" target="egit_external">Apache MINA sshd</a>, has been updated to Apache MINA sshd
+ <b>2.2.0</b>.
+ </p>
+ <p>Because of incompatible upstream interface changes, it will work only with that precise version of Apache MINA sshd.</p>
+ <p>Thanks to the update, the SSH support now also works for connections using
+ <i>encrypted</i> new-style OpenSSH private keys, for instance password-protected ed25519 keys.
+ </p>
+ <dl>
+ <dd>On Java versions older than 8u161, you may need to download and install the
+ <a href="https://www.oracle.com/technetwork/java/javase/downloads/jce-all-download-5170447.html" target="egit_external">"JCE Unlimited Strength Jurisdiction Policy Files"</a> for this to work. OpenSSH uses the AES encryption with 256bit keys, which is available in older Java only with this extension. On newer Java versions, "unlimited strength" encryption is enabled by default, so you need not do anything.
+ </dd>
+ </dl>
+ <p>To use the SSH client based on Apache MINA sshd in the JGit command-line tools, use the option <code>--ssh apache</code>. By default JGit still uses the older JSch library for SSH, which has been updated to JSch
+ <b>0.1.55</b>.
+ </p>
+ <h2 id="HTTP_Cookie_Support">HTTP Cookie Support</h2>
+ <p>JGit has learnt to handle cookies in HTTP connections. Cookie storage can be configured via the
+ <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-httpcookieFile" target="egit_external">git config settings</a> <code>http.cookieFile</code> and <code>http.saveCookies</code>. These settings can also be
+ <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-httplturlgt" target="egit_external">given per URI</a> so that different settings can be used for different servers.
+ </p>
+ <h2 id="Other_Changes">Other Changes</h2>
+ <p>The complete list of new features and bug fixes is available in the
+ <a href="https://projects.eclipse.org/projects/technology.jgit/releases/5.4.0/" target="egit_external">release notes</a>.
+ </p><hr class="navigation-separator"/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Contributors.html" title="Contributors">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributors</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/Contributors.html
index 7c2e07d5b..55ecb1391 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/Contributors.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/Contributors.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 5.3 New and Noteworthy - Contributors</title>
+ <title>JGit 5.4 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="5.3.html" title="JGit 5.3 New and Noteworthy">
+ <a href="5.4.html" title="JGit 5.4 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -24,42 +24,45 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">JGit 5.3 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 5.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
</tr>
</table><hr class="navigation-separator"/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 19 developers worked on this release:</p>
+ <p>The following 22 developers worked on this release:</p>
<p>Andre Bossert,
+ Andrey Loskutov,
+ Brandon Weeks,
+ Carsten Hammer,
Christian Halstrick,
- Dave Borowitz,
+ David Ostrovsky,
David Pursehouse,
Gunnar Wagenknecht,
+ Han-Wen Nienhuys,
Ivan Frade,
- Jackson Toeniskoetter,
Jonathan Nieder,
- Juergen Denner,
- Luca Milanesio,
- Mario Molina,
+ Jonathan Tan,
+ Konrad Windszus,
Masaya Suzuki,
+ Matthew DeVore,
Matthias Sohn,
- Medha Bhargav Prabhala,
Michael Keppler,
- Mincong HUANG,
Minh Thai,
+ Patrick Hiesel,
+ Sebastian Schuberth,
Terry Parker,
Thomas Wolf</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="5.3.html" title="JGit 5.3 New and Noteworthy">
+ <a href="5.4.html" title="JGit 5.4 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="5.3.html" title="JGit 5.3 New and Noteworthy">
- <img alt="JGit 5.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="5.4.html" title="JGit 5.4 New and Noteworthy">
+ <img alt="JGit 5.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
@@ -69,7 +72,7 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">JGit 5.3 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 5.4 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/Updating-This-Document.html
index 2eaf042c3..b26683741 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.3/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.4/Updating-This-Document.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 5.3 New and Noteworthy - Updating This Document</title>
+ <title>JGit 5.4 New and Noteworthy - Updating This Document</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -29,7 +29,7 @@
<p> This document is maintained in a collaborative wiki. If you wish to
update or modify this document please visit
- <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.3" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.3</a>
+ <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.4" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.4</a>
</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -39,8 +39,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="5.3.html" title="JGit 5.3 New and Noteworthy">
- <img alt="JGit 5.3 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="5.4.html" title="JGit 5.4 New and Noteworthy">
+ <img alt="JGit 5.4 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right"></td>
diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml
index ec9ef318b..7c1e23a7c 100644
--- a/org.eclipse.egit.doc/help/toc.xml
+++ b/org.eclipse.egit.doc/help/toc.xml
@@ -446,25 +446,26 @@
</topic>
<topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/5.3/5.3.html" label="EGit 5.3 New and Noteworthy">
- <topic href="help/EGit/New_and_Noteworthy/5.3/5.3.html" label="EGit">
- <topic href="help/EGit/New_and_Noteworthy/5.3/5.3.html#Requires_Eclipse_Neon" label="Requires Eclipse Neon"></topic>
- <topic href="help/EGit/New_and_Noteworthy/5.3/5.3.html#GPG-signing_Commits" label="GPG-signing Commits"></topic>
- <topic href="help/EGit/New_and_Noteworthy/5.3/5.3.html#SSH_Library" label="SSH Library"></topic>
- <topic href="help/EGit/New_and_Noteworthy/5.3/5.3.html#Compare_and_Merge_Editors" label="Compare and Merge Editors"></topic>
- <topic href="help/EGit/New_and_Noteworthy/5.3/5.3.html#Other_Changes" label="Other Changes"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html" label="EGit 5.4 New and Noteworthy">
+ <topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html" label="EGit">
+ <topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#SSH_Library" label="SSH Library"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#Filtering_Content_from_the_Git_Repositories_View" label="Filtering Content from the Git Repositories View"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#Checking_out_Files_from_a_Commit" label="Checking out Files from a Commit"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#Showing_Whitespace_Characters_in_the_Diff_in_the_History_View" label="Showing Whitespace Characters in the Diff in the History View"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/5.4.html#Other_Changes" label="Other Changes"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/5.3/Contributors.html" label="Contributors"></topic>
- <topic href="help/EGit/New_and_Noteworthy/5.3/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/Contributors.html" label="Contributors"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/See-Also.html" label="See Also"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.4/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/5.3/5.3.html" label="JGit 5.3 New and Noteworthy">
- <topic href="help/JGit/New_and_Noteworthy/5.3/5.3.html" label="JGit">
- <topic href="help/JGit/New_and_Noteworthy/5.3/5.3.html#Features" label="Features"></topic>
- <topic href="help/JGit/New_and_Noteworthy/5.3/5.3.html#Performance_Improvements" label="Performance Improvements"></topic>
- <topic href="help/JGit/New_and_Noteworthy/5.3/5.3.html#Other_Changes" label="Other Changes"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html" label="JGit 5.4 New and Noteworthy">
+ <topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html" label="JGit">
+ <topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html#SSH_Library" label="SSH Library"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html#HTTP_Cookie_Support" label="HTTP Cookie Support"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.4/5.4.html#Other_Changes" label="Other Changes"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/5.3/Contributors.html" label="Contributors"></topic>
- <topic href="help/JGit/New_and_Noteworthy/5.3/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.4/Contributors.html" label="Contributors"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.4/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Git for Eclipse Users">
<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Centralised version control systems"></topic>
@@ -565,6 +566,7 @@
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Use_of_the_.22final.22_modifier" label="Use of the &quot;final&quot; modifier"></topic>
</topic>
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Commit_message_guidelines" label="Commit message guidelines"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#License_Header" label="License Header"></topic>
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Copyright" label="Copyright"></topic>
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Test_before_submitting" label="Test before submitting"></topic>
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Sending_patches_by_mail" label="Sending patches by mail"></topic>
diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml
index d611eb07c..268bd545f 100644
--- a/org.eclipse.egit.doc/pom.xml
+++ b/org.eclipse.egit.doc/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.doc</artifactId>
diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml
index b1a24b96c..486d3b10d 100644
--- a/org.eclipse.egit.gitflow-feature/feature.xml
+++ b/org.eclipse.egit.gitflow-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.egit.gitflow.feature"
label="%featureName"
- version="5.4.0.qualifier"
+ version="5.4.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.egit.gitflow"
license-feature="org.eclipse.license"
@@ -26,9 +26,9 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
- <import plugin="org.eclipse.egit.core" version="5.4.0" match="equivalent"/>
- <import plugin="org.eclipse.egit.ui" version="5.4.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.4.1" match="equivalent"/>
+ <import plugin="org.eclipse.egit.core" version="5.4.1" match="equivalent"/>
+ <import plugin="org.eclipse.egit.ui" version="5.4.1" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.egit.gitflow-feature/pom.xml b/org.eclipse.egit.gitflow-feature/pom.xml
index 1d6e9e91c..4d63f6366 100644
--- a/org.eclipse.egit.gitflow-feature/pom.xml
+++ b/org.eclipse.egit.gitflow-feature/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.egit.feature</groupId>
diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
index 24cb74722..10696db8f 100644
--- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2
Bundle-Name: GitFlow Test
Automatic-Module-Name: org.eclipse.egit.gitflow.test
Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Fragment-Host: org.eclipse.egit.gitflow
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.egit.core;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.junit;version="[5.4.0,5.5.0)",
+Import-Package: org.eclipse.egit.core;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.junit;version="[5.4.1,5.5.0)",
org.hamcrest;version="[1.1.0,1.2.0)",
org.junit.rules;version="[4.12.0,5.0.0)",
org.junit;version="[4.12.0,5.0.0)"
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.egit.core.junit;bundle-version="[5.4.0,5.5.0)"
+ org.eclipse.egit.core.junit;bundle-version="[5.4.1,5.5.0)"
diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml
index 9e04f43c2..f8f233533 100644
--- a/org.eclipse.egit.gitflow.test/pom.xml
+++ b/org.eclipse.egit.gitflow.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.gitflow.test</artifactId>
diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
index 0cfb3258f..d8058f78d 100644
--- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
@@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Automatic-Module-Name: org.eclipse.egit.gitflow.ui
Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
-Import-Package: org.eclipse.egit.core;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal.job;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.op;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.project;version="[5.4.0,5.5.0)",
- org.eclipse.egit.gitflow;version="[5.4.0,5.5.0)",
- org.eclipse.egit.gitflow.op;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.actions;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.branch;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.commit;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.expressions;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.rebase;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.repository.tree;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.selection;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.annotations;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.lib;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revplot;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.util;version="[5.4.0,5.5.0)"
+Import-Package: org.eclipse.egit.core;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal.job;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.op;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.project;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.gitflow;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.gitflow.op;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.actions;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.branch;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.commit;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.expressions;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.rebase;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.repository.tree;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.selection;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.annotations;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.lib;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revplot;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.util;version="[5.4.1,5.5.0)"
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)",
@@ -41,12 +41,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)",
org.eclipse.core.databinding.beans;bundle-version="[1.3.100,2.0.0)",
org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)"
-Export-Package: org.eclipse.egit.gitflow.ui;version="5.4.0";x-friends:="org.eclipse.egit.ui.test",
- org.eclipse.egit.gitflow.ui.internal;version="5.4.0";x-friends:="org.eclipse.egit.ui.test",
- org.eclipse.egit.gitflow.ui.internal.actions;version="5.4.0";x-friends:="org.eclipse.egit.ui.test",
- org.eclipse.egit.gitflow.ui.internal.decorators;version="5.4.0";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.dialogs;version="5.4.0";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.factories;version="5.4.0";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.menu;version="5.4.0";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.properties;version="5.4.0";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.validation;version="5.4.0";x-internal:=true
+Export-Package: org.eclipse.egit.gitflow.ui;version="5.4.1";x-friends:="org.eclipse.egit.ui.test",
+ org.eclipse.egit.gitflow.ui.internal;version="5.4.1";x-friends:="org.eclipse.egit.ui.test",
+ org.eclipse.egit.gitflow.ui.internal.actions;version="5.4.1";x-friends:="org.eclipse.egit.ui.test",
+ org.eclipse.egit.gitflow.ui.internal.decorators;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.dialogs;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.factories;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.menu;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.properties;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.validation;version="5.4.1";x-internal:=true
diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml
index 4a880265a..8575b0c44 100644
--- a/org.eclipse.egit.gitflow.ui/pom.xml
+++ b/org.eclipse.egit.gitflow.ui/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.gitflow.ui</artifactId>
diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF
index 099ae3743..52708cb09 100644
--- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF
@@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Automatic-Module-Name: org.eclipse.egit.gitflow
Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Activator: org.eclipse.egit.gitflow.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)"
-Export-Package: org.eclipse.egit.gitflow;version="5.4.0";
+Export-Package: org.eclipse.egit.gitflow;version="5.4.1";
uses:="org.osgi.framework,
org.eclipse.jgit.transport,
org.eclipse.core.runtime,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk",
org.eclipse.egit.gitflow.internal;x-internal:=true,
- org.eclipse.egit.gitflow.op;version="5.4.0";
+ org.eclipse.egit.gitflow.op;version="5.4.1";
uses:="org.eclipse.jgit.transport,
org.eclipse.core.runtime.jobs,
org.eclipse.core.runtime,
@@ -26,13 +26,13 @@ Export-Package: org.eclipse.egit.gitflow;version="5.4.0";
org.eclipse.jgit.revwalk,
org.eclipse.jgit.lib,
org.eclipse.egit.core.op"
-Import-Package: org.eclipse.egit.core.internal.job;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.op;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.annotations;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.lib;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.transport;version="[5.4.0,5.5.0)"
+Import-Package: org.eclipse.egit.core.internal.job;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.op;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.annotations;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.lib;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.transport;version="[5.4.1,5.5.0)"
diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml
index 230942e10..c92ae82ce 100644
--- a/org.eclipse.egit.gitflow/pom.xml
+++ b/org.eclipse.egit.gitflow/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.gitflow</artifactId>
diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml
index ce0387a65..47d7c4257 100644
--- a/org.eclipse.egit.mylyn-feature/feature.xml
+++ b/org.eclipse.egit.mylyn-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.egit.mylyn"
label="%featureName"
- version="5.4.0.qualifier"
+ version="5.4.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.egit"
license-feature="org.eclipse.license"
@@ -26,7 +26,7 @@
</url>
<requires>
- <import feature="org.eclipse.egit" version="5.4.0" match="equivalent"/>
+ <import feature="org.eclipse.egit" version="5.4.1" match="equivalent"/>
<import feature="org.eclipse.mylyn.team_feature" version="3.20.0" match="greaterOrEqual"/>
</requires>
diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml
index 5b3717758..edc1ab810 100644
--- a/org.eclipse.egit.mylyn-feature/pom.xml
+++ b/org.eclipse.egit.mylyn-feature/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.egit.feature</groupId>
diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF
index c2ec78579..4051edcc7 100644
--- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Git Team Provider Mylyn UI Test Fragment
Automatic-Module-Name: org.eclipse.egit.mylyn.ui.test
Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Fragment-Host: org.eclipse.egit.mylyn.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse.org
diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml
index bd66e1e42..18645ec21 100644
--- a/org.eclipse.egit.mylyn.ui.test/pom.xml
+++ b/org.eclipse.egit.mylyn.ui.test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.mylyn.ui.test</artifactId>
diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF
index 544955186..c8b89ad5e 100644
--- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.egit.mylyn.ui
Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
@@ -19,16 +19,16 @@ Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Export-Package: org.eclipse.egit.internal.mylyn.ui;version="5.4.0";x-friends:="org.eclipse.egit.ui.test",
- org.eclipse.egit.internal.mylyn.ui.commit;version="5.4.0";x-internal:=true
-Import-Package: org.eclipse.egit.core;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.synchronize;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.commit;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.staging;version="[5.4.0,5.5.0)",
- org.eclipse.egit.ui.internal.synchronize.model;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.lib;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.transport;version="[5.4.0,5.5.0)",
+Export-Package: org.eclipse.egit.internal.mylyn.ui;version="5.4.1";x-friends:="org.eclipse.egit.ui.test",
+ org.eclipse.egit.internal.mylyn.ui.commit;version="5.4.1";x-internal:=true
+Import-Package: org.eclipse.egit.core;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.synchronize;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.commit;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.staging;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.ui.internal.synchronize.model;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.lib;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.transport;version="[5.4.1,5.5.0)",
org.eclipse.ui.plugin;bundle-version="[3.108.0,4.0.0)"
diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml
index 6daf6c9f4..4d7156065 100644
--- a/org.eclipse.egit.mylyn.ui/pom.xml
+++ b/org.eclipse.egit.mylyn.ui/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.mylyn.ui</artifactId>
diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml
index 53541f034..1eb0e037c 100644
--- a/org.eclipse.egit.repository/pom.xml
+++ b/org.eclipse.egit.repository/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.repository</artifactId>
diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml
index eaa74c361..2ee0d18f0 100644
--- a/org.eclipse.egit.source-feature/feature.xml
+++ b/org.eclipse.egit.source-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.egit.source"
label="%featureName"
- version="5.4.0.qualifier"
+ version="5.4.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.egit"
license-feature="org.eclipse.license"
@@ -26,7 +26,7 @@
</url>
<requires>
- <import feature="org.eclipse.egit" version="5.4.0" match="equivalent"/>
+ <import feature="org.eclipse.egit" version="5.4.1" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml
index 2f66ee1c0..e2cefa482 100644
--- a/org.eclipse.egit.source-feature/pom.xml
+++ b/org.eclipse.egit.source-feature/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.egit.feature</groupId>
diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml
index d8373b4f6..10ba52338 100644
--- a/org.eclipse.egit.target/pom.xml
+++ b/org.eclipse.egit.target/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
index 7ef8536b4..e0af193c6 100644
--- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org
Automatic-Module-Name: org.eclipse.egit.ui.test
Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true
Fragment-Host: org.eclipse.egit.ui
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
@@ -15,24 +15,24 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.8.100,4.0.0)",
- org.eclipse.egit.core.junit;bundle-version="[5.4.0,5.5.0)"
+ org.eclipse.egit.core.junit;bundle-version="[5.4.1,5.5.0)"
Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.egit.gitflow;version="[5.4.0,5.5.0)",
- org.eclipse.egit.gitflow.op;version="[5.4.0,5.5.0)",
- org.eclipse.egit.gitflow.ui;version="[5.4.0,5.5.0)",
- org.eclipse.egit.gitflow.ui.internal;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.attributes;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.junit;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.junit.http;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.lib;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.storage.file;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.transport;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.transport.resolver;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.util;version="[5.4.0,5.5.0)",
+ org.eclipse.egit.gitflow;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.gitflow.op;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.gitflow.ui;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.gitflow.ui.internal;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.attributes;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.junit;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.junit.http;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.lib;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.storage.file;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.transport;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.util;version="[5.4.1,5.5.0)",
org.eclipse.swt.widgets,
org.eclipse.swtbot.eclipse.finder,
org.eclipse.swtbot.eclipse.finder.waits,
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 196a6c48c..d25bd614c 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.ui.test</artifactId>
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
index 55f879e32..b89545192 100644
--- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Automatic-Module-Name: org.eclipse.egit.ui
Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Bundle-Activator: org.eclipse.egit.ui.Activator
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
@@ -31,92 +31,92 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.ui.views;bundle-version="[3.8.100,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.egit.core;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.attributes;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal.gerrit;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal.indexdiff;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal.job;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal.rebase;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal.storage;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.internal.util;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.op;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.project;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.securestorage;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.synchronize;version="[5.4.0,5.5.0)",
- org.eclipse.egit.core.synchronize.dto;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.annotations;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.api.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.attributes;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.blame;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.diff;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.dircache;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.errors;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.events;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.lib;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.merge;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.notes;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revplot;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.storage.file;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.submodule;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.transport;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.treewalk;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.util;version="[5.4.0,5.5.0)",
- org.eclipse.jgit.util.io;version="[5.4.0,5.5.0)"
-Export-Package: org.eclipse.egit.ui;version="5.4.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal;version="5.4.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.actions;version="5.4.0";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.blame;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.branch;version="5.4.0";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.clean;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.clone;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.commands;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.commands.shared;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.commit;version="5.4.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.commit.command;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.components;version="5.4.0";x-friends:="org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.credentials;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.decorators;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.dialogs;version="5.4.0";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.expressions;version="5.4.0";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.factories;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.fetch;version="5.4.0";x-friends:="org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.gerrit;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.handler;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.history;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.history.command;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.importing;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.jobs;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.merge;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.operations;version="5.4.0";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.patch;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.preferences;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.provisional.wizards;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.pull;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.push;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.rebase;version="5.4.0";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.reflog;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.reflog.command;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.repository;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.repository.tree;version="5.4.0";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.repository.tree.command;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.repository.tree.filter;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.resources;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.revision;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.search;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.selection;version="5.4.0";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.sharing;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.staging;version="5.4.0";x-friends:="org.eclipse.egit.mylyn.ui",
- org.eclipse.egit.ui.internal.stash;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.submodule;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize.action;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize.compare;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize.mapping;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize.model;version="5.4.0";x-friends:="org.eclipse.egit.mylyn.ui",
- org.eclipse.egit.ui.internal.trace;version="5.4.0";x-internal:=true,
- org.eclipse.egit.ui.internal.variables;version="5.4.0";x-internal:=true
+Import-Package: org.eclipse.egit.core;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.attributes;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal.gerrit;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal.indexdiff;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal.job;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal.rebase;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal.storage;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.internal.util;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.op;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.project;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.securestorage;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.synchronize;version="[5.4.1,5.5.0)",
+ org.eclipse.egit.core.synchronize.dto;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.annotations;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.api.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.attributes;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.blame;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.diff;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.dircache;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.errors;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.events;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.lib;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.merge;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.notes;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revplot;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.storage.file;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.submodule;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.transport;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.treewalk;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.util;version="[5.4.1,5.5.0)",
+ org.eclipse.jgit.util.io;version="[5.4.1,5.5.0)"
+Export-Package: org.eclipse.egit.ui;version="5.4.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal;version="5.4.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.actions;version="5.4.1";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.blame;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.branch;version="5.4.1";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.clean;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.clone;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.commands;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.commands.shared;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.commit;version="5.4.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.commit.command;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.components;version="5.4.1";x-friends:="org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.credentials;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.decorators;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.dialogs;version="5.4.1";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.expressions;version="5.4.1";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.factories;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.fetch;version="5.4.1";x-friends:="org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.gerrit;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.handler;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.history;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.history.command;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.importing;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.jobs;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.merge;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.operations;version="5.4.1";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.patch;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.preferences;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.provisional.wizards;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.pull;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.push;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.rebase;version="5.4.1";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.reflog;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.reflog.command;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.repository;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.repository.tree;version="5.4.1";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.repository.tree.command;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.repository.tree.filter;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.resources;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.revision;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.search;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.selection;version="5.4.1";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.sharing;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.staging;version="5.4.1";x-friends:="org.eclipse.egit.mylyn.ui",
+ org.eclipse.egit.ui.internal.stash;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.submodule;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize.action;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize.compare;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize.mapping;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize.model;version="5.4.1";x-friends:="org.eclipse.egit.mylyn.ui",
+ org.eclipse.egit.ui.internal.trace;version="5.4.1";x-internal:=true,
+ org.eclipse.egit.ui.internal.variables;version="5.4.1";x-internal:=true
diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml
index 2cd3ce0db..6c9ceb867 100644
--- a/org.eclipse.egit.ui/pom.xml
+++ b/org.eclipse.egit.ui/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit.ui</artifactId>
diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF
index 81b643762..3834f4873 100644
--- a/org.eclipse.egit/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.egit;singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.4.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml
index ed6a1bc99..3e4331048 100644
--- a/org.eclipse.egit/pom.xml
+++ b/org.eclipse.egit/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.egit</artifactId>
diff --git a/pom.xml b/pom.xml
index a1750fecc..8847799c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.eclipse.egit</groupId>
<artifactId>egit-parent</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>5.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>EGit Parent</name>
@@ -60,7 +60,7 @@
</licenses>
<properties>
- <egit-version>5.4.0-SNAPSHOT</egit-version>
+ <egit-version>5.4.1-SNAPSHOT</egit-version>
<tycho-version>1.4.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<jboss-tycho-plugins-version>1.3.0</jboss-tycho-plugins-version>

Back to the top