From 2429ea2c41eec978b2adaebc862033f275a8c23c Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 17 Sep 2018 20:25:01 +0200 Subject: [PATCH 1/2] TransportSftp: remove final modifiers from parameters Change-Id: I1b12a9765575a1368e0c6bd11d87084b2064a17e Signed-off-by: Thomas Wolf --- .../org/eclipse/jgit/transport/TransportSftp.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java index f129ba34d..e040e0c1c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java @@ -323,9 +323,8 @@ void deleteFile(String path) throws IOException { } @Override - OutputStream writeFile(final String path, - final ProgressMonitor monitor, final String monitorTask) - throws IOException { + OutputStream writeFile(String path, ProgressMonitor monitor, + String monitorTask) throws IOException { try { return ftp.put(path); } catch (SftpException je) { @@ -401,9 +400,8 @@ Map readAdvertisedRefs() throws TransportException { } @SuppressWarnings("unchecked") - private void readLooseRefs(final TreeMap avail, - final String dir, final String prefix) - throws TransportException { + private void readLooseRefs(TreeMap avail, String dir, + String prefix) throws TransportException { final Collection list; try { list = ftp.ls(dir); @@ -426,8 +424,8 @@ private void readLooseRefs(final TreeMap avail, } } - private Ref readRef(final TreeMap avail, - final String path, final String name) throws TransportException { + private Ref readRef(TreeMap avail, String path, + String name) throws TransportException { final String line; try (BufferedReader br = openReader(path)) { line = br.readLine(); From f8d2738ff4a7da5252946fd1e117eede394f4441 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 5 Nov 2018 12:56:36 +0100 Subject: [PATCH 2/2] Fix package exports in org.eclipse.jgit MANIFEST.MF Do not export o.e.j.internal.transport.parser as public package; restrict visibility to org.eclipse.jgit.test only. Add two packages that were not listed at all (o.e.j.internal.revwalk and o.e.j.internal.submodule) marked as x-internal:=true. Change-Id: I9188356075515ad354b724102fbd6304b682de6a Signed-off-by: Thomas Wolf --- org.eclipse.jgit/META-INF/MANIFEST.MF | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 2b9ed0845..1a10ce78a 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -62,6 +62,7 @@ Export-Package: org.eclipse.jgit.annotations;version="5.2.0", org.eclipse.jgit.internal;version="5.2.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", org.eclipse.jgit.internal.fsck;version="5.2.0";x-friends:="org.eclipse.jgit.test", org.eclipse.jgit.internal.ketch;version="5.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.revwalk;version="5.2.0";x-internal:=true, org.eclipse.jgit.internal.storage.dfs;version="5.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, @@ -80,7 +81,8 @@ Export-Package: org.eclipse.jgit.annotations;version="5.2.0", org.eclipse.jgit.internal.storage.reftable;version="5.2.0"; x-friends:="org.eclipse.jgit.http.test,org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", org.eclipse.jgit.internal.storage.reftree;version="5.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.transport.parser;version="5.2.0", + org.eclipse.jgit.internal.submodule;version="5.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.parser;version="5.2.0";x-friends:="org.eclipse.jgit.test", org.eclipse.jgit.lib;version="5.2.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter,