From 5bfeec4fdbe72ec7f4dac252b98c8bad05898ef1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 29 May 2017 00:05:45 +0200 Subject: [PATCH 1/7] Update Orbit to the Oxygen version R20170516192513 Change-Id: I13575c77540149d383747a34754ac338ed60fb52 Signed-off-by: Matthias Sohn --- .../org.eclipse.jgit.target/jgit-4.5.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.5.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.6.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.6.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.7.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.7.tpd | 2 +- ...{S20170306214312-Oxygen.tpd => R20170516192513-Oxygen.tpd} | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/{S20170306214312-Oxygen.tpd => R20170516192513-Oxygen.tpd} (96%) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target index 39224af54..b2099aea6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target @@ -1,7 +1,7 @@ - + @@ -98,7 +98,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd index 41ea154f9..f9653b22a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd @@ -2,7 +2,7 @@ target "jgit-4.5" with source configurePhase include "projects/jetty-9.4.5.tpd" include "orbit/R20160221192158-Mars.tpd" -include "orbit/S20170306214312-Oxygen.tpd" +include "orbit/R20170516192513-Oxygen.tpd" location "http://download.eclipse.org/releases/mars/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 6cf40db02..e4baa5d72 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target @@ -1,7 +1,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd index 8c19a9547..9ddba2d88 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd @@ -1,7 +1,7 @@ target "jgit-4.6" with source configurePhase include "projects/jetty-9.4.5.tpd" -include "orbit/S20170306214312-Oxygen.tpd" +include "orbit/R20170516192513-Oxygen.tpd" location "http://download.eclipse.org/releases/neon/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index 7ccc03e83..9a15741e7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target @@ -1,7 +1,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd index b7ebc3202..41850791f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd @@ -1,7 +1,7 @@ target "jgit-4.7" with source configurePhase include "projects/jetty-9.4.5.tpd" -include "orbit/S20170306214312-Oxygen.tpd" +include "orbit/R20170516192513-Oxygen.tpd" location "http://download.eclipse.org/releases/oxygen/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20170306214312-Oxygen.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20170516192513-Oxygen.tpd similarity index 96% rename from org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20170306214312-Oxygen.tpd rename to org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20170516192513-Oxygen.tpd index 25722bf48..ef19fa6d2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20170306214312-Oxygen.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20170516192513-Oxygen.tpd @@ -1,7 +1,7 @@ -target "S20170306214312-Oxygen" with source configurePhase +target "R20170516192513-Oxygen" with source configurePhase // see http://download.eclipse.org/tools/orbit/downloads/ -location "http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository" { +location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository" { org.apache.ant [1.9.6.v201510161327,1.9.6.v201510161327] org.apache.ant.source [1.9.6.v201510161327,1.9.6.v201510161327] org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400] From 6b1e3c58b16651dc72ec79a614d507e014d18393 Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 8 Feb 2017 15:07:18 -0500 Subject: [PATCH 2/7] Run auto GC in the background When running an automatic GC on a FileRepository, when the caller passes a NullProgressMonitor, run the GC in a background thread. Use a thread pool of size 1 to limit the number of background threads spawned for background gc in the same application. In the next minor release we can make the thread pool configurable. In some cases, the auto GC limit is lower than the true number of unreachable loose objects, so auto GC will run after every (e.g) fetch operation. This leads to the appearance of poor fetch performance. Since these GCs will never make progress (until either the objects become referenced, or the two week timeout expires), blocking on them simply reduces throughput. In the event that an auto GC would make progress, it's still OK if it runs in the background. The progress will still happen. This matches the behavior of regular git. Git (and now jgit) uses the lock file for gc.log to prevent simultaneous runs of background gc. Further, it writes errors to gc.log, and won't run background gc if that file is present and recent. If gc.log is too old (according to the config gc.logexpiry), it will be ignored. Change-Id: I3870cadb4a0a6763feff252e6eaef99f4aa8d0df Signed-off-by: David Turner Signed-off-by: Matthias Sohn --- .../junit/LocalDiskRepositoryTestCase.java | 7 + .../tst/org/eclipse/jgit/pgm/ConfigTest.java | 1 + org.eclipse.jgit/.settings/.api_filters | 8 + .../eclipse/jgit/internal/JGitText.properties | 2 + .../org/eclipse/jgit/internal/JGitText.java | 2 + .../internal/storage/file/FileRepository.java | 6 + .../jgit/internal/storage/file/GC.java | 91 ++++++++- .../jgit/internal/storage/file/GcLog.java | 191 ++++++++++++++++++ .../org/eclipse/jgit/lib/ConfigConstants.java | 14 ++ 9 files changed, 320 insertions(+), 2 deletions(-) create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java index 933faf9bf..6ace9fc12 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java @@ -62,6 +62,7 @@ import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; @@ -121,6 +122,12 @@ public void setUp() throws Exception { mockSystemReader = new MockSystemReader(); mockSystemReader.userGitConfig = new FileBasedConfig(new File(tmp, "usergitconfig"), FS.DETECTED); + // We have to set autoDetach to false for tests, because tests expect to be able + // to clean up by recursively removing the repository, and background GC might be + // in the middle of writing or deleting files, which would disrupt this. + mockSystemReader.userGitConfig.setBoolean(ConfigConstants.CONFIG_GC_SECTION, + null, ConfigConstants.CONFIG_KEY_AUTODETACH, false); + mockSystemReader.userGitConfig.save(); ceilTestDirectories(getCeilings()); SystemReader.setInstance(mockSystemReader); diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java index c43accdb6..0ce645139 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java @@ -74,6 +74,7 @@ public void testListConfig() throws Exception { String[] output = execute("git config --list"); List expect = new ArrayList<>(); + expect.add("gc.autoDetach=false"); expect.add("core.filemode=" + !isWindows); expect.add("core.logallrefupdates=true"); if (isMac) diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 644123236..822f1215d 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,5 +1,13 @@ + + + + + + + + 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 4ac399f9e..03065da8a 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -299,6 +299,8 @@ flagNotFromThis={0} not from this. flagsAlreadyCreated={0} flags already created. funnyRefname=funny refname gcFailed=Garbage collection failed. +gcLogExists=A previous GC run reported an error: ''{0}''. Automatic gc will fail until ''{1}'' is removed. +gcTooManyUnpruned=Too many loose, unpruneable objects after garbage collection. Consider adjusting gc.auto or gc.pruneExpire. gitmodulesNotFound=.gitmodules not found in tree. headRequiredToStash=HEAD required to stash local changes hoursAgo={0} hours ago 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 a81c93a01..32bfb7e57 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -358,6 +358,8 @@ public static JGitText get() { /***/ public String flagsAlreadyCreated; /***/ public String funnyRefname; /***/ public String gcFailed; + /***/ public String gcLogExists; + /***/ public String gcTooManyUnpruned; /***/ public String gitmodulesNotFound; /***/ public String headRequiredToStash; /***/ public String hoursAgo; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index ba52251a4..ef9aa37d0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -619,12 +619,18 @@ static void loadRulesFromFile(AttributesNode r, File attrs) } + private boolean shouldAutoDetach() { + return getConfig().getBoolean(ConfigConstants.CONFIG_GC_SECTION, + ConfigConstants.CONFIG_KEY_AUTODETACH, true); + } + @Override public void autoGC(ProgressMonitor monitor) { GC gc = new GC(this); gc.setPackConfig(new PackConfig(this)); gc.setProgressMonitor(monitor); gc.setAuto(true); + gc.setBackground(shouldAutoDetach()); try { gc.gc(); } catch (ParseException | IOException e) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index c68e5f7f3..e1b309da6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -50,6 +50,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.StringWriter; import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.file.DirectoryStream; @@ -73,11 +75,17 @@ import java.util.Objects; import java.util.Set; import java.util.TreeMap; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.dircache.DirCacheIterator; import org.eclipse.jgit.errors.CancelledException; import org.eclipse.jgit.errors.CorruptObjectException; @@ -143,6 +151,8 @@ public class GC { private static final int DEFAULT_AUTOLIMIT = 6700; + private static ExecutorService executor = Executors.newFixedThreadPool(1); + private final FileRepository repo; private ProgressMonitor pm; @@ -177,6 +187,11 @@ public class GC { */ private boolean automatic; + /** + * Whether to run gc in a background thread + */ + private boolean background; + /** * Creates a new garbage collector with default values. An expirationTime of * two weeks and null as progress monitor will be used. @@ -202,13 +217,73 @@ public GC(FileRepository repo) { * first check whether any housekeeping is required; if not, it exits * without performing any work. * + * If {@link #setBackground(boolean)} was set to {@code true} + * {@code collectGarbage} will start the gc in the background, and then + * return immediately. In this case, errors will not be reported except in + * gc.log. + * * @return the collection of {@link PackFile}'s which are newly created * @throws IOException * @throws ParseException * If the configuration parameter "gc.pruneexpire" couldn't be * parsed */ + // TODO(ms): in 5.0 change signature and return Future> public Collection gc() throws IOException, ParseException { + final GcLog gcLog = background ? new GcLog(repo) : null; + if (gcLog != null && !gcLog.lock(background)) { + // there is already a background gc running + return Collections.emptyList(); + } + + Callable> gcTask = () -> { + try { + Collection newPacks = doGc(); + if (automatic && tooManyLooseObjects() && gcLog != null) { + String message = JGitText.get().gcTooManyUnpruned; + gcLog.write(message); + gcLog.commit(); + } + return newPacks; + } catch (IOException | ParseException e) { + if (background) { + if (gcLog == null) { + // Lacking a log, there's no way to report this. + return Collections.emptyList(); + } + try { + gcLog.write(e.getMessage()); + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw)); + gcLog.write(sw.toString()); + gcLog.commit(); + } catch (IOException e2) { + e2.addSuppressed(e); + LOG.error(e2.getMessage(), e2); + } + } else { + throw new JGitInternalException(e.getMessage(), e); + } + } finally { + if (gcLog != null) { + gcLog.unlock(); + } + } + return Collections.emptyList(); + }; + Future> result = executor.submit(gcTask); + if (background) { + // TODO(ms): in 5.0 change signature and return the Future + return Collections.emptyList(); + } + try { + return result.get(); + } catch (InterruptedException | ExecutionException e) { + throw new IOException(e); + } + } + + private Collection doGc() throws IOException, ParseException { if (automatic && !needGc()) { return Collections.emptyList(); } @@ -1348,6 +1423,14 @@ public void setAuto(boolean auto) { this.automatic = auto; } + /** + * @param background + * whether to run the gc in a background thread. + */ + void setBackground(boolean background) { + this.background = background; + } + private boolean needGc() { if (tooManyPacks()) { addRepackAllOption(); @@ -1386,8 +1469,7 @@ boolean tooManyPacks() { * @return {@code true} if number of loose objects > gc.auto (default 6700) */ boolean tooManyLooseObjects() { - int auto = repo.getConfig().getInt(ConfigConstants.CONFIG_GC_SECTION, - ConfigConstants.CONFIG_KEY_AUTO, DEFAULT_AUTOLIMIT); + int auto = getLooseObjectLimit(); if (auto <= 0) { return false; } @@ -1419,4 +1501,9 @@ public boolean accept(Path file) throws IOException { } return false; } + + private int getLooseObjectLimit() { + return repo.getConfig().getInt(ConfigConstants.CONFIG_GC_SECTION, + ConfigConstants.CONFIG_KEY_AUTO, DEFAULT_AUTOLIMIT); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java new file mode 100644 index 000000000..9ea77cc7d --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java @@ -0,0 +1,191 @@ +/* + * Copyright (C) 2017 Two Sigma Open Source + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.eclipse.jgit.internal.storage.file; + +import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.util.GitDateParser; +import org.eclipse.jgit.util.SystemReader; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.attribute.FileTime; +import java.text.MessageFormat; +import java.text.ParseException; +import java.time.Instant; + +/** + * This class manages the gc.log file for a {@link FileRepository}. + */ +class GcLog { + private final FileRepository repo; + + private final File logFile; + + private final LockFile lock; + + private Instant gcLogExpire; + + private static final String LOG_EXPIRY_DEFAULT = "1.day.ago"; //$NON-NLS-1$ + + private boolean nonEmpty = false; + + /** + * Construct a GcLog object for a {@link FileRepository} + * + * @param repo + * the repository + */ + GcLog(FileRepository repo) { + this.repo = repo; + logFile = new File(repo.getDirectory(), "gc.log"); //$NON-NLS-1$ + lock = new LockFile(logFile); + } + + private Instant getLogExpiry() throws ParseException { + if (gcLogExpire == null) { + String logExpiryStr = repo.getConfig().getString( + ConfigConstants.CONFIG_GC_SECTION, null, + ConfigConstants.CONFIG_KEY_LOGEXPIRY); + if (logExpiryStr == null) { + logExpiryStr = LOG_EXPIRY_DEFAULT; + } + gcLogExpire = GitDateParser.parse(logExpiryStr, null, + SystemReader.getInstance().getLocale()).toInstant(); + } + return gcLogExpire; + } + + private boolean autoGcBlockedByOldLockFile(boolean background) { + try { + FileTime lastModified = Files.getLastModifiedTime(logFile.toPath()); + if (lastModified.toInstant().compareTo(getLogExpiry()) > 0) { + // There is an existing log file, which is too recent to ignore + if (!background) { + try (BufferedReader reader = Files + .newBufferedReader(logFile.toPath())) { + char[] buf = new char[1000]; + int len = reader.read(buf, 0, 1000); + String oldError = new String(buf, 0, len); + + throw new JGitInternalException(MessageFormat.format( + JGitText.get().gcLogExists, oldError, logFile)); + } + } + return true; + } + } catch (NoSuchFileException e) { + // No existing log file, OK. + } catch (IOException | ParseException e) { + throw new JGitInternalException(e.getMessage(), e); + } + return false; + } + + /** + * Lock the GC log file for updates + * + * @param background + * If true, and if gc.log already exists, unlock and return false + * @return {@code true} if we hold the lock + */ + boolean lock(boolean background) { + try { + if (!lock.lock()) { + return false; + } + } catch (IOException e) { + throw new JGitInternalException(e.getMessage(), e); + } + if (autoGcBlockedByOldLockFile(background)) { + lock.unlock(); + return false; + } + return true; + } + + /** + * Unlock (roll back) the GC log lock + */ + void unlock() { + lock.unlock(); + } + + /** + * Commit changes to the gc log, if there have been any writes. Otherwise, + * just unlock and delete the existing file (if any) + * + * @return true if committing (or unlocking/deleting) succeeds. + */ + boolean commit() { + if (nonEmpty) { + return lock.commit(); + } else { + logFile.delete(); + lock.unlock(); + return true; + } + } + + /** + * Write to the pending gc log. Content will be committed upon a call to + * commit() + * + * @param content + * The content to write + * @throws IOException + */ + void write(String content) throws IOException { + if (content.length() > 0) { + nonEmpty = true; + } + lock.write(content.getBytes(UTF_8)); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 74fc7067a..189361b70 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -290,6 +290,20 @@ public class ConfigConstants { */ public static final String CONFIG_KEY_PRUNEPACKEXPIRE = "prunepackexpire"; + /** + * The "logexpiry" key + * + * @since 4.7 + */ + public static final String CONFIG_KEY_LOGEXPIRY = "logExpiry"; + + /** + * The "autodetach" key + * + * @since 4.7 + */ + public static final String CONFIG_KEY_AUTODETACH = "autoDetach"; + /** * The "aggressiveDepth" key * @since 3.6 From a66e60a98620c5ba9cd3d9fc8f97f268229589e6 Mon Sep 17 00:00:00 2001 From: Yasuhiro Takagi Date: Sat, 29 Apr 2017 20:35:10 +0900 Subject: [PATCH 3/7] ArchiveCommand: Create prefix entry with commit time The cgit archive command creates a prefix (root) directory entry in the archive file. That entry's time is set to the commit time. This patch makes jgit's behavior consistent with with cgit: prefix: hoge/ -> creates prefix directory "hoge/" entry. prefix: hoge//// -> creates prefix directory "hoge/" entry. prefix: hoge/foo -> does not create prefix directory entry, but for each file/directory entry, prefix is added. Change-Id: I2610e40ce37972c5f7456fdca6337e7fb07176e5 Signed-off-by: Yasuhiro Takagi --- .../tst/org/eclipse/jgit/pgm/ArchiveTest.java | 8 ++++---- .../src/org/eclipse/jgit/api/ArchiveCommand.java | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java index 18c49ea28..6f32bfaa5 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java @@ -348,7 +348,7 @@ public void testArchivePrefixOption() throws Exception { commitBazAndFooSlashBar(); byte[] result = CLIGitCommand.executeRaw( "git archive --prefix=x/ --format=zip master", db).outBytes(); - String[] expect = { "x/baz", "x/foo/", "x/foo/bar" }; + String[] expect = { "x/", "x/baz", "x/foo/", "x/foo/bar" }; String[] actual = listZipEntries(result); Arrays.sort(expect); @@ -361,7 +361,7 @@ public void testTarPrefixOption() throws Exception { commitBazAndFooSlashBar(); byte[] result = CLIGitCommand.executeRaw( "git archive --prefix=x/ --format=tar master", db).outBytes(); - String[] expect = { "x/baz", "x/foo/", "x/foo/bar" }; + String[] expect = { "x/", "x/baz", "x/foo/", "x/foo/bar" }; String[] actual = listTarEntries(result); Arrays.sort(expect); @@ -380,7 +380,7 @@ public void testPrefixDoesNotNormalizeDoubleSlash() throws Exception { commitFoo(); byte[] result = CLIGitCommand.executeRaw( "git archive --prefix=x// --format=zip master", db).outBytes(); - String[] expect = { "x//foo" }; + String[] expect = { "x/", "x//foo" }; assertArrayEquals(expect, listZipEntries(result)); } @@ -389,7 +389,7 @@ public void testPrefixDoesNotNormalizeDoubleSlashInTar() throws Exception { commitFoo(); byte[] result = CLIGitCommand.executeRaw( "git archive --prefix=x// --format=tar master", db).outBytes(); - String[] expect = { "x//foo" }; + String[] expect = { "x/", "x//foo" }; assertArrayEquals(expect, listTarEntries(result)); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java index 0d18eb3d0..7ea8e73b3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java @@ -403,6 +403,12 @@ private OutputStream writeArchive(Format fmt) { if (!paths.isEmpty()) walk.setFilter(PathFilterGroup.createFromStrings(paths)); + // Put base directory into archive + if (pfx.endsWith("/")) { //$NON-NLS-1$ + fmt.putEntry(outa, tree, pfx.replaceAll("[/]+$", "/"), //$NON-NLS-1$ //$NON-NLS-2$ + FileMode.TREE, null); + } + while (walk.next()) { String name = pfx + walk.getPathString(); FileMode mode = walk.getFileMode(0); From 1d1429697595040c3321e7c5406329b7e8fff48c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 8 Jun 2017 01:19:38 +0200 Subject: [PATCH 4/7] JGit v4.7.1.201706071930-r Change-Id: I28cd8fbe995d76c8a00e7db6ddf826e983d89043 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 56 files changed, 59 insertions(+), 59 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7720d33ae..0b1ff2686 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 10c630105..5f8a1ccde 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 f51ec5089..fae426a1a 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[4.7.1,4.8.0)" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index bda8af50c..038524188 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 fd51e30bb..d7753c31e 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: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 09db2a43c..725fe5941 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: 4.7.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.7.1.qualifier";roots="." +Bundle-Version: 4.7.1.201706071930-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.7.1.201706071930-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a1d11154f..2e7bbb1a6 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d58eed5c9..c825ee544 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: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index c28958a42..d200d7eed 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 f335b4439..94f5c813e 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/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.server -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.http.server;version="4.7.1", diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 37c0c3bcd..8be19155c 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 61ed994da..47a216b0b 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: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 51f78c999..486c67d8c 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index bd7fcfdd1..f24384f60 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: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 8b8073889..30fd55f56 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 d9ae52b3c..e857ce063 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/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 -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 97cd8696f..cf25c3f08 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 3f8762e78..b8895a682 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.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.lfs.server.test -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index ab1896628..70b0f9da4 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index aa2762f4e..a099118fb 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.lfs.server;version="4.7.1"; diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 5fe68de2a..786ac030e 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index eaabe900a..c3c558008 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.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.lfs.test -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index d58ff5846..89daed5f7 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index c9ca86452..2d24f1d11 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.lfs;version="4.7.1", diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 2a517a0b9..52c2bce05 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 5f1dae3e5..0f300b0ee 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 47507505a..5242f9960 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 b925415bb..4309f942b 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 0cff96eb9..d124f22e3 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 e105700e1..4cd7587e0 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 5f40e63ff..883a7fddc 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 6354b3629..b620523d9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 564c75052..9f22e1cfa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 a7fe9250c..7cc7de28e 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 d2d539418..88904ab55 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 57238184d..bf7e58a8b 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 e059b23ce..43426e6da 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 387909c36..e85c207fd 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 460684361..72cb1a460 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 edc749d8a..31ebb6b48 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 cceecd36a..185cf5805 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: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-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 8716d7c34..b6ef3de45 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 6dcffbdd3..99e0705d2 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 eb1cf15bc..c2a09bb91 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.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.pgm.test -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 21ae79d12..3d005c6cb 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 3a97aafbd..bf24a1a01 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index f6d2297fd..5d6010e08 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: 4.7.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.7.1.qualifier";roots="." +Bundle-Version: 4.7.1.201706071930-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.7.1.201706071930-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index d3f34d2c2..544cab4d0 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 00659d8de..2f98375af 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.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.test -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index aac4c333a..78df7e264 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-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 d8eb6224b..330b9074f 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.awtui;version="4.7.1" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 557f613a1..0fcd11093 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 - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 5ba934a13..c9bca8149 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.7.1.qualifier +Bundle-Version: 4.7.1.201706071930-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 18abbbd8a..e04e2c7e3 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: 4.7.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="4.7.1.qualifier";roots="." +Bundle-Version: 4.7.1.201706071930-r +Eclipse-SourceBundle: org.eclipse.jgit;version="4.7.1.201706071930-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 9d84146d1..12321e465 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index b2f42804a..0430e5cfe 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.7.1-SNAPSHOT + 4.7.1.201706071930-r JGit - Parent ${jgit-url} From 8afd9b164846e15a52cb85cd9093d9c94a4fc864 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 8 Jun 2017 13:33:25 +0200 Subject: [PATCH 5/7] Prepare 4.7.2-SNAPSHOT builds Change-Id: I7c127bd402cd84c68d8f33a32c6aad093a2264c8 Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 14 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 26 +++--- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++--- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 36 ++++---- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +++---- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 24 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 28 +++--- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 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 | 36 ++++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 80 ++++++++--------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 86 +++++++++---------- 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 | 84 +++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 56 files changed, 321 insertions(+), 321 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0b1ff2686..0380568a0 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[4.7.1,4.8.0)", - org.eclipse.jgit.junit;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", + org.eclipse.jgit.ant.tasks;version="[4.7.2,4.8.0)", + org.eclipse.jgit.junit;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)", org.hamcrest.core;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 5f8a1ccde..79c81af4b 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 - 4.7.1.201706071930-r + 4.7.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 fae426a1a..6ca7f1cbf 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: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[4.7.1,4.8.0)" + org.eclipse.jgit.storage.file;version="[4.7.2,4.8.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="4.7.1"; +Export-Package: org.eclipse.jgit.ant.tasks;version="4.7.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 038524188..5b888e947 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 - 4.7.1.201706071930-r + 4.7.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 d7753c31e..bf545715a 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: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -12,15 +12,15 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", + org.eclipse.jgit.api;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.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="4.7.1"; +Export-Package: org.eclipse.jgit.archive;version="4.7.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 725fe5941..8d955b63f 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: 4.7.1.201706071930-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.7.1.201706071930-r";roots="." +Bundle-Version: 4.7.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 2e7bbb1a6..0646c6d0a 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 - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c825ee544..67ed71427 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: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -22,10 +22,10 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.client;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.3.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.http;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="4.7.1"; + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.http;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="4.7.2"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index d200d7eed..66086f40b 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 - 4.7.1.201706071930-r + 4.7.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 94f5c813e..5f0d8887b 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="4.7.1", - org.eclipse.jgit.http.server.glue;version="4.7.1"; +Export-Package: org.eclipse.jgit.http.server;version="4.7.2", + org.eclipse.jgit.http.server.glue;version="4.7.2"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="4.7.1"; + org.eclipse.jgit.http.server.resolver;version="4.7.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -17,12 +17,12 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.resolver;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)" + org.eclipse.jgit.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.resolver;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 8be19155c..669e457c1 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 - 4.7.1.201706071930-r + 4.7.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 47a216b0b..5817ce3fa 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: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -22,24 +22,24 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)", org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)", org.eclipse.jetty.util.thread;version="[9.0.0,9.4.0)", - org.eclipse.jgit.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.http.server;version="[4.7.1,4.8.0)", - org.eclipse.jgit.http.server.glue;version="[4.7.1,4.8.0)", - org.eclipse.jgit.http.server.resolver;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.junit;version="[4.7.1,4.8.0)", - org.eclipse.jgit.junit.http;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.http;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.http.apache;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.resolver;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", + org.eclipse.jgit.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.http.server;version="[4.7.2,4.8.0)", + org.eclipse.jgit.http.server.glue;version="[4.7.2,4.8.0)", + org.eclipse.jgit.http.server.resolver;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.junit;version="[4.7.2,4.8.0)", + org.eclipse.jgit.junit.http;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.http;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.http.apache;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.resolver;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.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 486c67d8c..eee009281 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 - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index f24384f60..b313dfa15 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: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,16 +20,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.component;version="[9.0.0,9.4.0)", org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)", org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)", - org.eclipse.jgit.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.http.server;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.junit;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.resolver;version="[4.7.1,4.8.0)", + org.eclipse.jgit.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.http.server;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.junit;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.resolver;version="[4.7.2,4.8.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="4.7.1"; +Export-Package: org.eclipse.jgit.junit.http;version="4.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 30fd55f56..ecd612295 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 - 4.7.1.201706071930-r + 4.7.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 e857ce063..2ddb6386c 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,31 +2,31 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[4.7.1,4.8.0)", - org.eclipse.jgit.api.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.dircache;version="[4.7.1,4.8.0)", - org.eclipse.jgit.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.merge;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk.filter;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util.io;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util.time;version="[4.7.1,4.8.0)", +Import-Package: org.eclipse.jgit.api;version="[4.7.2,4.8.0)", + org.eclipse.jgit.api.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.dircache;version="[4.7.2,4.8.0)", + org.eclipse.jgit.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.merge;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk.filter;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util.io;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util.time;version="[4.7.2,4.8.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.rules;version="[4.9.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", org.junit.runners.model;version="[4.5.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="4.7.1"; +Export-Package: org.eclipse.jgit.junit;version="4.7.2"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -35,4 +35,4 @@ Export-Package: org.eclipse.jgit.junit;version="4.7.1"; org.eclipse.jgit.util, org.eclipse.jgit.storage.file, org.eclipse.jgit.api", - org.eclipse.jgit.junit.time;version="4.7.1" + org.eclipse.jgit.junit.time;version="4.7.2" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index cf25c3f08..149647093 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 - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index b8895a682..aa696099a 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.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.lfs.server.test -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -27,11 +27,11 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)", org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)", org.eclipse.jetty.util.thread;version="[9.0.0,9.4.0)", - org.eclipse.jgit.junit.http;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.server.fs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.test;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", + org.eclipse.jgit.junit.http;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.test;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.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.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 70b0f9da4..f687723ca 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index a099118fb..773f0dc0d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -2,19 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs.server;version="4.7.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="4.7.2"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="4.7.1"; + org.eclipse.jgit.lfs.server.fs;version="4.7.2"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="4.7.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="4.7.1"; + org.eclipse.jgit.lfs.server.internal;version="4.7.2";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="4.7.2"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -24,14 +24,14 @@ Import-Package: com.google.gson;version="[2.2.4,3.0.0)", javax.servlet.http;version="[3.1.0,4.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.internal;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.http;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.http.apache;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", + org.eclipse.jgit.annotations;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.internal;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.http;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.http.apache;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 786ac030e..0a719ae90 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index c3c558008..3cc104881 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.junit;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk.filter;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", +Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.junit;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk.filter;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.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)", org.junit.runners;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="4.7.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="4.7.2";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 89daed5f7..cb77a17fc 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 2d24f1d11..de2bec62c 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -2,20 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs;version="4.7.1", - org.eclipse.jgit.lfs.errors;version="4.7.1", - org.eclipse.jgit.lfs.internal;version="4.7.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="4.7.1" +Export-Package: org.eclipse.jgit.lfs;version="4.7.2", + org.eclipse.jgit.lfs.errors;version="4.7.2", + org.eclipse.jgit.lfs.internal;version="4.7.2";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="4.7.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[4.7.1,4.8.0)";resolution:=optional, - org.eclipse.jgit.attributes;version="[4.7.1,4.8.0)", - org.eclipse.jgit.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk.filter;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)" +Import-Package: org.eclipse.jgit.annotations;version="[4.7.2,4.8.0)";resolution:=optional, + org.eclipse.jgit.attributes;version="[4.7.2,4.8.0)", + org.eclipse.jgit.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk.filter;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)" diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 52c2bce05..54e4445ec 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 0f300b0ee..c244338b0 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 5242f9960..b90c14de3 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 - 4.7.1.201706071930-r + 4.7.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 4309f942b..0abf4bddd 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 d124f22e3..af4e71fb8 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 - 4.7.1.201706071930-r + 4.7.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 4cd7587e0..74b99250e 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 883a7fddc..4f66ab60c 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 - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index b620523d9..7daa0b211 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 9f22e1cfa..2ea040db4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.7.1.201706071930-r + 4.7.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 7cc7de28e..546539b1c 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 88904ab55..55d665750 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 - 4.7.1.201706071930-r + 4.7.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 bf7e58a8b..8aa961844 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 43426e6da..5057957df 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 - 4.7.1.201706071930-r + 4.7.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 e85c207fd..c64d62cbc 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 - 4.7.1.201706071930-r + 4.7.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 72cb1a460..b3feeb7e6 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 31ebb6b48..e23b722f4 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 - 4.7.1.201706071930-r + 4.7.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 185cf5805..65dabc3d8 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: 4.7.1.201706071930-r +Bundle-Version: 4.7.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 b6ef3de45..ad92198df 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 - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 99e0705d2..b284442c4 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 - 4.7.1.201706071930-r + 4.7.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 c2a09bb91..3cba803b0 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,28 +2,28 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[4.7.1,4.8.0)", - org.eclipse.jgit.api.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.diff;version="[4.7.1,4.8.0)", - org.eclipse.jgit.dircache;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="4.7.1", - org.eclipse.jgit.junit;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.merge;version="[4.7.1,4.8.0)", - org.eclipse.jgit.pgm;version="[4.7.1,4.8.0)", - org.eclipse.jgit.pgm.internal;version="[4.7.1,4.8.0)", - org.eclipse.jgit.pgm.opt;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util.io;version="[4.7.1,4.8.0)", +Import-Package: org.eclipse.jgit.api;version="[4.7.2,4.8.0)", + org.eclipse.jgit.api.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.diff;version="[4.7.2,4.8.0)", + org.eclipse.jgit.dircache;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="4.7.2", + org.eclipse.jgit.junit;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.merge;version="[4.7.2,4.8.0)", + org.eclipse.jgit.pgm;version="[4.7.2,4.8.0)", + org.eclipse.jgit.pgm.internal;version="[4.7.2,4.8.0)", + org.eclipse.jgit.pgm.opt;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util.io;version="[4.7.2,4.8.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.11.0,5.0.0)", org.junit.rules;version="[4.11.0,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 3d005c6cb..4cc2eebc7 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 - 4.7.1.201706071930-r + 4.7.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 bf24a1a01..7a8b1e735 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -27,46 +27,46 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,9.4.0)", org.eclipse.jetty.util.security;version="[9.0.0,9.4.0)", org.eclipse.jetty.util.thread;version="[9.0.0,9.4.0)", - org.eclipse.jgit.api;version="[4.7.1,4.8.0)", - org.eclipse.jgit.api.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.archive;version="[4.7.1,4.8.0)", - org.eclipse.jgit.awtui;version="[4.7.1,4.8.0)", - org.eclipse.jgit.blame;version="[4.7.1,4.8.0)", - org.eclipse.jgit.diff;version="[4.7.1,4.8.0)", - org.eclipse.jgit.dircache;version="[4.7.1,4.8.0)", - org.eclipse.jgit.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.gitrepo;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.ketch;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.server;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.server.fs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs.server.s3;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.merge;version="[4.7.1,4.8.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.notes;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revplot;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk.filter;version="[4.7.1,4.8.0)", - org.eclipse.jgit.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.storage.pack;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.http.apache;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.resolver;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk.filter;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util.io;version="[4.7.1,4.8.0)", + org.eclipse.jgit.api;version="[4.7.2,4.8.0)", + org.eclipse.jgit.api.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.archive;version="[4.7.2,4.8.0)", + org.eclipse.jgit.awtui;version="[4.7.2,4.8.0)", + org.eclipse.jgit.blame;version="[4.7.2,4.8.0)", + org.eclipse.jgit.diff;version="[4.7.2,4.8.0)", + org.eclipse.jgit.dircache;version="[4.7.2,4.8.0)", + org.eclipse.jgit.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.gitrepo;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.ketch;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.server;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs.server.s3;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.merge;version="[4.7.2,4.8.0)", + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.notes;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revplot;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk.filter;version="[4.7.2,4.8.0)", + org.eclipse.jgit.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.storage.pack;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.http.apache;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.resolver;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk.filter;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util.io;version="[4.7.2,4.8.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)" -Export-Package: org.eclipse.jgit.console;version="4.7.1"; +Export-Package: org.eclipse.jgit.console;version="4.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="4.7.1"; + org.eclipse.jgit.pgm;version="4.7.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -77,11 +77,11 @@ Export-Package: org.eclipse.jgit.console;version="4.7.1"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="4.7.1"; + org.eclipse.jgit.pgm.debug;version="4.7.2"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="4.7.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="4.7.1"; + org.eclipse.jgit.pgm.internal;version="4.7.2";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="4.7.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 5d6010e08..913c8f417 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: 4.7.1.201706071930-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.7.1.201706071930-r";roots="." +Bundle-Version: 4.7.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 544cab4d0..8bad5ce87 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 - 4.7.1.201706071930-r + 4.7.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 2f98375af..73c1a03e1 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,54 +2,54 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", - org.eclipse.jgit.api;version="[4.7.1,4.8.0)", - org.eclipse.jgit.api.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.attributes;version="[4.7.1,4.8.0)", - org.eclipse.jgit.awtui;version="[4.7.1,4.8.0)", - org.eclipse.jgit.blame;version="[4.7.1,4.8.0)", - org.eclipse.jgit.diff;version="[4.7.1,4.8.0)", - org.eclipse.jgit.dircache;version="[4.7.1,4.8.0)", - org.eclipse.jgit.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.events;version="[4.7.1,4.8.0)", - org.eclipse.jgit.fnmatch;version="[4.7.1,4.8.0)", - org.eclipse.jgit.gitrepo;version="[4.7.1,4.8.0)", - org.eclipse.jgit.hooks;version="[4.7.1,4.8.0)", - org.eclipse.jgit.ignore;version="[4.7.1,4.8.0)", - org.eclipse.jgit.ignore.internal;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.7.1,4.8.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.7.1,4.8.0)", - org.eclipse.jgit.junit;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lfs;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.merge;version="[4.7.1,4.8.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.notes;version="[4.7.1,4.8.0)", - org.eclipse.jgit.patch;version="[4.7.1,4.8.0)", - org.eclipse.jgit.pgm;version="[4.7.1,4.8.0)", - org.eclipse.jgit.pgm.internal;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revplot;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk.filter;version="[4.7.1,4.8.0)", - org.eclipse.jgit.storage.file;version="[4.7.1,4.8.0)", - org.eclipse.jgit.storage.pack;version="[4.7.1,4.8.0)", - org.eclipse.jgit.submodule;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.http;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport.resolver;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.treewalk.filter;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util.io;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util.sha1;version="[4.7.1,4.8.0)", + org.eclipse.jgit.api;version="[4.7.2,4.8.0)", + org.eclipse.jgit.api.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.attributes;version="[4.7.2,4.8.0)", + org.eclipse.jgit.awtui;version="[4.7.2,4.8.0)", + org.eclipse.jgit.blame;version="[4.7.2,4.8.0)", + org.eclipse.jgit.diff;version="[4.7.2,4.8.0)", + org.eclipse.jgit.dircache;version="[4.7.2,4.8.0)", + org.eclipse.jgit.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.events;version="[4.7.2,4.8.0)", + org.eclipse.jgit.fnmatch;version="[4.7.2,4.8.0)", + org.eclipse.jgit.gitrepo;version="[4.7.2,4.8.0)", + org.eclipse.jgit.hooks;version="[4.7.2,4.8.0)", + org.eclipse.jgit.ignore;version="[4.7.2,4.8.0)", + org.eclipse.jgit.ignore.internal;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.7.2,4.8.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.7.2,4.8.0)", + org.eclipse.jgit.junit;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lfs;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.merge;version="[4.7.2,4.8.0)", + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.notes;version="[4.7.2,4.8.0)", + org.eclipse.jgit.patch;version="[4.7.2,4.8.0)", + org.eclipse.jgit.pgm;version="[4.7.2,4.8.0)", + org.eclipse.jgit.pgm.internal;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revplot;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk.filter;version="[4.7.2,4.8.0)", + org.eclipse.jgit.storage.file;version="[4.7.2,4.8.0)", + org.eclipse.jgit.storage.pack;version="[4.7.2,4.8.0)", + org.eclipse.jgit.submodule;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.http;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport.resolver;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.treewalk.filter;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util.io;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util.sha1;version="[4.7.2,4.8.0)", org.junit;version="[4.4.0,5.0.0)", org.junit.experimental.theories;version="[4.4.0,5.0.0)", org.junit.rules;version="[4.11.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 78df7e264..6ea064238 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 - 4.7.1.201706071930-r + 4.7.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 330b9074f..e4834a50a 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: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="4.7.1" -Import-Package: org.eclipse.jgit.errors;version="[4.7.1,4.8.0)", - org.eclipse.jgit.lib;version="[4.7.1,4.8.0)", - org.eclipse.jgit.nls;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revplot;version="[4.7.1,4.8.0)", - org.eclipse.jgit.revwalk;version="[4.7.1,4.8.0)", - org.eclipse.jgit.transport;version="[4.7.1,4.8.0)", - org.eclipse.jgit.util;version="[4.7.1,4.8.0)" +Export-Package: org.eclipse.jgit.awtui;version="4.7.2" +Import-Package: org.eclipse.jgit.errors;version="[4.7.2,4.8.0)", + org.eclipse.jgit.lib;version="[4.7.2,4.8.0)", + org.eclipse.jgit.nls;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revplot;version="[4.7.2,4.8.0)", + org.eclipse.jgit.revwalk;version="[4.7.2,4.8.0)", + org.eclipse.jgit.transport;version="[4.7.2,4.8.0)", + org.eclipse.jgit.util;version="[4.7.2,4.8.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 0fcd11093..655e13bde 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 - 4.7.1.201706071930-r + 4.7.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 c9bca8149..aa88e21c9 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.7.1.201706071930-r +Bundle-Version: 4.7.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.annotations;version="4.7.1", - org.eclipse.jgit.api;version="4.7.1"; +Export-Package: org.eclipse.jgit.annotations;version="4.7.2", + org.eclipse.jgit.api;version="4.7.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -21,51 +21,51 @@ Export-Package: org.eclipse.jgit.annotations;version="4.7.1", org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="4.7.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="4.7.1", - org.eclipse.jgit.blame;version="4.7.1"; + org.eclipse.jgit.api.errors;version="4.7.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", + org.eclipse.jgit.attributes;version="4.7.2", + org.eclipse.jgit.blame;version="4.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="4.7.1"; + org.eclipse.jgit.diff;version="4.7.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="4.7.1"; + org.eclipse.jgit.dircache;version="4.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events, org.eclipse.jgit.attributes", - org.eclipse.jgit.errors;version="4.7.1"; + org.eclipse.jgit.errors;version="4.7.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="4.7.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="4.7.1", - org.eclipse.jgit.gitrepo;version="4.7.1"; + org.eclipse.jgit.events;version="4.7.2";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.fnmatch;version="4.7.2", + org.eclipse.jgit.gitrepo;version="4.7.2"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax.helpers, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="4.7.1";x-internal:=true, - org.eclipse.jgit.hooks;version="4.7.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="4.7.1", - org.eclipse.jgit.ignore.internal;version="4.7.1";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="4.7.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.ketch;version="4.7.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.dfs;version="4.7.1"; + org.eclipse.jgit.gitrepo.internal;version="4.7.2";x-internal:=true, + org.eclipse.jgit.hooks;version="4.7.2";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="4.7.2", + org.eclipse.jgit.ignore.internal;version="4.7.2";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="4.7.2";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.ketch;version="4.7.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.dfs;version="4.7.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="4.7.1"; + org.eclipse.jgit.internal.storage.file;version="4.7.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -73,9 +73,9 @@ Export-Package: org.eclipse.jgit.annotations;version="4.7.1", org.eclipse.jgit.lfs, org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test", - org.eclipse.jgit.internal.storage.pack;version="4.7.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftree;version="4.7.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="4.7.1"; + org.eclipse.jgit.internal.storage.pack;version="4.7.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.reftree;version="4.7.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="4.7.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -85,32 +85,32 @@ Export-Package: org.eclipse.jgit.annotations;version="4.7.1", org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.merge;version="4.7.1"; + org.eclipse.jgit.merge;version="4.7.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.api", - org.eclipse.jgit.nls;version="4.7.1", - org.eclipse.jgit.notes;version="4.7.1"; + org.eclipse.jgit.nls;version="4.7.2", + org.eclipse.jgit.notes;version="4.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="4.7.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="4.7.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="4.7.1"; + org.eclipse.jgit.patch;version="4.7.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", + org.eclipse.jgit.revplot;version="4.7.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", + org.eclipse.jgit.revwalk;version="4.7.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="4.7.1";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="4.7.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="4.7.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="4.7.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="4.7.1"; + org.eclipse.jgit.revwalk.filter;version="4.7.2";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.file;version="4.7.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.pack;version="4.7.2";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.submodule;version="4.7.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", + org.eclipse.jgit.transport;version="4.7.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -122,24 +122,24 @@ Export-Package: org.eclipse.jgit.annotations;version="4.7.1", org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="4.7.1";uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="4.7.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="4.7.1"; + org.eclipse.jgit.transport.http;version="4.7.2";uses:="javax.net.ssl", + org.eclipse.jgit.transport.resolver;version="4.7.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", + org.eclipse.jgit.treewalk;version="4.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="4.7.1";uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="4.7.1"; + org.eclipse.jgit.treewalk.filter;version="4.7.2";uses:="org.eclipse.jgit.treewalk", + org.eclipse.jgit.util;version="4.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="4.7.1", - org.eclipse.jgit.util.sha1;version="4.7.1", - org.eclipse.jgit.util.time;version="4.7.1" + org.eclipse.jgit.util.io;version="4.7.2", + org.eclipse.jgit.util.sha1;version="4.7.2", + org.eclipse.jgit.util.time;version="4.7.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index e04e2c7e3..d849a0e5b 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: 4.7.1.201706071930-r -Eclipse-SourceBundle: org.eclipse.jgit;version="4.7.1.201706071930-r";roots="." +Bundle-Version: 4.7.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="4.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 12321e465..3feb52300 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 0430e5cfe..76ea00949 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.7.1.201706071930-r + 4.7.2-SNAPSHOT JGit - Parent ${jgit-url} From 9c7b95684c87eb82f6b8641188c2d51802dc7c34 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 1 Jun 2017 13:49:58 +0900 Subject: [PATCH 6/7] CloneCommand#setCallback should return 'this' The other methods in this class follow the builder pattern, and return 'this', allowing multiple method calls to be chained in a single statement. Update the setCallback method to do the same. Change-Id: I0366d28bf66ba47f08ee7eee636d613c9fe079f5 Signed-off-by: David Pursehouse --- org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java index a6ea66bc0..d450c6467 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java @@ -611,10 +611,12 @@ public CloneCommand setNoCheckout(boolean noCheckout) { * * @param callback * the callback + * @return {@code this} * @since 4.8 */ - public void setCallback(Callback callback) { + public CloneCommand setCallback(Callback callback) { this.callback = callback; + return this; } private static void validateDirs(File directory, File gitDir, boolean bare) From 4acad15086bb03c3b75a2ed82a3b57e412dfd518 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 10 Jun 2017 00:58:23 +0200 Subject: [PATCH 7/7] SubmoduleUpdateCommand#setCallback should return 'this' The other methods in this class follow the builder pattern, and return 'this', allowing multiple method calls to be chained in a single statement. Update the setCallback method to do the same. Change-Id: I4ddaacd6d50601f47f61eb6be8b62c8d59cce062 Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java index 34bfbe75b..4d3dff02c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java @@ -240,9 +240,11 @@ public SubmoduleUpdateCommand setStrategy(MergeStrategy strategy) { * * @param callback * the callback + * @return {@code this} * @since 4.8 */ - public void setCallback(CloneCommand.Callback callback) { + public SubmoduleUpdateCommand setCallback(CloneCommand.Callback callback) { this.callback = callback; + return this; } }