From 28553c189c0561b41d31567256cb320c05075d47 Mon Sep 17 00:00:00 2001 From: Adrien Bustany Date: Thu, 22 Aug 2019 17:11:45 +0200 Subject: [PATCH 1/4] Fix copy-paste typo in CloneCommand#cleanup deleteChildren was called on directory instead of gitDir, leading to a potential null pointer exception if the git directory existed initially. Bug: 550340 Change-Id: Iafc3b2961253a99862a59e81c7371f7bc564b412 Signed-off-by: Adrien Bustany --- org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java index 5c06bac1f..eee3da6f6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java @@ -700,7 +700,7 @@ public class CloneCommand extends TransportCommand { FileUtils.delete(gitDir, FileUtils.RECURSIVE | FileUtils.SKIP_MISSING | FileUtils.IGNORE_ERRORS); } else { - deleteChildren(directory); + deleteChildren(gitDir); } } } catch (IOException e) { From d67fe3891553292d1496f5f056b7e6a8ffabee87 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 22 Aug 2019 10:23:50 +0200 Subject: [PATCH 2/4] Use AtomicReferences to cache user and system level configs This ensures that only one instance of user and one instance of system config is set. Change-Id: Idd00150f91d2d40af79499dd7bf8ad5940f87c4e Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/util/SystemReader.java | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index d554562a7..310bc83a6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -56,6 +56,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Locale; import java.util.TimeZone; +import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.CorruptObjectException; @@ -97,9 +98,9 @@ public abstract class SystemReader { private static class Default extends SystemReader { private volatile String hostname; - private volatile FileBasedConfig systemConfig; + private AtomicReference systemConfig = new AtomicReference<>(); - private volatile FileBasedConfig userConfig; + private volatile AtomicReference userConfig = new AtomicReference<>(); @Override public String getenv(String variable) { @@ -113,10 +114,13 @@ public abstract class SystemReader { @Override public FileBasedConfig openSystemConfig(Config parent, FS fs) { - if (systemConfig == null) { - systemConfig = createSystemConfig(parent, fs); + FileBasedConfig c = systemConfig.get(); + if (c == null) { + systemConfig.compareAndSet(null, + createSystemConfig(parent, fs)); + c = systemConfig.get(); } - return systemConfig; + return c; } protected FileBasedConfig createSystemConfig(Config parent, FS fs) { @@ -142,40 +146,35 @@ public abstract class SystemReader { @Override public FileBasedConfig openUserConfig(Config parent, FS fs) { - if (userConfig == null) { - File home = fs.userHome(); - userConfig = new FileBasedConfig(parent, - new File(home, ".gitconfig"), fs); //$NON-NLS-1$ + FileBasedConfig c = userConfig.get(); + if (c == null) { + userConfig.compareAndSet(null, new FileBasedConfig(parent, + new File(fs.userHome(), ".gitconfig"), fs)); //$NON-NLS-1$ + c = userConfig.get(); } - return userConfig; + return c; } @Override public StoredConfig getSystemConfig() throws IOException, ConfigInvalidException { - if (systemConfig == null) { - systemConfig = createSystemConfig(null, FS.DETECTED); - } - if (systemConfig.isOutdated()) { + FileBasedConfig c = openSystemConfig(null, FS.DETECTED); + if (c.isOutdated()) { LOG.debug("loading system config {}", systemConfig); //$NON-NLS-1$ - systemConfig.load(); + c.load(); } - return systemConfig; + return c; } @Override public StoredConfig getUserConfig() throws IOException, ConfigInvalidException { - if (userConfig == null) { - userConfig = openUserConfig(getSystemConfig(), FS.DETECTED); - } else { - getSystemConfig(); - } - if (userConfig.isOutdated()) { + FileBasedConfig c = openUserConfig(getSystemConfig(), FS.DETECTED); + if (c.isOutdated()) { LOG.debug("loading user config {}", userConfig); //$NON-NLS-1$ - userConfig.load(); + c.load(); } - return userConfig; + return c; } @Override From 1c44bf8cafd024e74d7ba85e792dec94be2c49d6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 23 Aug 2019 12:52:08 +0200 Subject: [PATCH 3/4] JGit v5.1.10.201908230655-r Change-Id: I68d15ebd6054bdeaf62e14cddb87724828db7943 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 56 files changed, 59 insertions(+), 59 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7fcb79c68..b483131c8 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 9b8a04b4d..60b26e82e 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 1a3f807a5..0c2b1c2ae 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index d13b32576..182439dd1 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 76def3f31..5ab519e4c 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index ca8f3c944..af44753ec 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.10.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.1.10.qualifier";roots="." +Bundle-Version: 5.1.10.201908230655-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.1.10.201908230655-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index ff584f151..d4ce3c2be 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 2d7b302fc..0078e893b 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 5141ffd90..7ab1f61a2 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 8ba4f4050..152df56bd 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.http.server;version="5.1.10", diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index df06f1133..27aeac734 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 02567b90e..3a189e7ac 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 42fc642bb..3218ba343 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 50ad0a5b6..948f80ecc 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c8c2735cb..6d89a61f7 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 55ac3b92e..b3a1ad37a 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 62a085990..bdc643a57 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 94fb5799d..df31b079e 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index f421ed161..0781a4876 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index b1d732b0f..b3dbffb96 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.lfs.server;version="5.1.10"; diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index dd382fb04..cfd52bddb 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 38887b84c..e0fa3d13e 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 7b9b63afa..10fac751e 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f9ee5314c..ebbf46c09 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.lfs;version="5.1.10", diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 528e532e0..5d1e8484a 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index a9c803ba3..49dd7492a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index bdb401edd..25f70eec6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 01ade1def..12c68e5eb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 50a355b57..eb93115e3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 82661c122..496c5824e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index c93794e80..c5e5d6a59 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 456f67dab..7676d7e9d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index fd0f0bc7e..c8dd7518d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 41e716e18..41d254094 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index bd0faaea6..cbd2a8c3d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 4b894b698..e86928081 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index 3fb72c8ec..a1f4f610d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 5d4b6b5d9..b5775e994 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 18f22497e..55e2f69da 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index a3e7e3eaa..87ff2cc25 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 0353e1198..59b116906 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 70a95d110..9a3411601 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 55e69aac1..3f86cb78d 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 7d4f52699..00dbe62ee 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f4b6604b6..f5357dc23 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index a08567f0a..f42e8412a 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 7471345d5..849039bdf 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.10.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.1.10.qualifier";roots="." +Bundle-Version: 5.1.10.201908230655-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.1.10.201908230655-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index e812c7912..5bf87046e 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 1583f2ce0..f50458c90 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 6a49e838b..4dfc711de 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index f5ee5686b..c52ec2068 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.awtui;version="5.1.10" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 2fc5b2366..67d957b3f 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 9ef9325d4..f76950fa8 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.1.10.qualifier +Bundle-Version: 5.1.10.201908230655-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 00aa3804c..d008c777f 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.10.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.1.10.qualifier";roots="." +Bundle-Version: 5.1.10.201908230655-r +Eclipse-SourceBundle: org.eclipse.jgit;version="5.1.10.201908230655-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index a04ff6978..6f0183334 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 0ac68a7f7..db7f7ec12 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.1.10-SNAPSHOT + 5.1.10.201908230655-r JGit - Parent ${jgit-url} From 418722df34ca007362e23be60ef57dbe6f1d1b7a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 23 Aug 2019 15:47:03 +0200 Subject: [PATCH 4/4] Prepare 5.1.11-SNAPSHOT builds Change-Id: I8608580424d0e523dcace63f83ae530ba78dbb15 Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 14 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 26 ++--- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 36 +++---- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 ++++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../.settings/.api_filters | 2 +- .../META-INF/MANIFEST.MF | 32 +++---- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 24 ++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/.settings/.api_filters | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 46 ++++----- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 6 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 86 ++++++++--------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 96 +++++++++---------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/.settings/.api_filters | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 92 +++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 59 files changed, 362 insertions(+), 362 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index b483131c8..13fb43a91 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -4,13 +4,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", + org.eclipse.jgit.ant.tasks;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 60b26e82e..d1374e55c 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 0c2b1c2ae..1acbebd13 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)" + org.eclipse.jgit.storage.file;version="[5.1.11,5.2.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="5.1.10"; +Export-Package: org.eclipse.jgit.ant.tasks;version="5.1.11"; uses:="org.apache.tools.ant.types,org.apache.tools.ant" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 182439dd1..24fc316ea 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 5ab519e4c..5bc5291c4 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,15 +13,15 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", + org.eclipse.jgit.api;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="5.1.10"; +Export-Package: org.eclipse.jgit.archive;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index af44753ec..2eeebd814 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.10.201908230655-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.1.10.201908230655-r";roots="." +Bundle-Version: 5.1.11.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.1.11.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index d4ce3c2be..93ca0dd68 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 0078e893b..829761875 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -23,10 +23,10 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.client;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.3.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="5.1.10"; + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="5.1.11"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7ab1f61a2..02daded1b 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 152df56bd..5a662459a 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="5.1.10", - org.eclipse.jgit.http.server.glue;version="5.1.10"; +Export-Package: org.eclipse.jgit.http.server;version="5.1.11", + org.eclipse.jgit.http.server.glue;version="5.1.11"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="5.1.10"; + org.eclipse.jgit.http.server.resolver;version="5.1.11"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,12 +18,12 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)" + org.eclipse.jgit.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 27aeac734..4bf1e664c 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 3a189e7ac..c2e7c7e92 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,25 +28,25 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.http.server;version="[5.1.10,5.2.0)", - org.eclipse.jgit.http.server.glue;version="[5.1.10,5.2.0)", - org.eclipse.jgit.http.server.resolver;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit.http;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.http.apache;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.http.server;version="[5.1.11,5.2.0)", + org.eclipse.jgit.http.server.glue;version="[5.1.11,5.2.0)", + org.eclipse.jgit.http.server.resolver;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit.http;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.http.apache;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 3218ba343..230f7e26b 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 948f80ecc..8da6c7a86 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -22,16 +22,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.http.server;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.10,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.http.server;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.11,5.2.0)", org.junit;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="5.1.10"; +Export-Package: org.eclipse.jgit.junit.http;version="5.1.11"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 6d89a61f7..c57cdfa35 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index b3a1ad37a..ae9d8e65b 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.1.10,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.10,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util.time;version="[5.1.10,5.2.0)", +Import-Package: org.eclipse.jgit.api;version="[5.1.11,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.11,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util.time;version="[5.1.11,5.2.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners.model;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="5.1.10"; +Export-Package: org.eclipse.jgit.junit;version="5.1.11"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -36,4 +36,4 @@ Export-Package: org.eclipse.jgit.junit;version="5.1.10"; org.eclipse.jgit.util, org.eclipse.jgit.storage.file, org.eclipse.jgit.api", - org.eclipse.jgit.junit.time;version="5.1.10" + org.eclipse.jgit.junit.time;version="5.1.11" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index bdc643a57..aec7b1507 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index df31b079e..1a60ddcb4 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,24 +28,24 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.1.10,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit.http;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.server;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.test;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", + org.eclipse.jgit.api;version="[5.1.11,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit.http;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.server;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.test;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 0781a4876..d43f4c505 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/.settings/.api_filters b/org.eclipse.jgit.lfs.server/.settings/.api_filters index 93f255efd..adf3b1762 100644 --- a/org.eclipse.jgit.lfs.server/.settings/.api_filters +++ b/org.eclipse.jgit.lfs.server/.settings/.api_filters @@ -3,7 +3,7 @@ - + diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index b3dbffb96..6bfc6b885 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs.server;version="5.1.10"; +Export-Package: org.eclipse.jgit.lfs.server;version="5.1.11"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="5.1.10"; + org.eclipse.jgit.lfs.server.fs;version="5.1.11"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="5.1.10";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.1.10"; + org.eclipse.jgit.lfs.server.internal;version="5.1.11";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="5.1.11"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.http;version="[3.1.0,4.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.internal;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.http.apache;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", + org.eclipse.jgit.annotations;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.internal;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.http.apache;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index cfd52bddb..34c9c0ae0 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index e0fa3d13e..f698e063c 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,23 +3,23 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", +Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="5.1.10";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="5.1.11";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 10fac751e..566c2dfc4 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/.settings/.api_filters b/org.eclipse.jgit.lfs/.settings/.api_filters index 117bfb7ec..6c814a2b6 100644 --- a/org.eclipse.jgit.lfs/.settings/.api_filters +++ b/org.eclipse.jgit.lfs/.settings/.api_filters @@ -3,7 +3,7 @@ - + diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index ebbf46c09..dc331030a 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs;version="5.1.10", - org.eclipse.jgit.lfs.errors;version="5.1.10", - org.eclipse.jgit.lfs.internal;version="5.1.10";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.1.10" +Export-Package: org.eclipse.jgit.lfs;version="5.1.11", + org.eclipse.jgit.lfs.errors;version="5.1.11", + org.eclipse.jgit.lfs.internal;version="5.1.11";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="5.1.11" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", org.apache.http.impl.client;version="[4.2.6,5.0.0)", org.apache.http.impl.conn;version="[4.2.6,5.0.0)", - org.eclipse.jgit.annotations;version="[5.1.10,5.2.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.10,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.10,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.hooks;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.pack;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.10,5.2.0)" + org.eclipse.jgit.annotations;version="[5.1.11,5.2.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.attributes;version="[5.1.11,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.11,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.hooks;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.pack;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.11,5.2.0)" diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 5d1e8484a..bdf91ec4c 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 49dd7492a..e8b9fcec8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 25f70eec6..814925aa8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 12c68e5eb..7715f6e9b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index eb93115e3..ad5891eaf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 496c5824e..62e169147 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index c5e5d6a59..b32c7e25b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 7676d7e9d..30405a30f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index c8dd7518d..c420ecaa5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 41d254094..d275d0ac8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -31,8 +31,8 @@ version="0.0.0"/> - - + + org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index e86928081..970ac17e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index a1f4f610d..5d895065a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index b5775e994..4903b3bca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 55e2f69da..e3e28a57d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 87ff2cc25..6cea04ed9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 59b116906..d54f24702 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 9a3411601..c13677fa5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 3f86cb78d..81cdde069 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 00dbe62ee..f1c17665a 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.1.10,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.10,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="5.1.10", - org.eclipse.jgit.junit;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.10,5.2.0)", - org.eclipse.jgit.pgm;version="[5.1.10,5.2.0)", - org.eclipse.jgit.pgm.internal;version="[5.1.10,5.2.0)", - org.eclipse.jgit.pgm.opt;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.10,5.2.0)", +Import-Package: org.eclipse.jgit.api;version="[5.1.11,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.11,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="5.1.11", + org.eclipse.jgit.junit;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.11,5.2.0)", + org.eclipse.jgit.pgm;version="[5.1.11,5.2.0)", + org.eclipse.jgit.pgm.internal;version="[5.1.11,5.2.0)", + org.eclipse.jgit.pgm.opt;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.11,5.2.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f5357dc23..40c0c4ada 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index f42e8412a..4738a3741 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -28,49 +28,49 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.1.10,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.archive;version="[5.1.10,5.2.0)", - org.eclipse.jgit.awtui;version="[5.1.10,5.2.0)", - org.eclipse.jgit.blame;version="[5.1.10,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.10,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.10,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.gitrepo;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.ketch;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.io;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.reftree;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.server;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs.server.s3;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.10,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.notes;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revplot;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk.filter;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.pack;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.http.apache;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.10,5.2.0)", + org.eclipse.jgit.api;version="[5.1.11,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.archive;version="[5.1.11,5.2.0)", + org.eclipse.jgit.awtui;version="[5.1.11,5.2.0)", + org.eclipse.jgit.blame;version="[5.1.11,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.11,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.11,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.gitrepo;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.ketch;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.io;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.reftree;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.server;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs.server.s3;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.11,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.notes;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revplot;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk.filter;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.pack;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.http.apache;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.11,5.2.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="5.1.10"; +Export-Package: org.eclipse.jgit.console;version="5.1.11"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="5.1.10"; + org.eclipse.jgit.pgm;version="5.1.11"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -81,11 +81,11 @@ Export-Package: org.eclipse.jgit.console;version="5.1.10"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="5.1.10"; + org.eclipse.jgit.pgm.debug;version="5.1.11"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="5.1.10";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="5.1.10"; + org.eclipse.jgit.pgm.internal;version="5.1.11";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.kohsuke.args4j.spi, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 849039bdf..8fb03e1ff 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.10.201908230655-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.1.10.201908230655-r";roots="." +Bundle-Version: 5.1.11.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.1.11.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 5bf87046e..8c68a6d4b 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index f50458c90..71a6fc199 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -17,53 +17,53 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.bzip2;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", - org.eclipse.jgit.api;version="[5.1.10,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.archive;version="[5.1.10,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.10,5.2.0)", - org.eclipse.jgit.awtui;version="[5.1.10,5.2.0)", - org.eclipse.jgit.blame;version="[5.1.10,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.10,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.10,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.events;version="[5.1.10,5.2.0)", - org.eclipse.jgit.fnmatch;version="[5.1.10,5.2.0)", - org.eclipse.jgit.gitrepo;version="[5.1.10,5.2.0)", - org.eclipse.jgit.hooks;version="[5.1.10,5.2.0)", - org.eclipse.jgit.ignore;version="[5.1.10,5.2.0)", - org.eclipse.jgit.ignore.internal;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.fsck;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.io;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.1.10,5.2.0)", - org.eclipse.jgit.internal.storage.reftree;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.10,5.2.0)", - org.eclipse.jgit.junit.time;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.10,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.notes;version="[5.1.10,5.2.0)", - org.eclipse.jgit.patch;version="[5.1.10,5.2.0)", - org.eclipse.jgit.pgm;version="[5.1.10,5.2.0)", - org.eclipse.jgit.pgm.internal;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revplot;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk.filter;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.10,5.2.0)", - org.eclipse.jgit.storage.pack;version="[5.1.10,5.2.0)", - org.eclipse.jgit.submodule;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util.sha1;version="[5.1.10,5.2.0)", + org.eclipse.jgit.api;version="[5.1.11,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.archive;version="[5.1.11,5.2.0)", + org.eclipse.jgit.attributes;version="[5.1.11,5.2.0)", + org.eclipse.jgit.awtui;version="[5.1.11,5.2.0)", + org.eclipse.jgit.blame;version="[5.1.11,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.11,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.11,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.events;version="[5.1.11,5.2.0)", + org.eclipse.jgit.fnmatch;version="[5.1.11,5.2.0)", + org.eclipse.jgit.gitrepo;version="[5.1.11,5.2.0)", + org.eclipse.jgit.hooks;version="[5.1.11,5.2.0)", + org.eclipse.jgit.ignore;version="[5.1.11,5.2.0)", + org.eclipse.jgit.ignore.internal;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.fsck;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.io;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.1.11,5.2.0)", + org.eclipse.jgit.internal.storage.reftree;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.11,5.2.0)", + org.eclipse.jgit.junit.time;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.11,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.notes;version="[5.1.11,5.2.0)", + org.eclipse.jgit.patch;version="[5.1.11,5.2.0)", + org.eclipse.jgit.pgm;version="[5.1.11,5.2.0)", + org.eclipse.jgit.pgm.internal;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revplot;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk.filter;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.11,5.2.0)", + org.eclipse.jgit.storage.pack;version="[5.1.11,5.2.0)", + org.eclipse.jgit.submodule;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util.sha1;version="[5.1.11,5.2.0)", org.junit;version="[4.12,5.0.0)", org.junit.experimental.theories;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 4dfc711de..c3bb16e5b 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index c52ec2068..19fbd3d74 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="5.1.10" -Import-Package: org.eclipse.jgit.errors;version="[5.1.10,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.10,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revplot;version="[5.1.10,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.10,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.10,5.2.0)", - org.eclipse.jgit.util;version="[5.1.10,5.2.0)" +Export-Package: org.eclipse.jgit.awtui;version="5.1.11" +Import-Package: org.eclipse.jgit.errors;version="[5.1.11,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.11,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revplot;version="[5.1.11,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.11,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.11,5.2.0)", + org.eclipse.jgit.util;version="[5.1.11,5.2.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 67d957b3f..bdbfe546e 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 485da36ba..bffd5c4c0 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -3,7 +3,7 @@ - + diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index f76950fa8..507a9f827 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.1.10.201908230655-r +Bundle-Version: 5.1.11.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.annotations;version="5.1.10", - org.eclipse.jgit.api;version="5.1.10"; +Export-Package: org.eclipse.jgit.annotations;version="5.1.11", + org.eclipse.jgit.api;version="5.1.11"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -22,52 +22,52 @@ Export-Package: org.eclipse.jgit.annotations;version="5.1.10", org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="5.1.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="5.1.10", - org.eclipse.jgit.blame;version="5.1.10"; + org.eclipse.jgit.api.errors;version="5.1.11";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", + org.eclipse.jgit.attributes;version="5.1.11", + org.eclipse.jgit.blame;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="5.1.10"; + org.eclipse.jgit.diff;version="5.1.11"; uses:="org.eclipse.jgit.patch, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="5.1.10"; + org.eclipse.jgit.dircache;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events, org.eclipse.jgit.attributes", - org.eclipse.jgit.errors;version="5.1.10"; + org.eclipse.jgit.errors;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="5.1.10";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="5.1.10", - org.eclipse.jgit.gitrepo;version="5.1.10"; + org.eclipse.jgit.events;version="5.1.11";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.fnmatch;version="5.1.11", + org.eclipse.jgit.gitrepo;version="5.1.11"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax.helpers, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="5.1.10";x-internal:=true, - org.eclipse.jgit.hooks;version="5.1.10";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="5.1.10", - org.eclipse.jgit.ignore.internal;version="5.1.10";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="5.1.10";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="5.1.10";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.ketch;version="5.1.10";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.dfs;version="5.1.10"; + org.eclipse.jgit.gitrepo.internal;version="5.1.11";x-internal:=true, + org.eclipse.jgit.hooks;version="5.1.11";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="5.1.11", + org.eclipse.jgit.ignore.internal;version="5.1.11";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="5.1.11";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.fsck;version="5.1.11";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.ketch;version="5.1.11";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.dfs;version="5.1.11"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="5.1.10"; + org.eclipse.jgit.internal.storage.file;version="5.1.11"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -75,12 +75,12 @@ Export-Package: org.eclipse.jgit.annotations;version="5.1.10", org.eclipse.jgit.lfs, org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test", - org.eclipse.jgit.internal.storage.io;version="5.1.10";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="5.1.10";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="5.1.10"; + org.eclipse.jgit.internal.storage.io;version="5.1.11";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.pack;version="5.1.11";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.reftable;version="5.1.11"; x-friends:="org.eclipse.jgit.http.test,org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftree;version="5.1.10";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="5.1.10"; + org.eclipse.jgit.internal.storage.reftree;version="5.1.11";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="5.1.11"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -90,33 +90,33 @@ Export-Package: org.eclipse.jgit.annotations;version="5.1.10", org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.lib.internal;version="5.1.10";x-internal:=true, - org.eclipse.jgit.merge;version="5.1.10"; + org.eclipse.jgit.lib.internal;version="5.1.11";x-internal:=true, + org.eclipse.jgit.merge;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache, org.eclipse.jgit.api", - org.eclipse.jgit.nls;version="5.1.10", - org.eclipse.jgit.notes;version="5.1.10"; + org.eclipse.jgit.nls;version="5.1.11", + org.eclipse.jgit.notes;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="5.1.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="5.1.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="5.1.10"; + org.eclipse.jgit.patch;version="5.1.11";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", + org.eclipse.jgit.revplot;version="5.1.11";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", + org.eclipse.jgit.revwalk;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.revwalk.filter", - org.eclipse.jgit.revwalk.filter;version="5.1.10";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="5.1.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="5.1.10";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="5.1.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="5.1.10"; + org.eclipse.jgit.revwalk.filter;version="5.1.11";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.file;version="5.1.11";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.pack;version="5.1.11";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.submodule;version="5.1.11";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", + org.eclipse.jgit.transport;version="5.1.11"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -128,24 +128,24 @@ Export-Package: org.eclipse.jgit.annotations;version="5.1.10", org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="5.1.10";uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="5.1.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="5.1.10"; + org.eclipse.jgit.transport.http;version="5.1.11";uses:="javax.net.ssl", + org.eclipse.jgit.transport.resolver;version="5.1.11";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", + org.eclipse.jgit.treewalk;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="5.1.10";uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="5.1.10"; + org.eclipse.jgit.treewalk.filter;version="5.1.11";uses:="org.eclipse.jgit.treewalk", + org.eclipse.jgit.util;version="5.1.11"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="5.1.10", - org.eclipse.jgit.util.sha1;version="5.1.10", - org.eclipse.jgit.util.time;version="5.1.10" + org.eclipse.jgit.util.io;version="5.1.11", + org.eclipse.jgit.util.sha1;version="5.1.11", + org.eclipse.jgit.util.time;version="5.1.11" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index d008c777f..d43100283 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.10.201908230655-r -Eclipse-SourceBundle: org.eclipse.jgit;version="5.1.10.201908230655-r";roots="." +Bundle-Version: 5.1.11.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="5.1.11.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 6f0183334..b97e873a9 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index db7f7ec12..22ad2ceac 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.1.10.201908230655-r + 5.1.11-SNAPSHOT JGit - Parent ${jgit-url}