Merge changes I91883560,I1b12a976

* changes:
  Fix package exports in org.eclipse.jgit MANIFEST.MF
  TransportSftp: remove final modifiers from parameters

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,

org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportSftp.java

@@ -323,9 +323,8 @@ public class TransportSftp extends SshTransport implements WalkTransport {
 		}
 
 		@Override
-		OutputStream writeFile(final String path,
+		OutputStream writeFile(String path, ProgressMonitor monitor,
-				final ProgressMonitor monitor, final String monitorTask)
+				String monitorTask) throws IOException {
-				throws IOException {
 			try {
 				return ftp.put(path);
 			} catch (SftpException je) {
@@ -401,9 +400,8 @@ public class TransportSftp extends SshTransport implements WalkTransport {
 		}
 
 		@SuppressWarnings("unchecked")
-		private void readLooseRefs(final TreeMap<String, Ref> avail,
+		private void readLooseRefs(TreeMap<String, Ref> avail, String dir,
-				final String dir, final String prefix)
+				String prefix) throws TransportException {
-				throws TransportException {
 			final Collection<ChannelSftp.LsEntry> list;
 			try {
 				list = ftp.ls(dir);
@@ -426,8 +424,8 @@ public class TransportSftp extends SshTransport implements WalkTransport {
 			}
 		}
 
-		private Ref readRef(final TreeMap<String, Ref> avail,
+		private Ref readRef(TreeMap<String, Ref> avail, String path,
-				final String path, final String name) throws TransportException {
+				String name) throws TransportException {
 			final String line;
 			try (BufferedReader br = openReader(path)) {
 				line = br.readLine();