You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/10/01 01:21:58 UTC
[GitHub] ocafebabe closed pull request #535: [NETBEANS-519] Bump Eclipse
JGit dependency to latest version
ocafebabe closed pull request #535: [NETBEANS-519] Bump Eclipse JGit dependency to latest version
URL: https://github.com/apache/incubator-netbeans/pull/535
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9-license.txt b/c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-1.1.6-license.txt
similarity index 99%
rename from c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9-license.txt
rename to c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-1.1.6-license.txt
index 1584d4a7d0..35dd48bf40 100644
--- a/c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9-license.txt
+++ b/c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-1.1.6-license.txt
@@ -1,5 +1,5 @@
Name: JavaEWAH
-Version: 0.7.9
+Version: 1.1.6
License: Apache-2.0
Origin: JavaEWAH Project
URL: https://github.com/lemire/javaewah
diff --git a/c.googlecode.javaewah.JavaEWAH/external/binaries-list b/c.googlecode.javaewah.JavaEWAH/external/binaries-list
index 8c309a1bc2..11cac1db47 100644
--- a/c.googlecode.javaewah.JavaEWAH/external/binaries-list
+++ b/c.googlecode.javaewah.JavaEWAH/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-ECEAF316A8FAF0E794296EBE158AE110C7D72A5A com.googlecode.javaewah:JavaEWAH:0.7.9
+94AD16D728B374D65BD897625F3FBB3DA223A2B6 com.googlecode.javaewah:JavaEWAH:1.1.6
diff --git a/c.googlecode.javaewah.JavaEWAH/nbproject/project.properties b/c.googlecode.javaewah.JavaEWAH/nbproject/project.properties
index 3bdaa1be35..8df7bfc9b3 100644
--- a/c.googlecode.javaewah.JavaEWAH/nbproject/project.properties
+++ b/c.googlecode.javaewah.JavaEWAH/nbproject/project.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
-release.external/JavaEWAH-0.7.9.jar=modules/com-googlecode-javaewah-JavaEWAH.jar
+release.external/JavaEWAH-1.1.6.jar=modules/com-googlecode-javaewah-JavaEWAH.jar
diff --git a/c.googlecode.javaewah.JavaEWAH/nbproject/project.xml b/c.googlecode.javaewah.JavaEWAH/nbproject/project.xml
index 01cbee18b2..8ab3cf5429 100644
--- a/c.googlecode.javaewah.JavaEWAH/nbproject/project.xml
+++ b/c.googlecode.javaewah.JavaEWAH/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>com-googlecode-javaewah-JavaEWAH.jar</runtime-relative-path>
- <binary-origin>external/JavaEWAH-0.7.9.jar</binary-origin>
+ <binary-origin>external/JavaEWAH-1.1.6.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/c.jcraft.jsch/build.xml b/c.jcraft.jsch/build.xml
index e8ba5b9e49..333179c764 100644
--- a/c.jcraft.jsch/build.xml
+++ b/c.jcraft.jsch/build.xml
@@ -28,7 +28,7 @@
<manifest>
<attribute name="Bundle-SymbolicName" value="com.jcraft.jsch"/>
<attribute name="Bundle-Version" value="0.1.54"/>
- <attribute name="Export-Package" value="com.jcraft.jsch"/>
+ <attribute name="Export-Package" value="com.jcraft.jsch;version=0.1.54"/>
<attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss"/>
<attribute name="Require-Bundle" value="com.jcraft.jzlib"/>
<attribute name="NB-Original-CRC" value="${c.jcraft.jsch.crc32}"/>
diff --git a/c.jcraft.jzlib/build.xml b/c.jcraft.jzlib/build.xml
index 16347ee42b..b040046fa5 100644
--- a/c.jcraft.jzlib/build.xml
+++ b/c.jcraft.jzlib/build.xml
@@ -22,12 +22,12 @@
<project name="c.jcraft.jzlib" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar" depends="-define-FileCRC32Calculator">
- <FileCRC32Calculator file="external/jzlib-1.0.7.jar" property="c.jcraft.jzlib.crc32" />
+ <FileCRC32Calculator file="external/jzlib-1.1.1.jar" property="c.jcraft.jzlib.crc32" />
<jar jarfile="${cluster}/${module.jar}">
- <zipfileset src="external/jzlib-1.0.7.jar"/>
+ <zipfileset src="external/jzlib-1.1.1.jar"/>
<manifest>
<attribute name="Bundle-SymbolicName" value="com.jcraft.jzlib"/>
- <attribute name="Bundle-Version" value="1.0.7"/>
+ <attribute name="Bundle-Version" value="1.1.1"/>
<attribute name="Export-Package" value="com.jcraft.jzlib"/>
<attribute name="NB-Original-CRC" value="${c.jcraft.jzlib.crc32}"/>
</manifest>
diff --git a/c.jcraft.jzlib/external/binaries-list b/c.jcraft.jzlib/external/binaries-list
index 33a1f81e4f..537a9b7c95 100644
--- a/c.jcraft.jzlib/external/binaries-list
+++ b/c.jcraft.jzlib/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-BA26D908C6EABE519EF645D81D4E267DE7280F8F com.jcraft:jzlib:1.0.7
+A1551373315FFC2F96130A0E5704F74E151777BA com.jcraft:jzlib:1.1.1
diff --git a/c.jcraft.jzlib/external/jzlib-1.0.7-license.txt b/c.jcraft.jzlib/external/jzlib-1.1.1-license.txt
similarity index 99%
rename from c.jcraft.jzlib/external/jzlib-1.0.7-license.txt
rename to c.jcraft.jzlib/external/jzlib-1.1.1-license.txt
index be8bf267ee..0c5e9835ce 100644
--- a/c.jcraft.jzlib/external/jzlib-1.0.7-license.txt
+++ b/c.jcraft.jzlib/external/jzlib-1.1.1-license.txt
@@ -1,5 +1,5 @@
Name: JZlib
-Version: 1.0.7
+Version: 1.1.1
License: BSD-jzlib
Origin: JCraft, Inc.
URL: http://www.jcraft.com/jzlib/
diff --git a/c.jcraft.jzlib/nbproject/project.properties b/c.jcraft.jzlib/nbproject/project.properties
index d6e3ebad3f..153609aaba 100644
--- a/c.jcraft.jzlib/nbproject/project.properties
+++ b/c.jcraft.jzlib/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
is.autoload=true
-extra.license.files=external/jzlib-1.0.7-license.txt
+extra.license.files=external/jzlib-1.1.1-license.txt
spec.version.base=1.27.0
sigtest.gen.fail.on.error=false
diff --git a/c.jcraft.jzlib/nbproject/project.xml b/c.jcraft.jzlib/nbproject/project.xml
index 76ce929fdb..237e1e1702 100644
--- a/c.jcraft.jzlib/nbproject/project.xml
+++ b/c.jcraft.jzlib/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>com-jcraft-jzlib.jar</runtime-relative-path>
- <binary-origin>external/jzlib-1.0.7.jar</binary-origin>
+ <binary-origin>external/jzlib-1.1.1.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/ide.kit/module-auto-deps.xml b/ide.kit/module-auto-deps.xml
index b022d03e2a..1f90b33014 100644
--- a/ide.kit/module-auto-deps.xml
+++ b/ide.kit/module-auto-deps.xml
@@ -29,7 +29,7 @@
</trigger-dependency>
<implies>
<result>
- <module-dependency codenamebase="com.jcraft.jzlib" spec="1.0.7"/>
+ <module-dependency codenamebase="com.jcraft.jzlib" spec="1.1.1"/>
</result>
</implies>
</transformation>
@@ -39,7 +39,7 @@
</trigger-dependency>
<implies>
<result>
- <module-dependency codenamebase="com.jcraft.jsch" spec="0.1.43"/>
+ <module-dependency codenamebase="com.jcraft.jsch" spec="0.1.54"/>
</result>
</implies>
</transformation>
diff --git a/libs.git/nbproject/project.xml b/libs.git/nbproject/project.xml
index 1929ff8fa8..04e455ea7d 100644
--- a/libs.git/nbproject/project.xml
+++ b/libs.git/nbproject/project.xml
@@ -30,14 +30,14 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>0.1.49</specification-version>
+ <specification-version>0.1.54</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.eclipse.jgit</code-name-base>
<compile-dependency/>
<run-dependency>
- <specification-version>3.6.2</specification-version>
+ <specification-version>4.11.1</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -54,7 +54,7 @@
<test-type>
<name>unit</name>
<test-dependency>
- <code-name-base>org.eclipse.jgit.java7</code-name-base>
+ <code-name-base>org.eclipse.jgit</code-name-base>
<compile-dependency/>
</test-dependency>
<test-dependency>
diff --git a/libs.git/src/org/netbeans/libs/git/GitRefUpdateResult.java b/libs.git/src/org/netbeans/libs/git/GitRefUpdateResult.java
index eb0f1322cb..60e67b1326 100644
--- a/libs.git/src/org/netbeans/libs/git/GitRefUpdateResult.java
+++ b/libs.git/src/org/netbeans/libs/git/GitRefUpdateResult.java
@@ -147,6 +147,15 @@
*/
AWAITING_REPORT,
+ /**
+ * One or more objects aren't in the repository.
+ * <p>
+ * This is severe indication of either repository corruption on the
+ * server side, or a bug in the client wherein the client did not supply
+ * all required objects during the pack transfer.
+ */
+ REJECTED_MISSING_OBJECT,
+
/**
* Remote ref was successfully updated.
*/
diff --git a/libs.git/src/org/netbeans/libs/git/GitRevisionInfo.java b/libs.git/src/org/netbeans/libs/git/GitRevisionInfo.java
index 38c1ace998..c0688b6eac 100644
--- a/libs.git/src/org/netbeans/libs/git/GitRevisionInfo.java
+++ b/libs.git/src/org/netbeans/libs/git/GitRevisionInfo.java
@@ -173,9 +173,8 @@ public GitUser getCommitter () {
}
private void listFiles() throws GitException {
- RevWalk revWalk = new RevWalk(repository);
- TreeWalk walk = new TreeWalk(repository);
- try {
+ try (TreeWalk walk = new TreeWalk(repository);
+ RevWalk revWalk = new RevWalk(repository)) {
List<GitFileInfo> result;
walk.reset();
walk.setRecursive(true);
@@ -206,9 +205,6 @@ private void listFiles() throws GitException {
this.modifiedFiles = result.toArray(new GitFileInfo[result.size()]);
} catch (IOException ex) {
throw new GitException(ex);
- } finally {
- revWalk.release();
- walk.release();
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/IgnoreRule.java b/libs.git/src/org/netbeans/libs/git/jgit/IgnoreRule.java
index 9a0d29b6bb..42b7a79b72 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/IgnoreRule.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/IgnoreRule.java
@@ -23,7 +23,7 @@
*
* @author ondra
*/
-public class IgnoreRule extends org.eclipse.jgit.ignore.IgnoreRule {
+public class IgnoreRule extends org.eclipse.jgit.ignore.FastIgnoreRule {
private final String pattern;
private final String noNegationPattern;
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/AddCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/AddCommand.java
index 3b40abfd68..a67592368f 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/AddCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/AddCommand.java
@@ -86,9 +86,8 @@ protected void run() throws GitException {
Repository repository = getRepository();
try {
DirCache cache = null;
- ObjectInserter inserter = repository.newObjectInserter();
- ObjectReader or = repository.newObjectReader();
- try {
+ try (ObjectReader or = repository.newObjectReader();
+ ObjectInserter inserter = repository.newObjectInserter()) {
cache = repository.lockDirCache();
DirCacheBuilder builder = cache.builder();
TreeWalk treeWalk = new TreeWalk(repository);
@@ -179,8 +178,6 @@ protected void run() throws GitException {
builder.commit();
}
} finally {
- inserter.release();
- or.release();
if (cache != null ) {
cache.unlock();
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/CheckoutRevisionCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/CheckoutRevisionCommand.java
index f5723b2998..3cf29eb41d 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/CheckoutRevisionCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/CheckoutRevisionCommand.java
@@ -96,7 +96,7 @@ public CheckoutRevisionCommand (Repository repository, GitClassFactory gitFactor
protected void run () throws GitException {
Repository repository = getRepository();
try {
- Ref headRef = repository.getRef(Constants.HEAD);
+ Ref headRef = repository.findRef(Constants.HEAD);
if (headRef == null) {
throw new GitException("Corrupted repository, missing HEAD file in .git folder.");
}
@@ -104,7 +104,7 @@ protected void run () throws GitException {
try {
headTree = Utils.findCommit(repository, Constants.HEAD).getTree();
} catch (GitException.MissingObjectException ex) { }
- Ref ref = repository.getRef(revision);
+ Ref ref = repository.findRef(revision);
if (ref != null && !ref.getName().startsWith(Constants.R_HEADS) && !ref.getName().startsWith(Constants.R_REMOTES)) {
ref = null;
}
@@ -241,10 +241,9 @@ private void notify (File workDir, Collection<String> paths) {
private void cacheContents (List<String> conflicts) throws IOException {
File workTree = getRepository().getWorkTree();
- ObjectInserter inserter = getRepository().newObjectInserter();
WorkingTreeOptions opt = getRepository().getConfig().get(WorkingTreeOptions.KEY);
boolean autocrlf = opt.getAutoCRLF() != CoreConfig.AutoCRLF.FALSE;
- try {
+ try (ObjectInserter inserter = getRepository().newObjectInserter()) {
for (String path : conflicts) {
File f = new File(workTree, path);
Path p = null;
@@ -269,22 +268,19 @@ private void cacheContents (List<String> conflicts) throws IOException {
}
}
inserter.flush();
- } finally {
- inserter.release();
}
}
private void mergeConflicts (List<String> conflicts, DirCache cache) throws GitException {
DirCacheBuilder builder = cache.builder();
DirCacheBuildIterator dci = new DirCacheBuildIterator(builder);
- TreeWalk walk = new TreeWalk(getRepository());
ObjectDatabase od = null;
DiffAlgorithm.SupportedAlgorithm diffAlg = getRepository().getConfig().getEnum(
ConfigConstants.CONFIG_DIFF_SECTION, null,
ConfigConstants.CONFIG_KEY_ALGORITHM,
DiffAlgorithm.SupportedAlgorithm.HISTOGRAM);
MergeAlgorithm merger = new MergeAlgorithm(DiffAlgorithm.getAlgorithm(diffAlg));
- try {
+ try (TreeWalk walk = new TreeWalk(getRepository())) {
od = getRepository().getObjectDatabase();
walk.addTree(dci);
walk.setFilter(PathFilterGroup.create(Utils.getPathFilters(conflicts)));
@@ -310,7 +306,6 @@ private void mergeConflicts (List<String> conflicts, DirCache cache) throws GitE
} catch (IOException ex) {
throw new GitException(ex);
} finally {
- walk.release();
if (od != null) {
od.close();
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java
index dc88719046..9f2b37ba99 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java
@@ -54,7 +54,6 @@
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.WorkingTreeIterator;
import org.eclipse.jgit.util.IO;
-import org.eclipse.jgit.util.io.SafeBufferedOutputStream;
import org.netbeans.libs.git.GitCherryPickResult;
import org.netbeans.libs.git.GitClient;
import org.netbeans.libs.git.GitException;
@@ -388,7 +387,7 @@ private ObjectId getHead () throws GitException {
}
private void writeFile (File file, ObjectId id) throws IOException {
- try (BufferedOutputStream bos = new SafeBufferedOutputStream(new FileOutputStream(file))) {
+ try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file))) {
id.copyTo(bos);
bos.write('\n');
}
@@ -432,8 +431,10 @@ protected boolean mergeTreeWalk (TreeWalk treeWalk, boolean ignoreConflicts)
treeWalk.getTree(T_OURS, CanonicalTreeParser.class),
treeWalk.getTree(T_THEIRS, CanonicalTreeParser.class),
treeWalk.getTree(T_INDEX, DirCacheBuildIterator.class),
- hasWorkingTreeIterator ? treeWalk.getTree(T_FILE,
- WorkingTreeIterator.class) : null, ignoreConflicts)) {
+ hasWorkingTreeIterator ? treeWalk.getTree(T_FILE, WorkingTreeIterator.class)
+ : null,
+ ignoreConflicts,
+ null)) {
ok = false;
}
if (treeWalk.isSubtree() && enterSubtree) {
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/CompareCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/CompareCommand.java
index afeaece3e1..4793770553 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/CompareCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/CompareCommand.java
@@ -74,8 +74,7 @@ protected boolean prepareCommand () throws GitException {
@Override
protected void run () throws GitException {
Repository repository = getRepository();
- TreeWalk walk = new TreeWalk(repository);
- try {
+ try (TreeWalk walk = new TreeWalk(repository)) {
walk.reset();
walk.setRecursive(true);
walk.addTree(Utils.findCommit(repository, revisionFirst).getTree());
@@ -96,8 +95,6 @@ protected void run () throws GitException {
}
} catch (IOException ex) {
throw new GitException(ex);
- } finally {
- walk.release();
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/CreateBranchCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/CreateBranchCommand.java
index acef736f1e..6566f3a987 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/CreateBranchCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/CreateBranchCommand.java
@@ -92,7 +92,7 @@ protected void run () throws GitException {
}
private void setupRebaseFlag (Repository repository) throws IOException {
- Ref baseRef = repository.getRef(revision);
+ Ref baseRef = repository.findRef(revision);
if (baseRef != null && baseRef.getName().startsWith(Constants.R_REMOTES)) {
StoredConfig config = repository.getConfig();
String autosetupRebase = config.getString(ConfigConstants.CONFIG_BRANCH_SECTION,
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/ExportCommitCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/ExportCommitCommand.java
index ee43f40e44..100c3bb608 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/ExportCommitCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/ExportCommitCommand.java
@@ -70,10 +70,8 @@ protected void run() throws GitException {
if (commit.getParentCount() > 1) {
throw new GitException("Unable to export a merge commit");
}
- DiffFormatter formatter = null;
- try {
+ try (DiffFormatter formatter = new DiffFormatter(out)) {
out.write(Constants.encode(formatCommitInfo(commit)));
- formatter = new DiffFormatter(out);
formatter.setRepository(repository);
List<DiffEntry> diffEntries;
if (commit.getParentCount() > 0) {
@@ -98,10 +96,6 @@ protected void run() throws GitException {
formatter.flush();
} catch (IOException ex) {
throw new GitException(ex);
- } finally {
- if (formatter != null) {
- formatter.release();
- }
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/ExportDiffCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/ExportDiffCommand.java
index acbe05edbe..3b4b1b7557 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/ExportDiffCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/ExportDiffCommand.java
@@ -79,11 +79,10 @@ public ExportDiffCommand (Repository repository, GitClassFactory gitFactory,
@Override
protected void run() throws GitException {
Repository repository = getRepository();
- DiffFormatter formatter = new DiffFormatter(out);
- formatter.setRepository(repository);
ObjectReader or = null;
String workTreePath = repository.getWorkTree().getAbsolutePath();
- try {
+ try (DiffFormatter formatter = new DiffFormatter(out)) {
+ formatter.setRepository(repository);
Collection<PathFilter> pathFilters = Utils.getPathFilters(repository.getWorkTree(), roots);
if (!pathFilters.isEmpty()) {
formatter.setPathFilter(PathFilterGroup.create(pathFilters));
@@ -121,9 +120,8 @@ protected void run() throws GitException {
throw new GitException(ex);
} finally {
if (or != null) {
- or.release();
+ or.close();
}
- formatter.release();
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/GetCommonAncestorCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/GetCommonAncestorCommand.java
index 13b4384f0a..1faf3195fe 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/GetCommonAncestorCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/GetCommonAncestorCommand.java
@@ -68,7 +68,7 @@ protected void run () throws GitException {
throw new GitException(ex);
} finally {
if (walk != null) {
- walk.release();
+ walk.close();
}
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/GetPreviousCommitCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/GetPreviousCommitCommand.java
index 3acbd8ec9e..c11abced16 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/GetPreviousCommitCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/GetPreviousCommitCommand.java
@@ -81,7 +81,7 @@ protected void run () throws GitException {
throw new GitException(ex);
} finally {
if (walk != null) {
- walk.release();
+ walk.close();
}
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/ListTagCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/ListTagCommand.java
index 686ea5a087..6a15ac6a5d 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/ListTagCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/ListTagCommand.java
@@ -51,8 +51,7 @@ protected void run () throws GitException {
Repository repository = getRepository();
Map<String, Ref> tags = repository.getTags();
allTags = new LinkedHashMap<String, GitTag>(tags.size());
- RevWalk walk = new RevWalk(repository);
- try {
+ try (RevWalk walk = new RevWalk(repository)) {
for (Map.Entry<String, Ref> e : tags.entrySet()) {
GitTag tag;
try {
@@ -69,8 +68,6 @@ protected void run () throws GitException {
throw new GitException.MissingObjectException(ex.getObjectId().getName(), GitObjectType.TAG);
} catch (IOException ex) {
throw new GitException(ex);
- } finally {
- walk.release();
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java
index a21c4f1239..7492117b66 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java
@@ -189,8 +189,8 @@ protected void run () throws GitException {
} catch (IOException ex) {
throw new GitException(ex);
} finally {
- walk.release();
- fullWalk.release();
+ walk.close();
+ fullWalk.close();
}
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/MergeCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/MergeCommand.java
index 62ea6a8136..c7f08381ca 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/MergeCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/MergeCommand.java
@@ -58,7 +58,7 @@ protected void run () throws GitException {
setFastForward(command);
Ref ref = null;
try {
- ref = repository.getRef(revision);
+ ref = repository.findRef(revision);
} catch (IOException ex) {
throw new GitException(ex);
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/PullCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/PullCommand.java
index 795e03c1cd..22a58e768e 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/PullCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/PullCommand.java
@@ -84,7 +84,7 @@ public GitPullResult getResult () {
private String findRemoteBranchName () throws GitException {
Ref ref = null;
try {
- ref = getRepository().getRef(branchToMerge);
+ ref = getRepository().findRef(branchToMerge);
} catch (IOException ex) {
throw new GitException(ex);
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/RebaseCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/RebaseCommand.java
index e6343f3ae3..b4c8eda10a 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/RebaseCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/RebaseCommand.java
@@ -73,7 +73,7 @@ protected void run () throws GitException {
if (operation == GitClient.RebaseOperationType.BEGIN) {
Ref ref = null;
try {
- ref = repository.getRef(revision);
+ ref = repository.findRef(revision);
} catch (IOException ex) {
throw new GitException(ex);
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/RevertCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/RevertCommand.java
index 520de454a8..3b346873f7 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/RevertCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/RevertCommand.java
@@ -83,11 +83,10 @@ protected String getCommandDescription () {
protected void run() throws GitException {
Repository repository = getRepository();
RevCommit revertedCommit = Utils.findCommit(repository, revisionStr);
- RevWalk revWalk = new RevWalk(repository);
DirCache dc = null;
GitRevertResult NO_CHANGE_INSTANCE = getClassFactory().createRevertResult(GitRevertResult.Status.NO_CHANGE, null, null, null);
- try {
- Ref headRef = repository.getRef(Constants.HEAD);
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ Ref headRef = repository.findRef(Constants.HEAD);
if (headRef == null) {
throw new GitException.MissingObjectException(Constants.HEAD, GitObjectType.COMMIT);
}
@@ -147,7 +146,6 @@ protected void run() throws GitException {
if (dc != null) {
dc.unlock();
}
- revWalk.release();
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/SetUpstreamBranchCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/SetUpstreamBranchCommand.java
index d4d996ec4f..1e0e3ac3ec 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/SetUpstreamBranchCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/SetUpstreamBranchCommand.java
@@ -57,7 +57,7 @@ protected void run () throws GitException {
Repository repository = getRepository();
try {
- Ref ref = repository.getRef(trackedBranchName);
+ Ref ref = repository.findRef(trackedBranchName);
if (ref == null) {
throw new GitException(MessageFormat.format(Utils.getBundle(SetUpstreamBranchCommand.class)
.getString("MSG_Error_UpdateTracking_InvalidReference"), trackedBranchName)); //NOI18N)
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/StashListCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/StashListCommand.java
index 60216fd9e4..23a49343de 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/StashListCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/StashListCommand.java
@@ -55,8 +55,7 @@ public StashListCommand (Repository repository, GitClassFactory accessor,
@Override
protected void run () throws GitException {
Repository repository = getRepository();
- RevWalk fullWalk = new RevWalk(repository);
- try {
+ try (RevWalk fullWalk = new RevWalk(repository)) {
Collection<RevCommit> stashes = new Git(repository).stashList().call();
for (RevCommit stash : stashes) {
addRevision(getClassFactory().createRevisionInfo(fullWalk.parseCommit(stash), repository));
@@ -65,8 +64,6 @@ protected void run () throws GitException {
throw new GitException(Utils.getBundle(CatCommand.class).getString("MSG_Error_StashMissingCommit"), ex);
} catch (GitAPIException | IOException ex) {
throw new GitException(ex);
- } finally {
- fullWalk.release();
}
}
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/StatusCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/StatusCommand.java
index 8cba65d4fd..494f1fefcb 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/StatusCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/StatusCommand.java
@@ -110,8 +110,7 @@ protected void run () throws GitException {
Repository repository = getRepository();
try {
DirCache cache = repository.readDirCache();
- ObjectReader od = repository.newObjectReader();
- try {
+ try (ObjectReader od = repository.newObjectReader()) {
String workTreePath = repository.getWorkTree().getAbsolutePath();
Collection<PathFilter> pathFilters = Utils.getPathFilters(repository.getWorkTree(), roots);
ObjectId commitId = Utils.parseObjectId(repository, revision);
@@ -263,7 +262,6 @@ protected void run () throws GitException {
handleConflict(conflicts, workTreePath);
handleSymlink(symLinks, workTreePath);
} finally {
- od.release();
cache.unlock();
}
} catch (CorruptObjectException ex) {
@@ -279,8 +277,7 @@ protected void run () throws GitException {
private Map<String, DiffEntry> detectRenames (Repository repository, DirCache cache, ObjectId commitId) {
List<DiffEntry> entries;
- TreeWalk treeWalk = new TreeWalk(repository);
- try {
+ try (TreeWalk treeWalk = new TreeWalk(repository)) {
treeWalk.setRecursive(true);
treeWalk.reset();
if (commitId != null) {
@@ -297,8 +294,6 @@ protected void run () throws GitException {
entries = d.compute();
} catch (IOException ex) {
entries = Collections.<DiffEntry>emptyList();
- } finally {
- treeWalk.release();
}
Map<String, DiffEntry> renames = new HashMap<String, DiffEntry>();
for (DiffEntry e : entries) {
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/commands/UpdateRefCommand.java b/libs.git/src/org/netbeans/libs/git/jgit/commands/UpdateRefCommand.java
index 99038b7046..a5c67b47e9 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/commands/UpdateRefCommand.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/commands/UpdateRefCommand.java
@@ -50,14 +50,14 @@ protected void run () throws GitException {
Repository repository = getRepository();
try {
- Ref ref = repository.getRef(refName);
+ Ref ref = repository.findRef(refName);
if (ref == null || ref.isSymbolic()) {
// currently unable to update symbolic references
result = GitRefUpdateResult.valueOf(RefUpdate.Result.NOT_ATTEMPTED.name());
return;
}
- Ref newRef = repository.getRef(revision);
+ Ref newRef = repository.findRef(revision);
String name;
if (newRef == null) {
ObjectId id = repository.resolve(revision);
diff --git a/libs.git/src/org/netbeans/libs/git/jgit/utils/CheckoutIndex.java b/libs.git/src/org/netbeans/libs/git/jgit/utils/CheckoutIndex.java
index 211611c1c7..156e49fbff 100644
--- a/libs.git/src/org/netbeans/libs/git/jgit/utils/CheckoutIndex.java
+++ b/libs.git/src/org/netbeans/libs/git/jgit/utils/CheckoutIndex.java
@@ -65,38 +65,36 @@ public CheckoutIndex (Repository repository, DirCache cache, File[] roots, boole
}
public void checkout () throws IOException, GitException {
- TreeWalk treeWalk = new TreeWalk(repository);
- Collection<String> relativePaths = Utils.getRelativePaths(repository.getWorkTree(), roots);
- if (!relativePaths.isEmpty()) {
- treeWalk.setFilter(PathFilterGroup.createFromStrings(relativePaths));
- }
- treeWalk.setRecursive(true);
- treeWalk.reset();
- treeWalk.addTree(new DirCacheIterator(cache));
- treeWalk.addTree(new FileTreeIterator(repository));
- String lastAddedPath = null;
- ObjectReader od = repository.newObjectReader();
- try {
- while (treeWalk.next() && !monitor.isCanceled()) {
- File path = new File(repository.getWorkTree(), treeWalk.getPathString());
- if (treeWalk.getPathString().equals(lastAddedPath)) {
- // skip conflicts
- continue;
- } else {
- lastAddedPath = treeWalk.getPathString();
+ try (TreeWalk treeWalk = new TreeWalk(repository);
+ ObjectReader od = repository.newObjectReader()) {
+ Collection<String> relativePaths = Utils.getRelativePaths(repository.getWorkTree(), roots);
+ if (!relativePaths.isEmpty()) {
+ treeWalk.setFilter(PathFilterGroup.createFromStrings(relativePaths));
}
- DirCacheIterator dit = treeWalk.getTree(0, DirCacheIterator.class);
- FileTreeIterator fit = treeWalk.getTree(1, FileTreeIterator.class);
- if (dit != null && (recursively || directChild(roots, repository.getWorkTree(), path)) && (fit == null || fit.isModified(dit.getDirCacheEntry(), checkContent, od))) {
- // update entry
- listener.notifyFile(path, treeWalk.getPathString());
- checkoutEntry(repository, path, dit.getDirCacheEntry(), od);
+ treeWalk.setRecursive(true);
+ treeWalk.reset();
+ treeWalk.addTree(new DirCacheIterator(cache));
+ treeWalk.addTree(new FileTreeIterator(repository));
+ String lastAddedPath = null;
+ while (treeWalk.next() && !monitor.isCanceled()) {
+ File path = new File(repository.getWorkTree(), treeWalk.getPathString());
+ if (treeWalk.getPathString().equals(lastAddedPath)) {
+ // skip conflicts
+ continue;
+ } else {
+ lastAddedPath = treeWalk.getPathString();
+ }
+ DirCacheIterator dit = treeWalk.getTree(0, DirCacheIterator.class);
+ FileTreeIterator fit = treeWalk.getTree(1, FileTreeIterator.class);
+ if (dit != null
+ && (recursively || directChild(roots, repository.getWorkTree(), path))
+ && (fit == null || fit.isModified(dit.getDirCacheEntry(), checkContent, od))) {
+ // update entry
+ listener.notifyFile(path, treeWalk.getPathString());
+ checkoutEntry(repository, path, dit.getDirCacheEntry(), od);
+ }
}
}
- } finally {
- od.release();
- treeWalk.release();
- }
}
public void checkoutEntry (Repository repository, File file, DirCacheEntry e, ObjectReader od) throws IOException, GitException {
@@ -122,7 +120,7 @@ public void checkoutEntry (Repository repository, File file, DirCacheEntry e, Ob
}
file.createNewFile();
if (file.isFile()) {
- DirCacheCheckout.checkoutEntry(repository, file, e, od);
+ DirCacheCheckout.checkoutEntry(repository, e, od);
} else {
monitor.notifyError(MessageFormat.format(Utils.getBundle(CheckoutIndex.class).getString("MSG_Warning_CannotCreateFile"), file.getAbsolutePath())); //NOI18N
}
diff --git a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/AddTest.java b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/AddTest.java
index 6c7e7bc62d..068dd75776 100644
--- a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/AddTest.java
+++ b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/AddTest.java
@@ -429,7 +429,7 @@ public void testAddMixedLineEndings () throws Exception {
assertEquals("Input did not match supplied length. 10000 bytes are missing.", ex.getMessage());
} finally {
in.close();
- inserter.release();
+ inserter.close();
}
break;
}
@@ -547,7 +547,7 @@ public void testAddSymlink () throws Exception {
assertTrue(reader.has(e2.getObjectId()));
bytes = reader.open(e2.getObjectId()).getBytes();
assertEquals(path, RawParseUtils.decode(bytes));
- reader.release();
+ reader.close();
}
public void testAddMissingSymlink () throws Exception {
@@ -568,7 +568,7 @@ public void testAddMissingSymlink () throws Exception {
assertTrue(reader.has(e.getObjectId()));
byte[] bytes = reader.open(e.getObjectId()).getBytes();
assertEquals(path, RawParseUtils.decode(bytes));
- reader.release();
+ reader.close();
}
public void testAdd_243092 () throws Exception {
diff --git a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CheckoutTest.java b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CheckoutTest.java
index c1079aaa5b..ad4ef8846f 100644
--- a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CheckoutTest.java
+++ b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CheckoutTest.java
@@ -348,7 +348,7 @@ public void testLargeFile () throws Exception {
WindowCacheConfig cfg = new WindowCacheConfig();
cfg.setStreamFileThreshold((int) large.length() - 1);
cfg.install();
- DirCacheCheckout.checkoutEntry(repository, large, e);
+ DirCacheCheckout.checkoutEntry(repository, e, repository.newObjectReader());
}
public void testCheckoutBranch () throws Exception {
diff --git a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CompareCommitTest.java b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CompareCommitTest.java
index 9aaefff70b..9e8d17e186 100644
--- a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CompareCommitTest.java
+++ b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CompareCommitTest.java
@@ -22,7 +22,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.netbeans.libs.git.GitClient;
diff --git a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/ExportDiffTest.java b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/ExportDiffTest.java
index b3a4a3b79f..c409d5ca33 100644
--- a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/ExportDiffTest.java
+++ b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/ExportDiffTest.java
@@ -204,9 +204,9 @@ public void testDiffRenameDetectionProblem () throws Exception {
assertEquals("Missing blob 7b34a309b8dbae2686c9e597efef28a612e48aff", ex.getMessage());
} finally {
if (or != null) {
- or.release();
+ or.close();
}
- formatter.release();
+ formatter.close();
}
}
diff --git a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/RebaseTest.java b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/RebaseTest.java
index cedbd0c6e5..3ba3b0c57c 100644
--- a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/RebaseTest.java
+++ b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/RebaseTest.java
@@ -23,10 +23,10 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.Map;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.netbeans.libs.git.GitBranch;
diff --git a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/RenameTest.java b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/RenameTest.java
index c711fe744c..811bc854fa 100644
--- a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/RenameTest.java
+++ b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/RenameTest.java
@@ -27,7 +27,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
import org.netbeans.libs.git.GitClient;
import org.netbeans.libs.git.GitException;
import org.netbeans.libs.git.GitStatus;
diff --git a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/StatusTest.java b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/StatusTest.java
index f9aee6ab7b..e7cc3833fe 100644
--- a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/StatusTest.java
+++ b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/StatusTest.java
@@ -24,7 +24,7 @@
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
-import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertFalse;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheBuilder;
import org.eclipse.jgit.dircache.DirCacheEntry;
diff --git a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/factory/CheckJava7ExtensionTest.java b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/factory/CheckJava7ExtensionTest.java
index 0e7c2f67f0..0842b40fc0 100644
--- a/libs.git/test/unit/src/org/netbeans/libs/git/jgit/factory/CheckJava7ExtensionTest.java
+++ b/libs.git/test/unit/src/org/netbeans/libs/git/jgit/factory/CheckJava7ExtensionTest.java
@@ -45,7 +45,7 @@ public void testExtension () throws Exception {
Field f = FS.class.getDeclaredField("factory");
f.setAccessible(true);
FSFactory fact = (FSFactory) f.get(FS.class);
- assertEquals("org.eclipse.jgit.util.Java7FSFactory", fact.getClass().getName());
+ assertEquals("org.eclipse.jgit.util.FSFactory", fact.getClass().getName());
}
}
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 4cc5f7d80c..d3344eb360 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -429,7 +429,6 @@ nb.cluster.ide=\
o.eclipse.equinox.registry,\
o.eclipse.equinox.security,\
o.eclipse.jgit,\
- o.eclipse.jgit.java7,\
o.eclipse.mylyn.bugzilla.core,\
o.eclipse.mylyn.commons.core,\
o.eclipse.mylyn.commons.net,\
@@ -442,6 +441,7 @@ nb.cluster.ide=\
o.eclipse.mylyn.wikitext.textile.core,\
o.n.swing.dirchooser,\
o.openidex.util,\
+ o.slf4j.api,\
options.editor,\
parsing.api,\
parsing.indexing,\
diff --git a/o.eclipse.jgit.java7/manifest.mf b/o.eclipse.jgit.java7/manifest.mf
deleted file mode 100644
index 0ecc753c07..0000000000
--- a/o.eclipse.jgit.java7/manifest.mf
+++ /dev/null
@@ -1 +0,0 @@
-OpenIDE-Module: org.eclipse.jgit.java7
diff --git a/o.eclipse.jgit/external/binaries-list b/o.eclipse.jgit/external/binaries-list
index 3e2ad617de..94c1df21ec 100644
--- a/o.eclipse.jgit/external/binaries-list
+++ b/o.eclipse.jgit/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-47D59DFFB5F02470CCFB6C1A5A31B6040A1636E5 org.eclipse.jgit:org.eclipse.jgit:3.6.2.201501210735-r
+58291405729DCCE0264BF390887790884EC51CFB org.eclipse.jgit:org.eclipse.jgit:4.11.1.201807311124-r
diff --git a/o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r-license.txt b/o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r-license.txt
deleted file mode 100644
index 835d516580..0000000000
--- a/o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r-license.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Name: JGit Library
-Origin: Eclipse
-Version: 3.6.2
-Description: Integration library for Git client
-License: EDL-1.0
-URL: http://www.eclipse.org/jgit/download/
-
-Eclipse Distribution License - v 1.0
-
-Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
-
-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.
diff --git a/o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r-license.txt b/o.eclipse.jgit/external/org.eclipse.jgit-4.11.1.201807311124-r-license.txt
similarity index 99%
rename from o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r-license.txt
rename to o.eclipse.jgit/external/org.eclipse.jgit-4.11.1.201807311124-r-license.txt
index ae29fd46d4..80ac69e85f 100644
--- a/o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r-license.txt
+++ b/o.eclipse.jgit/external/org.eclipse.jgit-4.11.1.201807311124-r-license.txt
@@ -1,7 +1,7 @@
Name: JGit Library
-Description: Integration library for Git client
Origin: Eclipse
-Version: 3.6.2
+Version: 4.11.1
+Description: Integration library for Git client
License: EDL-1.0
URL: http://www.eclipse.org/jgit/download/
diff --git a/o.eclipse.jgit/manifest.mf b/o.eclipse.jgit/manifest.mf
index da52db27c0..7c31679f58 100644
--- a/o.eclipse.jgit/manifest.mf
+++ b/o.eclipse.jgit/manifest.mf
@@ -1 +1,4 @@
OpenIDE-Module: org.eclipse.jgit
+OpenIDE-Module-Specification-Version: 4.11.1
+OpenIDE-Module-Implementation-Version: 4.11.1.201807311124-r
+OpenIDE-Module-Public-Packages: org.eclipse.jgit.**
diff --git a/o.eclipse.jgit/nbproject/project.properties b/o.eclipse.jgit/nbproject/project.properties
index de1e85e822..ad18fa7b6a 100644
--- a/o.eclipse.jgit/nbproject/project.properties
+++ b/o.eclipse.jgit/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/org.eclipse.jgit-3.6.2.201501210735-r.jar=modules/org-eclipse-jgit.jar
+release.external/org.eclipse.jgit-4.11.1.201807311124-r.jar=modules/org-eclipse-jgit.jar
is.autoload=true
diff --git a/o.eclipse.jgit/nbproject/project.xml b/o.eclipse.jgit/nbproject/project.xml
index b3b7a73659..15dcfca371 100644
--- a/o.eclipse.jgit/nbproject/project.xml
+++ b/o.eclipse.jgit/nbproject/project.xml
@@ -28,20 +28,29 @@
<dependency>
<code-name-base>com.jcraft.jsch</code-name-base>
<compile-dependency/>
- <run-dependency/>
+ <run-dependency>
+ <specification-version>0.1.54</specification-version>
+ </run-dependency>
</dependency>
<dependency>
<code-name-base>com.googlecode.javaewah.JavaEWAH</code-name-base>
<compile-dependency/>
<run-dependency>
- <specification-version>0.7.9</specification-version>
+ <specification-version>1.1.6</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.slf4j.api</code-name-base>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.7.2</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit.jar</runtime-relative-path>
- <binary-origin>external/org.eclipse.jgit-3.6.2.201501210735-r.jar</binary-origin>
+ <binary-origin>external/org.eclipse.jgit-4.11.1.201807311124-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/o.eclipse.jgit.java7/build.xml b/o.slf4j.api/build.xml
similarity index 89%
rename from o.eclipse.jgit.java7/build.xml
rename to o.slf4j.api/build.xml
index 103684f43e..cebe99e9b5 100644
--- a/o.eclipse.jgit.java7/build.xml
+++ b/o.slf4j.api/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project name="o.eclipse.jgit.java7" default="build" basedir=".">
+<project name="o.slf4j.api" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar" depends="release"/>
+ <target name="jar"/>
</project>
diff --git a/o.eclipse.jgit.java7/external/binaries-list b/o.slf4j.api/external/binaries-list
similarity index 88%
rename from o.eclipse.jgit.java7/external/binaries-list
rename to o.slf4j.api/external/binaries-list
index 575511cc0d..60fdd665da 100644
--- a/o.eclipse.jgit.java7/external/binaries-list
+++ b/o.slf4j.api/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-D613D2ED86455CC8686A45B9B65215A9652E2943 org.eclipse.jgit:org.eclipse.jgit.java7:3.6.2.201501210735-r
+0081D61B7F33EBEAB314E07DE0CC596F8E858D97 org.slf4j:slf4j-api:1.7.2
diff --git a/o.slf4j.api/external/org.slf4j.api-1.7.2-license.txt b/o.slf4j.api/external/org.slf4j.api-1.7.2-license.txt
new file mode 100644
index 0000000000..7b7600854e
--- /dev/null
+++ b/o.slf4j.api/external/org.slf4j.api-1.7.2-license.txt
@@ -0,0 +1,28 @@
+Name: SLF4J
+Version: 1.7.2
+License: MIT
+Origin: https://www.slf4j.org/
+Description: Simple Logging Facade for Java (SLF4J).
+
+The MIT License
+
+Copyright (c) __YEARS__, __NAMES__
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/o.slf4j.api/manifest.mf b/o.slf4j.api/manifest.mf
new file mode 100644
index 0000000000..6113699e34
--- /dev/null
+++ b/o.slf4j.api/manifest.mf
@@ -0,0 +1,2 @@
+OpenIDE-Module: org.slf4j.api
+OpenIDE-Module-Specification-Version: 1.7.2
diff --git a/o.eclipse.jgit.java7/nbproject/project.properties b/o.slf4j.api/nbproject/project.properties
similarity index 88%
rename from o.eclipse.jgit.java7/nbproject/project.properties
rename to o.slf4j.api/nbproject/project.properties
index 3d6d8a4b02..3eff40e4c2 100644
--- a/o.eclipse.jgit.java7/nbproject/project.properties
+++ b/o.slf4j.api/nbproject/project.properties
@@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/org.eclipse.jgit.java7-3.6.2.201501210735-r.jar=modules/org-eclipse-jgit-java7.jar
+release.external/slf4j-api-1.7.2.jar=modules/org-slf4j-api.jar
is.autoload=true
+nbm.module.author=Christian Bourque
diff --git a/o.eclipse.jgit.java7/nbproject/project.xml b/o.slf4j.api/nbproject/project.xml
similarity index 82%
rename from o.eclipse.jgit.java7/nbproject/project.xml
rename to o.slf4j.api/nbproject/project.xml
index a23b2b8174..1eda66f702 100644
--- a/o.eclipse.jgit.java7/nbproject/project.xml
+++ b/o.slf4j.api/nbproject/project.xml
@@ -23,12 +23,12 @@
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
- <code-name-base>org.eclipse.jgit.java7</code-name-base>
+ <code-name-base>org.slf4j.api</code-name-base>
<module-dependencies/>
<public-packages/>
<class-path-extension>
- <runtime-relative-path>org-eclipse-jgit-java7.jar</runtime-relative-path>
- <binary-origin>external/org.eclipse.jgit.java7-3.6.2.201501210735-r.jar</binary-origin>
+ <runtime-relative-path>org-slf4j-api.jar</runtime-relative-path>
+ <binary-origin>external/org.slf4j.api-1.7.2.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists