Replace XMLReaderFactory deprecated since Java 9
Change-Id: Ie8a9d411fc19e8b7bf86c0b4df0b02153a0e9444
This commit is contained in:
parent
81771d8625
commit
1aa19c67e6
|
@ -24,6 +24,9 @@
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
import javax.xml.parsers.SAXParserFactory;
|
||||
|
||||
import org.eclipse.jgit.annotations.NonNull;
|
||||
import org.eclipse.jgit.api.errors.GitAPIException;
|
||||
import org.eclipse.jgit.gitrepo.RepoProject.CopyFile;
|
||||
|
@ -37,7 +40,6 @@
|
|||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.XMLReader;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
import org.xml.sax.helpers.XMLReaderFactory;
|
||||
|
||||
/**
|
||||
* Repo XML manifest parser.
|
||||
|
@ -137,8 +139,8 @@ public void read(InputStream inputStream) throws IOException {
|
|||
xmlInRead++;
|
||||
final XMLReader xr;
|
||||
try {
|
||||
xr = XMLReaderFactory.createXMLReader();
|
||||
} catch (SAXException e) {
|
||||
xr = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
|
||||
} catch (SAXException | ParserConfigurationException e) {
|
||||
throw new IOException(JGitText.get().noXMLParserAvailable, e);
|
||||
}
|
||||
xr.setContentHandler(this);
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
import java.security.NoSuchAlgorithmException;
|
||||
import java.text.MessageFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
|
@ -46,10 +47,11 @@
|
|||
import java.util.TimeZone;
|
||||
import java.util.TreeMap;
|
||||
import java.util.stream.Collectors;
|
||||
import java.time.Instant;
|
||||
|
||||
import javax.crypto.Mac;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
import javax.xml.parsers.SAXParserFactory;
|
||||
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
import org.eclipse.jgit.lib.Constants;
|
||||
|
@ -64,7 +66,6 @@
|
|||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.XMLReader;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
import org.xml.sax.helpers.XMLReaderFactory;
|
||||
|
||||
/**
|
||||
* A simple HTTP REST client for the Amazon S3 service.
|
||||
|
@ -683,8 +684,9 @@ void list() throws IOException {
|
|||
|
||||
final XMLReader xr;
|
||||
try {
|
||||
xr = XMLReaderFactory.createXMLReader();
|
||||
} catch (SAXException e) {
|
||||
xr = SAXParserFactory.newInstance().newSAXParser()
|
||||
.getXMLReader();
|
||||
} catch (SAXException | ParserConfigurationException e) {
|
||||
throw new IOException(
|
||||
JGitText.get().noXMLParserAvailable, e);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue