From 4b2b3294b8af9631ea66728baa2839fbcca630f5 Mon Sep 17 00:00:00 2001 From: Stefan Lay Date: Wed, 18 Jun 2014 11:33:34 +0200 Subject: [PATCH 1/3] Allow retrying connecting SshSession in case of an exception Connecting to an SshSession may fail due to different reasons. Jsch for example often throws an com.jcraft.jsch.JschException: verify: false.[1] The issue is still not fixed in JSch 0.1.51. In such a case it is worth retrying to connect. The number of connection attempts can be configured using ssh_config parameter "ConnectionAttempts" [2]. Don't retry if the user canceled authentication. [1] http://sourceforge.net/p/jsch/bugs/58/ [2] http://linux.die.net/man/5/ssh_config Bug: 437656 Change-Id: I6dd2a3786b7d3f15f5a46821d8edac987a57e381 Signed-off-by: Matthias Sohn --- .../jgit/transport/OpenSshConfigTest.java | 34 ++++++++++++++- org.eclipse.jgit/.settings/.api_filters | 6 +++ .../eclipse/jgit/internal/JGitText.properties | 1 + .../org/eclipse/jgit/internal/JGitText.java | 1 + .../transport/JschConfigSessionFactory.java | 42 ++++++++++++++----- .../eclipse/jgit/transport/OpenSshConfig.java | 31 +++++++++++++- 6 files changed, 103 insertions(+), 12 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java index 5836db1e6..8ec39bf56 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008, Google Inc. + * Copyright (C) 2008, 2014 Google Inc. * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -96,6 +96,7 @@ public class OpenSshConfigTest extends RepositoryTestCase { assertEquals("repo.or.cz", h.getHostName()); assertEquals("jex_junit", h.getUser()); assertEquals(22, h.getPort()); + assertEquals(1, h.getConnectionAttempts()); assertNull(h.getIdentityFile()); } @@ -249,4 +250,35 @@ public class OpenSshConfigTest extends RepositoryTestCase { assertNotNull(h); assertTrue(h.isBatchMode()); } + + @Test + public void testAlias_ConnectionAttemptsDefault() throws Exception { + final Host h = osc.lookup("orcz"); + assertNotNull(h); + assertEquals(1, h.getConnectionAttempts()); + } + + @Test + public void testAlias_ConnectionAttempts() throws Exception { + config("Host orcz\n" + "\tConnectionAttempts 5\n"); + final Host h = osc.lookup("orcz"); + assertNotNull(h); + assertEquals(5, h.getConnectionAttempts()); + } + + @Test + public void testAlias_invalidConnectionAttempts() throws Exception { + config("Host orcz\n" + "\tConnectionAttempts -1\n"); + final Host h = osc.lookup("orcz"); + assertNotNull(h); + assertEquals(1, h.getConnectionAttempts()); + } + + @Test + public void testAlias_badConnectionAttempts() throws Exception { + config("Host orcz\n" + "\tConnectionAttempts xxx\n"); + final Host h = osc.lookup("orcz"); + assertNotNull(h); + assertEquals(1, h.getConnectionAttempts()); + } } diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 87a931c87..56c9ee68a 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -7,6 +7,12 @@ + + + + + + diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index fd5801e6a..5b12a0c68 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -508,6 +508,7 @@ transportProtoHTTP=HTTP transportProtoLocal=Local Git Repository transportProtoSFTP=SFTP transportProtoSSH=SSH +transportSSHRetryInterrupt=Interrupted while waiting for retry treeEntryAlreadyExists=Tree entry "{0}" already exists. treeFilterMarkerTooManyFilters=Too many markTreeFilters passed, maximum number is {0} (passed {1}) treeIteratorDoesNotSupportRemove=TreeIterator does not support remove() diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 8acfb54b8..f075db3e5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -570,6 +570,7 @@ public class JGitText extends TranslationBundle { /***/ public String transportProtoLocal; /***/ public String transportProtoSFTP; /***/ public String transportProtoSSH; + /***/ public String transportSSHRetryInterrupt; /***/ public String treeEntryAlreadyExists; /***/ public String treeFilterMarkerTooManyFilters; /***/ public String treeIteratorDoesNotSupportRemove; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java index 65e9d4dc5..308741e93 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java @@ -110,7 +110,7 @@ public abstract class JschConfigSessionFactory extends SshSessionFactory { pass, host, port, hc); int retries = 0; - while (!session.isConnected() && retries < 3) { + while (!session.isConnected()) { try { retries++; session.connect(tms); @@ -120,16 +120,30 @@ public abstract class JschConfigSessionFactory extends SshSessionFactory { // Make sure our known_hosts is not outdated knownHosts(getJSch(hc, fs), fs); - // if authentication failed maybe credentials changed at the - // remote end therefore reset credentials and retry - if (credentialsProvider != null && e.getCause() == null - && e.getMessage().equals("Auth fail") //$NON-NLS-1$ - && retries < 3) { - credentialsProvider.reset(uri); - session = createSession(credentialsProvider, fs, user, - pass, host, port, hc); - } else { + if (isAuthenticationCanceled(e)) { + throw e; + } else if (isAuthenticationFailed(e) + && credentialsProvider != null) { + // if authentication failed maybe credentials changed at + // the remote end therefore reset credentials and retry + if (retries < 3) { + credentialsProvider.reset(uri); + session = createSession(credentialsProvider, fs, + user, pass, host, port, hc); + } else + throw e; + } else if (retries >= hc.getConnectionAttempts()) { throw e; + } else { + try { + Thread.sleep(1000); + session = createSession(credentialsProvider, fs, + user, pass, host, port, hc); + } catch (InterruptedException e1) { + throw new TransportException( + JGitText.get().transportSSHRetryInterrupt, + e1); + } } } } @@ -147,6 +161,14 @@ public abstract class JschConfigSessionFactory extends SshSessionFactory { } + private static boolean isAuthenticationFailed(JSchException e) { + return e.getCause() == null && e.getMessage().equals("Auth fail"); //$NON-NLS-1$ + } + + private static boolean isAuthenticationCanceled(JSchException e) { + return e.getCause() == null && e.getMessage().equals("Auth cancel"); //$NON-NLS-1$ + } + private Session createSession(CredentialsProvider credentialsProvider, FS fs, String user, final String pass, String host, int port, final OpenSshConfig.Host hc) throws JSchException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java index 01716da70..38f3a2ac7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2009, Google Inc. + * Copyright (C) 2008, 2014, Google Inc. * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -148,6 +148,8 @@ public class OpenSshConfig { h.user = OpenSshConfig.userName(); if (h.port == 0) h.port = OpenSshConfig.SSH_PORT; + if (h.connectionAttempts == 0) + h.connectionAttempts = 1; h.patternsApplied = true; return h; } @@ -244,6 +246,18 @@ public class OpenSshConfig { for (final Host c : current) if (c.strictHostKeyChecking == null) c.strictHostKeyChecking = value; + } else if (StringUtils.equalsIgnoreCase( + "ConnectionAttempts", keyword)) { //$NON-NLS-1$ + try { + final int connectionAttempts = Integer.parseInt(dequote(argValue)); + if (connectionAttempts > 0) { + for (final Host c : current) + if (c.connectionAttempts == 0) + c.connectionAttempts = connectionAttempts; + } + } catch (NumberFormatException nfe) { + // ignore bad values + } } } @@ -331,6 +345,8 @@ public class OpenSshConfig { String strictHostKeyChecking; + int connectionAttempts; + void copyFrom(final Host src) { if (hostName == null) hostName = src.hostName; @@ -346,6 +362,8 @@ public class OpenSshConfig { batchMode = src.batchMode; if (strictHostKeyChecking == null) strictHostKeyChecking = src.strictHostKeyChecking; + if (connectionAttempts == 0) + connectionAttempts = src.connectionAttempts; } /** @@ -402,5 +420,16 @@ public class OpenSshConfig { public boolean isBatchMode() { return batchMode != null && batchMode.booleanValue(); } + + /** + * @return the number of tries (one per second) to connect before + * exiting. The argument must be an integer. This may be useful + * in scripts if the connection sometimes fails. The default is + * 1. + * @since 3.4 + */ + public int getConnectionAttempts() { + return connectionAttempts; + } } } From 03f6e83c40b75bce31dd9bc65332f9c53310d112 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 21 Jun 2014 00:16:29 +0200 Subject: [PATCH 2/3] JGit v3.4.1.201406201815-r Change-Id: I4383a90fd91a243cd5ce5d0ae4e53874b36c1f47 Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 12 +-- 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 | 10 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.console/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 24 +++--- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 ++++----- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 +++--- org.eclipse.jgit.java7.test/pom.xml | 2 +- org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 4 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.java7/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++--- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 30 ++++---- org.eclipse.jgit.junit/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.java7.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../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 | 34 ++++----- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 62 ++++++++-------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 74 +++++++++---------- 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/META-INF/MANIFEST.MF | 66 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 55 files changed, 263 insertions(+), 263 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 274909314..dfc69a137 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)", + org.eclipse.jgit.ant.tasks;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 920b0450f..58519042c 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 52f864d20..2ad4daf2e 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)" + org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="3.4.0"; +Export-Package: org.eclipse.jgit.ant.tasks;version="3.4.1"; 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 c16050350..e8b1159ca 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 31eab6096..bf9eebb57 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -12,13 +12,13 @@ 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="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.1,3.5.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="3.4.0"; +Export-Package: org.eclipse.jgit.archive;version="3.4.1"; 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 66c467d93..10931e572 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: 3.4.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.4.0.qualifier";roots="." +Bundle-Version: 3.4.1.201406201815-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.4.1.201406201815-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index d9cf85140..28eefe5d8 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index 1726d4b0e..7d1c3aec3 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.console -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.jgit.console;version="3.4.0" -Import-Package: org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)" +Export-Package: org.eclipse.jgit.console;version="3.4.1" +Import-Package: org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index a84e4891c..af28ffdda 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.console diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 1d006337b..95850a8a9 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -18,10 +18,10 @@ Import-Package: org.apache.http;version="[4.1.0,5.0.0)", org.apache.http.impl.client;version="[4.1.0,5.0.0)", org.apache.http.impl.client.cache;version="[4.1.0,5.0.0)", org.apache.http.params;version="[4.1.0,5.0.0)", - org.eclipse.jgit.nls;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport.http;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="3.4.0"; + org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport.http;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="3.4.1"; uses:="org.eclipse.jgit.transport.http, javax.net.ssl, org.apache.http.client, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 32fb6a95a..9ae2bbd72 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 53d27d5d3..cecdf9320 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: - org.eclipse.jgit.http.server;version="3.4.0", - org.eclipse.jgit.http.server.glue;version="3.4.0"; + org.eclipse.jgit.http.server;version="3.4.1", + org.eclipse.jgit.http.server.glue;version="3.4.1"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="3.4.0"; + org.eclipse.jgit.http.server.resolver;version="3.4.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,11 +18,11 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.servlet;version="[2.5.0,3.0.0)", javax.servlet.http;version="[2.5.0,3.0.0)", - org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport.resolver;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)" + org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 32c2b8f31..cc4092cf8 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 2011cbf89..10b5215da 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -22,23 +22,23 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.thread;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.http.server;version="[3.4.0,3.5.0)", - org.eclipse.jgit.http.server.glue;version="[3.4.0,3.5.0)", - org.eclipse.jgit.http.server.resolver;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.0,3.5.0)", - org.eclipse.jgit.junit.http;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport.http;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport.http.apache;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport.resolver;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.http.server;version="[3.4.1,3.5.0)", + org.eclipse.jgit.http.server.glue;version="[3.4.1,3.5.0)", + org.eclipse.jgit.http.server.resolver;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", + org.eclipse.jgit.junit.http;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport.http;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport.http.apache;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 95ffe04c5..a4731d20d 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF index 03184e79f..dc5ae0016 100644 --- a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7.test -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[3.4.0,3.5.0)", - org.eclipse.jgit.diff;version="[3.4.0,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="3.4.0", - org.eclipse.jgit.junit;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)", +Import-Package: org.eclipse.jgit.api;version="[3.4.1,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.1,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="3.4.1", + org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)", org.junit;version="[4.11.0,5.0.0)" diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml index 02c813fef..9aa520d82 100644 --- a/org.eclipse.jgit.java7.test/pom.xml +++ b/org.eclipse.jgit.java7.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.java7.test diff --git a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF index 6e39da3a5..0b9bd6fae 100644 --- a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Fragment-Host: org.eclipse.jgit;bundle-version="3.1.1" Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7 -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.jgit.util;version="3.4.0" +Export-Package: org.eclipse.jgit.util;version="3.4.1" diff --git a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF index 02d41a3bd..583b66f3b 100644 --- a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.java7 - Sources Bundle-SymbolicName: org.eclipse.jgit.java7.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.4.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.4.0.qualifier";roots="." +Bundle-Version: 3.4.1.201406201815-r +Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.4.1.201406201815-r";roots="." diff --git a/org.eclipse.jgit.java7/pom.xml b/org.eclipse.jgit.java7/pom.xml index 0332f99de..d27cc1542 100644 --- a/org.eclipse.jgit.java7/pom.xml +++ b/org.eclipse.jgit.java7/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.java7 diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 95dca9a78..c3d506a9d 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,13 +20,13 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.http.server;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport.resolver;version="[3.4.0,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.http.server;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.1,3.5.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="3.4.0" +Export-Package: org.eclipse.jgit.junit.http;version="3.4.1" diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index d324bfdac..5b3abe1cd 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 05937371d..a4235aa82 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.4.0,3.5.0)", - org.eclipse.jgit.api.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.0,3.5.0)", - org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.treewalk.filter;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util.io;version="[3.4.0,3.5.0)", +Import-Package: org.eclipse.jgit.api;version="[3.4.1,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.1,3.5.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="3.4.0" +Export-Package: org.eclipse.jgit.junit;version="3.4.1" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c403a1d33..814701be0 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.junit 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 e4496dfa6..173905254 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 0319b44a3..845cf0ab0 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 74335ed37..5d0bd9561 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 e9a6607f7..c303c97e8 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml index 4087400bf..d05fe36ba 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml index 6d2e3e3e9..e721e636a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 6405163e2..ad3ad9803 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 7d9ee96e0..bd99a5814 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 8bcf092e5..74cf1a2b5 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 f7e56337a..6918c7d6d 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 8a2e6e62f..29d3f7dc8 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 dd4f9e5da..2701bd04f 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 909623555..7c314d57e 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 7b0b61d19..5d5acf811 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 ac22150ad..5fb92a243 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 abf9eba8e..7aeb97710 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: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-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 6a464b3e6..fd7146223 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 875d50c31..462ebfc54 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 b467d2dab..a6ea7a6e4 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,27 +2,27 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.4.0,3.5.0)", - org.eclipse.jgit.api.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.diff;version="[3.4.0,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.0,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.merge;version="[3.4.0,3.5.0)", - org.eclipse.jgit.pgm;version="[3.4.0,3.5.0)", - org.eclipse.jgit.pgm.internal;version="[3.4.0,3.5.0)", - org.eclipse.jgit.pgm.opt;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util.io;version="[3.4.0,3.5.0)", +Import-Package: org.eclipse.jgit.api;version="[3.4.1,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.1,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.merge;version="[3.4.1,3.5.0)", + org.eclipse.jgit.pgm;version="[3.4.1,3.5.0)", + org.eclipse.jgit.pgm.internal;version="[3.4.1,3.5.0)", + org.eclipse.jgit.pgm.opt;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.1,3.5.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)" diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 830f512ee..00cb98794 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 b052e0467..843a81d08 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,43 +2,43 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", org.apache.commons.compress.archivers.tar;version="[1.3,2.0)", org.apache.commons.compress.archivers.zip;version="[1.3,2.0)", - org.eclipse.jgit.api;version="[3.4.0,3.5.0)", - org.eclipse.jgit.api.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.archive;version="[3.4.0,3.5.0)", - org.eclipse.jgit.awtui;version="[3.4.0,3.5.0)", - org.eclipse.jgit.blame;version="[3.4.0,3.5.0)", - org.eclipse.jgit.diff;version="[3.4.0,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.0,3.5.0)", - org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.gitrepo;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.merge;version="3.4.0", - org.eclipse.jgit.nls;version="[3.4.0,3.5.0)", - org.eclipse.jgit.notes;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revplot;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk.filter;version="[3.4.0,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.storage.pack;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport.resolver;version="[3.4.0,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.treewalk.filter;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util.io;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api;version="[3.4.1,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.archive;version="[3.4.1,3.5.0)", + org.eclipse.jgit.awtui;version="[3.4.1,3.5.0)", + org.eclipse.jgit.blame;version="[3.4.1,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.1,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.gitrepo;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.merge;version="3.4.1", + org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", + org.eclipse.jgit.notes;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revplot;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk.filter;version="[3.4.1,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.storage.pack;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.1,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.1,3.5.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.pgm;version="3.4.0"; +Export-Package: org.eclipse.jgit.pgm;version="3.4.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -49,10 +49,10 @@ Export-Package: org.eclipse.jgit.pgm;version="3.4.0"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="3.4.0"; + org.eclipse.jgit.pgm.debug;version="3.4.1"; uses:="org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="3.4.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="3.4.0"; + org.eclipse.jgit.pgm.internal;version="3.4.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="3.4.1"; 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 6d2975799..10bf084b2 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: 3.4.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.4.0.qualifier";roots="." +Bundle-Version: 3.4.1.201406201815-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.4.1.201406201815-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 8ef89ce42..3c593885a 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 cda3fd181..3468b5260 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,48 +2,48 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", - org.eclipse.jgit.api;version="[3.4.0,3.5.0)", - org.eclipse.jgit.api.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.awtui;version="[3.4.0,3.5.0)", - org.eclipse.jgit.blame;version="[3.4.0,3.5.0)", - org.eclipse.jgit.console;version="[3.4.0,3.5.0)", - org.eclipse.jgit.diff;version="[3.4.0,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.0,3.5.0)", - org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.events;version="[3.4.0,3.5.0)", - org.eclipse.jgit.fnmatch;version="[3.4.0,3.5.0)", - org.eclipse.jgit.gitrepo;version="[3.4.0,3.5.0)", - org.eclipse.jgit.ignore;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.dfs;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.4.0,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.merge;version="[3.4.0,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.0,3.5.0)", - org.eclipse.jgit.notes;version="[3.4.0,3.5.0)", - org.eclipse.jgit.patch;version="[3.4.0,3.5.0)", - org.eclipse.jgit.pgm;version="[3.4.0,3.5.0)", - org.eclipse.jgit.pgm.internal;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revplot;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk.filter;version="[3.4.0,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.0,3.5.0)", - org.eclipse.jgit.storage.pack;version="[3.4.0,3.5.0)", - org.eclipse.jgit.submodule;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport.http;version="[3.4.0,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.treewalk.filter;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util.io;version="[3.4.0,3.5.0)", + org.eclipse.jgit.api;version="[3.4.1,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.awtui;version="[3.4.1,3.5.0)", + org.eclipse.jgit.blame;version="[3.4.1,3.5.0)", + org.eclipse.jgit.console;version="[3.4.1,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.1,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.events;version="[3.4.1,3.5.0)", + org.eclipse.jgit.fnmatch;version="[3.4.1,3.5.0)", + org.eclipse.jgit.gitrepo;version="[3.4.1,3.5.0)", + org.eclipse.jgit.ignore;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.dfs;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.4.1,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.merge;version="[3.4.1,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", + org.eclipse.jgit.notes;version="[3.4.1,3.5.0)", + org.eclipse.jgit.patch;version="[3.4.1,3.5.0)", + org.eclipse.jgit.pgm;version="[3.4.1,3.5.0)", + org.eclipse.jgit.pgm.internal;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revplot;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk.filter;version="[3.4.1,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", + org.eclipse.jgit.storage.pack;version="[3.4.1,3.5.0)", + org.eclipse.jgit.submodule;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport.http;version="[3.4.1,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.1,3.5.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.junit.experimental.theories;version="[4.4.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 5e011f9ab..26d9237a2 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-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 4d0a9fed1..ee446011a 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jgit.awtui;version="3.4.0" -Import-Package: org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revplot;version="[3.4.0,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.0,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.0,3.5.0)", - org.eclipse.jgit.util;version="[3.4.0,3.5.0)" +Export-Package: org.eclipse.jgit.awtui;version="3.4.1" +Import-Package: org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revplot;version="[3.4.1,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", + org.eclipse.jgit.util;version="[3.4.1,3.5.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 897b9ddd5..05f32eb5d 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 - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 1fa0ad9cf..72ea5807d 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.4.1.201406201815-r Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.api;version="3.4.0"; +Export-Package: org.eclipse.jgit.api;version="3.4.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -18,48 +18,48 @@ Export-Package: org.eclipse.jgit.api;version="3.4.0"; org.eclipse.jgit.blame, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="3.4.0"; + org.eclipse.jgit.api.errors;version="3.4.1"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.blame;version="3.4.0"; + org.eclipse.jgit.blame;version="3.4.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="3.4.0"; + org.eclipse.jgit.diff;version="3.4.1"; 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="3.4.0"; + org.eclipse.jgit.dircache;version="3.4.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events", - org.eclipse.jgit.errors;version="3.4.0"; + org.eclipse.jgit.errors;version="3.4.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="3.4.0"; + org.eclipse.jgit.events;version="3.4.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="3.4.0", - org.eclipse.jgit.gitrepo;version="3.4.0"; + org.eclipse.jgit.fnmatch;version="3.4.1", + org.eclipse.jgit.gitrepo;version="3.4.1"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="3.4.0", - org.eclipse.jgit.internal;version="3.4.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.dfs;version="3.4.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.file;version="3.4.0"; + org.eclipse.jgit.ignore;version="3.4.1", + org.eclipse.jgit.internal;version="3.4.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.dfs;version="3.4.1";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.storage.file;version="3.4.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.http.server, org.eclipse.jgit.java7.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="3.4.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="3.4.0"; + org.eclipse.jgit.internal.storage.pack;version="3.4.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="3.4.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -68,37 +68,37 @@ Export-Package: org.eclipse.jgit.api;version="3.4.0"; org.eclipse.jgit.internal.storage.file, org.eclipse.jgit.treewalk, org.eclipse.jgit.transport", - org.eclipse.jgit.merge;version="3.4.0"; + org.eclipse.jgit.merge;version="3.4.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache", - org.eclipse.jgit.nls;version="3.4.0", - org.eclipse.jgit.notes;version="3.4.0"; + org.eclipse.jgit.nls;version="3.4.1", + org.eclipse.jgit.notes;version="3.4.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="3.4.0"; + org.eclipse.jgit.patch;version="3.4.1"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="3.4.0"; + org.eclipse.jgit.revplot;version="3.4.1"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="3.4.0"; + org.eclipse.jgit.revwalk;version="3.4.1"; 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="3.4.0"; + org.eclipse.jgit.revwalk.filter;version="3.4.1"; uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="3.4.0"; + org.eclipse.jgit.storage.file;version="3.4.1"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="3.4.0"; + org.eclipse.jgit.storage.pack;version="3.4.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="3.4.0"; + org.eclipse.jgit.submodule;version="3.4.1"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk,org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.transport;version="3.4.0"; + org.eclipse.jgit.transport;version="3.4.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -110,21 +110,21 @@ Export-Package: org.eclipse.jgit.api;version="3.4.0"; org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="3.4.0"; + org.eclipse.jgit.transport.http;version="3.4.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="3.4.0"; + org.eclipse.jgit.transport.resolver;version="3.4.1"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="3.4.0"; + org.eclipse.jgit.treewalk;version="3.4.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="3.4.0"; + org.eclipse.jgit.treewalk.filter;version="3.4.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="3.4.0"; + org.eclipse.jgit.util;version="3.4.1"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport.http,org.eclipse.jgit.storage.file", - org.eclipse.jgit.util.io;version="3.4.0" + org.eclipse.jgit.util.io;version="3.4.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: com.jcraft.jsch;bundle-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 dbbbbb0a1..7498f5177 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: 3.4.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="3.4.0.qualifier";roots="." +Bundle-Version: 3.4.1.201406201815-r +Eclipse-SourceBundle: org.eclipse.jgit;version="3.4.1.201406201815-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 90e21e131..cc87a5378 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 66cc9e028..cca59bf8f 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 3.4.0-SNAPSHOT + 3.4.1.201406201815-r JGit - Parent ${jgit-url} From 7865d7100e2a5f9d02f6679daada0c64ae14935f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 21 Jun 2014 00:57:43 +0200 Subject: [PATCH 3/3] Prepare 3.4.2-SNAPSHOT builds Change-Id: If88217d84b88cda6d04c159418d5bc86233fe28c Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 12 +-- 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 | 10 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.console/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 24 +++--- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 ++++----- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 +++--- org.eclipse.jgit.java7.test/pom.xml | 2 +- org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 4 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.java7/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++--- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 30 ++++---- org.eclipse.jgit.junit/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.java7.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../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 | 34 ++++----- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 62 ++++++++-------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 74 +++++++++---------- 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/META-INF/MANIFEST.MF | 66 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 55 files changed, 263 insertions(+), 263 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index dfc69a137..ae9f2c643 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)", + org.eclipse.jgit.ant.tasks;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 58519042c..3fe474561 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 - 3.4.1.201406201815-r + 3.4.2-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 2ad4daf2e..1472a19e0 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)" + org.eclipse.jgit.storage.file;version="[3.4.2,3.5.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="3.4.1"; +Export-Package: org.eclipse.jgit.ant.tasks;version="3.4.2"; 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 e8b1159ca..731d9c939 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 - 3.4.1.201406201815-r + 3.4.2-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 bf9eebb57..843f901d3 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -12,13 +12,13 @@ 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="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", + org.eclipse.jgit.api;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.2,3.5.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="3.4.1"; +Export-Package: org.eclipse.jgit.archive;version="3.4.2"; 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 10931e572..1f0758706 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: 3.4.1.201406201815-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.4.1.201406201815-r";roots="." +Bundle-Version: 3.4.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.4.2.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 28eefe5d8..4813f6d05 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 - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index 7d1c3aec3..be643f30f 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.console -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.jgit.console;version="3.4.1" -Import-Package: org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)" +Export-Package: org.eclipse.jgit.console;version="3.4.2" +Import-Package: org.eclipse.jgit.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index af28ffdda..542714f4e 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.console diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 95850a8a9..c3c98eda3 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -18,10 +18,10 @@ Import-Package: org.apache.http;version="[4.1.0,5.0.0)", org.apache.http.impl.client;version="[4.1.0,5.0.0)", org.apache.http.impl.client.cache;version="[4.1.0,5.0.0)", org.apache.http.params;version="[4.1.0,5.0.0)", - org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport.http;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="3.4.1"; + org.eclipse.jgit.nls;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport.http;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="3.4.2"; uses:="org.eclipse.jgit.transport.http, javax.net.ssl, org.apache.http.client, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 9ae2bbd72..064656718 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 - 3.4.1.201406201815-r + 3.4.2-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 cecdf9320..55d172a08 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: - org.eclipse.jgit.http.server;version="3.4.1", - org.eclipse.jgit.http.server.glue;version="3.4.1"; + org.eclipse.jgit.http.server;version="3.4.2", + org.eclipse.jgit.http.server.glue;version="3.4.2"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="3.4.1"; + org.eclipse.jgit.http.server.resolver;version="3.4.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,11 +18,11 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.servlet;version="[2.5.0,3.0.0)", javax.servlet.http;version="[2.5.0,3.0.0)", - org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport.resolver;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)" + org.eclipse.jgit.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index cc4092cf8..f44ab040c 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 - 3.4.1.201406201815-r + 3.4.2-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 10b5215da..d6ec8e515 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -22,23 +22,23 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.thread;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.http.server;version="[3.4.1,3.5.0)", - org.eclipse.jgit.http.server.glue;version="[3.4.1,3.5.0)", - org.eclipse.jgit.http.server.resolver;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", - org.eclipse.jgit.junit.http;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport.http;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport.http.apache;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport.resolver;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.http.server;version="[3.4.2,3.5.0)", + org.eclipse.jgit.http.server.glue;version="[3.4.2,3.5.0)", + org.eclipse.jgit.http.server.resolver;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.2,3.5.0)", + org.eclipse.jgit.junit.http;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport.http;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport.http.apache;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index a4731d20d..97113aa3d 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 - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF index dc5ae0016..4f7b46927 100644 --- a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7.test -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[3.4.1,3.5.0)", - org.eclipse.jgit.diff;version="[3.4.1,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="3.4.1", - org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)", +Import-Package: org.eclipse.jgit.api;version="[3.4.2,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.2,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="3.4.2", + org.eclipse.jgit.junit;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)", org.junit;version="[4.11.0,5.0.0)" diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml index 9aa520d82..1016108b2 100644 --- a/org.eclipse.jgit.java7.test/pom.xml +++ b/org.eclipse.jgit.java7.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.java7.test diff --git a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF index 0b9bd6fae..39db74df2 100644 --- a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Fragment-Host: org.eclipse.jgit;bundle-version="3.1.1" Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7 -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.jgit.util;version="3.4.1" +Export-Package: org.eclipse.jgit.util;version="3.4.2" diff --git a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF index 583b66f3b..b42675596 100644 --- a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.java7 - Sources Bundle-SymbolicName: org.eclipse.jgit.java7.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.4.1.201406201815-r -Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.4.1.201406201815-r";roots="." +Bundle-Version: 3.4.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.4.2.qualifier";roots="." diff --git a/org.eclipse.jgit.java7/pom.xml b/org.eclipse.jgit.java7/pom.xml index d27cc1542..4ca7cfff5 100644 --- a/org.eclipse.jgit.java7/pom.xml +++ b/org.eclipse.jgit.java7/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.java7 diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index c3d506a9d..7f1049ac7 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,13 +20,13 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.http.server;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport.resolver;version="[3.4.1,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.http.server;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.2,3.5.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="3.4.1" +Export-Package: org.eclipse.jgit.junit.http;version="3.4.2" diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 5b3abe1cd..f9078c072 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 - 3.4.1.201406201815-r + 3.4.2-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 a4235aa82..5025045f4 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.4.1,3.5.0)", - org.eclipse.jgit.api.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", - org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.treewalk.filter;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util.io;version="[3.4.1,3.5.0)", +Import-Package: org.eclipse.jgit.api;version="[3.4.2,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.2,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.2,3.5.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="3.4.1" +Export-Package: org.eclipse.jgit.junit;version="3.4.2" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 814701be0..67cf5195e 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 - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.junit 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 173905254..3dfe3fa6e 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 845cf0ab0..d9158fa3a 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 - 3.4.1.201406201815-r + 3.4.2-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 5d0bd9561..393e0a050 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 c303c97e8..6b474ecda 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 - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml index d05fe36ba..592637e02 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml index e721e636a..ff65c6067 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.4.1.201406201815-r + 3.4.2-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 ad3ad9803..cacc0c210 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 bd99a5814..f82b81a10 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 - 3.4.1.201406201815-r + 3.4.2-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 74cf1a2b5..aa9c6b7a3 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 6918c7d6d..09f28c30b 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 - 3.4.1.201406201815-r + 3.4.2-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 29d3f7dc8..d8cba0da8 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 2701bd04f..8d115782b 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 - 3.4.1.201406201815-r + 3.4.2-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 7c314d57e..6c1bfb13b 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 - 3.4.1.201406201815-r + 3.4.2-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 5d5acf811..2201dc445 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 5fb92a243..d8daba9ad 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 - 3.4.1.201406201815-r + 3.4.2-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 7aeb97710..a8e4555aa 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: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.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 fd7146223..644a7438c 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 - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 462ebfc54..27a08f639 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.4.1.201406201815-r + 3.4.2-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 a6ea7a6e4..71411095a 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,27 +2,27 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.4.1,3.5.0)", - org.eclipse.jgit.api.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.diff;version="[3.4.1,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.merge;version="[3.4.1,3.5.0)", - org.eclipse.jgit.pgm;version="[3.4.1,3.5.0)", - org.eclipse.jgit.pgm.internal;version="[3.4.1,3.5.0)", - org.eclipse.jgit.pgm.opt;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util.io;version="[3.4.1,3.5.0)", +Import-Package: org.eclipse.jgit.api;version="[3.4.2,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.2,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.2,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.merge;version="[3.4.2,3.5.0)", + org.eclipse.jgit.pgm;version="[3.4.2,3.5.0)", + org.eclipse.jgit.pgm.internal;version="[3.4.2,3.5.0)", + org.eclipse.jgit.pgm.opt;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.2,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.2,3.5.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)" diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 00cb98794..569015f24 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 - 3.4.1.201406201815-r + 3.4.2-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 843a81d08..4264667b2 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,43 +2,43 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", org.apache.commons.compress.archivers.tar;version="[1.3,2.0)", org.apache.commons.compress.archivers.zip;version="[1.3,2.0)", - org.eclipse.jgit.api;version="[3.4.1,3.5.0)", - org.eclipse.jgit.api.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.archive;version="[3.4.1,3.5.0)", - org.eclipse.jgit.awtui;version="[3.4.1,3.5.0)", - org.eclipse.jgit.blame;version="[3.4.1,3.5.0)", - org.eclipse.jgit.diff;version="[3.4.1,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", - org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.gitrepo;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.merge;version="3.4.1", - org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", - org.eclipse.jgit.notes;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revplot;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk.filter;version="[3.4.1,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.storage.pack;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport.resolver;version="[3.4.1,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.treewalk.filter;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util.io;version="[3.4.1,3.5.0)", + org.eclipse.jgit.api;version="[3.4.2,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.archive;version="[3.4.2,3.5.0)", + org.eclipse.jgit.awtui;version="[3.4.2,3.5.0)", + org.eclipse.jgit.blame;version="[3.4.2,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.2,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.2,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.gitrepo;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.merge;version="3.4.2", + org.eclipse.jgit.nls;version="[3.4.2,3.5.0)", + org.eclipse.jgit.notes;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revplot;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk.filter;version="[3.4.2,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.storage.pack;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport.resolver;version="[3.4.2,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.2,3.5.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.pgm;version="3.4.1"; +Export-Package: org.eclipse.jgit.pgm;version="3.4.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -49,10 +49,10 @@ Export-Package: org.eclipse.jgit.pgm;version="3.4.1"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="3.4.1"; + org.eclipse.jgit.pgm.debug;version="3.4.2"; uses:="org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="3.4.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="3.4.1"; + org.eclipse.jgit.pgm.internal;version="3.4.2";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="3.4.2"; 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 10bf084b2..bc974eb6a 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: 3.4.1.201406201815-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.4.1.201406201815-r";roots="." +Bundle-Version: 3.4.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.4.2.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 3c593885a..40af9a064 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 - 3.4.1.201406201815-r + 3.4.2-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 3468b5260..48500d2ae 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,48 +2,48 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", - org.eclipse.jgit.api;version="[3.4.1,3.5.0)", - org.eclipse.jgit.api.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.awtui;version="[3.4.1,3.5.0)", - org.eclipse.jgit.blame;version="[3.4.1,3.5.0)", - org.eclipse.jgit.console;version="[3.4.1,3.5.0)", - org.eclipse.jgit.diff;version="[3.4.1,3.5.0)", - org.eclipse.jgit.dircache;version="[3.4.1,3.5.0)", - org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.events;version="[3.4.1,3.5.0)", - org.eclipse.jgit.fnmatch;version="[3.4.1,3.5.0)", - org.eclipse.jgit.gitrepo;version="[3.4.1,3.5.0)", - org.eclipse.jgit.ignore;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.dfs;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.4.1,3.5.0)", - org.eclipse.jgit.junit;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.merge;version="[3.4.1,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", - org.eclipse.jgit.notes;version="[3.4.1,3.5.0)", - org.eclipse.jgit.patch;version="[3.4.1,3.5.0)", - org.eclipse.jgit.pgm;version="[3.4.1,3.5.0)", - org.eclipse.jgit.pgm.internal;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revplot;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk.filter;version="[3.4.1,3.5.0)", - org.eclipse.jgit.storage.file;version="[3.4.1,3.5.0)", - org.eclipse.jgit.storage.pack;version="[3.4.1,3.5.0)", - org.eclipse.jgit.submodule;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport.http;version="[3.4.1,3.5.0)", - org.eclipse.jgit.treewalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.treewalk.filter;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util.io;version="[3.4.1,3.5.0)", + org.eclipse.jgit.api;version="[3.4.2,3.5.0)", + org.eclipse.jgit.api.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.awtui;version="[3.4.2,3.5.0)", + org.eclipse.jgit.blame;version="[3.4.2,3.5.0)", + org.eclipse.jgit.console;version="[3.4.2,3.5.0)", + org.eclipse.jgit.diff;version="[3.4.2,3.5.0)", + org.eclipse.jgit.dircache;version="[3.4.2,3.5.0)", + org.eclipse.jgit.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.events;version="[3.4.2,3.5.0)", + org.eclipse.jgit.fnmatch;version="[3.4.2,3.5.0)", + org.eclipse.jgit.gitrepo;version="[3.4.2,3.5.0)", + org.eclipse.jgit.ignore;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.dfs;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.4.2,3.5.0)", + org.eclipse.jgit.junit;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.merge;version="[3.4.2,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.2,3.5.0)", + org.eclipse.jgit.notes;version="[3.4.2,3.5.0)", + org.eclipse.jgit.patch;version="[3.4.2,3.5.0)", + org.eclipse.jgit.pgm;version="[3.4.2,3.5.0)", + org.eclipse.jgit.pgm.internal;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revplot;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk.filter;version="[3.4.2,3.5.0)", + org.eclipse.jgit.storage.file;version="[3.4.2,3.5.0)", + org.eclipse.jgit.storage.pack;version="[3.4.2,3.5.0)", + org.eclipse.jgit.submodule;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport.http;version="[3.4.2,3.5.0)", + org.eclipse.jgit.treewalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.treewalk.filter;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util.io;version="[3.4.2,3.5.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.junit.experimental.theories;version="[4.4.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 26d9237a2..eb5105b6b 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 - 3.4.1.201406201815-r + 3.4.2-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 ee446011a..9c8a67675 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jgit.awtui;version="3.4.1" -Import-Package: org.eclipse.jgit.errors;version="[3.4.1,3.5.0)", - org.eclipse.jgit.lib;version="[3.4.1,3.5.0)", - org.eclipse.jgit.nls;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revplot;version="[3.4.1,3.5.0)", - org.eclipse.jgit.revwalk;version="[3.4.1,3.5.0)", - org.eclipse.jgit.transport;version="[3.4.1,3.5.0)", - org.eclipse.jgit.util;version="[3.4.1,3.5.0)" +Export-Package: org.eclipse.jgit.awtui;version="3.4.2" +Import-Package: org.eclipse.jgit.errors;version="[3.4.2,3.5.0)", + org.eclipse.jgit.lib;version="[3.4.2,3.5.0)", + org.eclipse.jgit.nls;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revplot;version="[3.4.2,3.5.0)", + org.eclipse.jgit.revwalk;version="[3.4.2,3.5.0)", + org.eclipse.jgit.transport;version="[3.4.2,3.5.0)", + org.eclipse.jgit.util;version="[3.4.2,3.5.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 05f32eb5d..22bddc547 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 - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 72ea5807d..fa166d4ef 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 3.4.1.201406201815-r +Bundle-Version: 3.4.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.api;version="3.4.1"; +Export-Package: org.eclipse.jgit.api;version="3.4.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -18,48 +18,48 @@ Export-Package: org.eclipse.jgit.api;version="3.4.1"; org.eclipse.jgit.blame, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="3.4.1"; + org.eclipse.jgit.api.errors;version="3.4.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.blame;version="3.4.1"; + org.eclipse.jgit.blame;version="3.4.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="3.4.1"; + org.eclipse.jgit.diff;version="3.4.2"; 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="3.4.1"; + org.eclipse.jgit.dircache;version="3.4.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events", - org.eclipse.jgit.errors;version="3.4.1"; + org.eclipse.jgit.errors;version="3.4.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="3.4.1"; + org.eclipse.jgit.events;version="3.4.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="3.4.1", - org.eclipse.jgit.gitrepo;version="3.4.1"; + org.eclipse.jgit.fnmatch;version="3.4.2", + org.eclipse.jgit.gitrepo;version="3.4.2"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="3.4.1", - org.eclipse.jgit.internal;version="3.4.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.dfs;version="3.4.1";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.file;version="3.4.1"; + org.eclipse.jgit.ignore;version="3.4.2", + org.eclipse.jgit.internal;version="3.4.2";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.dfs;version="3.4.2";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.storage.file;version="3.4.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.http.server, org.eclipse.jgit.java7.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="3.4.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="3.4.1"; + org.eclipse.jgit.internal.storage.pack;version="3.4.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="3.4.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -68,37 +68,37 @@ Export-Package: org.eclipse.jgit.api;version="3.4.1"; org.eclipse.jgit.internal.storage.file, org.eclipse.jgit.treewalk, org.eclipse.jgit.transport", - org.eclipse.jgit.merge;version="3.4.1"; + org.eclipse.jgit.merge;version="3.4.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache", - org.eclipse.jgit.nls;version="3.4.1", - org.eclipse.jgit.notes;version="3.4.1"; + org.eclipse.jgit.nls;version="3.4.2", + org.eclipse.jgit.notes;version="3.4.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="3.4.1"; + org.eclipse.jgit.patch;version="3.4.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="3.4.1"; + org.eclipse.jgit.revplot;version="3.4.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="3.4.1"; + org.eclipse.jgit.revwalk;version="3.4.2"; 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="3.4.1"; + org.eclipse.jgit.revwalk.filter;version="3.4.2"; uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="3.4.1"; + org.eclipse.jgit.storage.file;version="3.4.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="3.4.1"; + org.eclipse.jgit.storage.pack;version="3.4.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="3.4.1"; + org.eclipse.jgit.submodule;version="3.4.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk,org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.transport;version="3.4.1"; + org.eclipse.jgit.transport;version="3.4.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -110,21 +110,21 @@ Export-Package: org.eclipse.jgit.api;version="3.4.1"; org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="3.4.1"; + org.eclipse.jgit.transport.http;version="3.4.2"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="3.4.1"; + org.eclipse.jgit.transport.resolver;version="3.4.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="3.4.1"; + org.eclipse.jgit.treewalk;version="3.4.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="3.4.1"; + org.eclipse.jgit.treewalk.filter;version="3.4.2"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="3.4.1"; + org.eclipse.jgit.util;version="3.4.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport.http,org.eclipse.jgit.storage.file", - org.eclipse.jgit.util.io;version="3.4.1" + org.eclipse.jgit.util.io;version="3.4.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: com.jcraft.jsch;bundle-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 7498f5177..4696bb384 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: 3.4.1.201406201815-r -Eclipse-SourceBundle: org.eclipse.jgit;version="3.4.1.201406201815-r";roots="." +Bundle-Version: 3.4.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="3.4.2.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index cc87a5378..6fa769e47 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index cca59bf8f..709fd8b7c 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 3.4.1.201406201815-r + 3.4.2-SNAPSHOT JGit - Parent ${jgit-url}