Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit227215b

Browse files
authored
Replace deprecated classes (#1438)
1 parent311ecf5 commit227215b

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
importorg.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
6666
importorg.apache.maven.shared.release.scm.ScmTranslator;
6767
importorg.apache.maven.shared.release.util.ReleaseUtil;
68-
importorg.codehaus.plexus.util.WriterFactory;
68+
importorg.codehaus.plexus.util.xml.XmlStreamWriter;
6969

7070
importstaticjava.util.Objects.requireNonNull;
7171

@@ -174,7 +174,7 @@ private File generateReleasePom(
174174
thrownewReleaseExecutionException("Cannot generate release POM : pom file is null");
175175
}
176176

177-
try (WriterfileWriter =WriterFactory.newXmlWriter(releasePomFile)) {
177+
try (WriterfileWriter =newXmlStreamWriter(releasePomFile)) {
178178
pomWriter.write(fileWriter,releasePom);
179179
}catch (IOExceptionexception) {
180180
thrownewReleaseExecutionException("Cannot generate release POM",exception);

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
importorg.apache.maven.shared.release.config.ReleaseDescriptor;
3434
importorg.apache.maven.shared.release.transform.ModelETL;
3535
importorg.apache.maven.shared.release.util.ReleaseUtil;
36-
importorg.codehaus.plexus.util.WriterFactory;
36+
importorg.codehaus.plexus.util.xml.XmlStreamWriter;
3737
importorg.jdom2.CDATA;
3838
importorg.jdom2.Comment;
3939
importorg.jdom2.Document;
@@ -205,7 +205,7 @@ private void writePom(
205205
}
206206
}
207207

208-
try (Writerwriter =WriterFactory.newXmlWriter(pomFile)) {
208+
try (Writerwriter =newXmlStreamWriter(pomFile)) {
209209
if (intro !=null) {
210210
writer.write(intro);
211211
}

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
importjava.io.File;
2222
importjava.io.IOException;
23+
importjava.io.InputStream;
24+
importjava.nio.file.Files;
2325

2426
importorg.apache.maven.model.Model;
2527
importorg.apache.maven.model.Parent;
2628
importorg.apache.maven.model.io.xpp3.MavenXpp3Reader;
27-
importorg.codehaus.plexus.util.ReaderFactory;
28-
importorg.codehaus.plexus.util.xml.XmlStreamReader;
2929
importorg.codehaus.plexus.util.xml.pull.XmlPullParserException;
3030
importorg.slf4j.Logger;
3131

@@ -165,25 +165,24 @@ private PomInfo readPomInfo(File pomFile) throws IOException, XmlPullParserExcep
165165

166166
MavenXpp3Readerreader =newMavenXpp3Reader();
167167

168-
Modelmodel;
169-
try (XmlStreamReaderxmlReader =ReaderFactory.newXmlReader(pomFile)) {
170-
model =reader.read(xmlReader);
171-
}
168+
try (InputStreamin =Files.newInputStream(pomFile.toPath())) {
169+
Modelmodel =reader.read(in);
172170

173-
if (model !=null) {
174-
pomInfo =newPomInfo();
175-
pomInfo.setArtifactId(model.getArtifactId());
176-
pomInfo.setGroupId(model.getGroupId());
171+
if (model !=null) {
172+
pomInfo =newPomInfo();
173+
pomInfo.setArtifactId(model.getArtifactId());
174+
pomInfo.setGroupId(model.getGroupId());
177175

178-
Parentparent =model.getParent();
179-
if (parent !=null) {
180-
pomInfo.setParentArtifactId(parent.getArtifactId());
181-
pomInfo.setParentGroupId(parent.getGroupId());
182-
}
176+
Parentparent =model.getParent();
177+
if (parent !=null) {
178+
pomInfo.setParentArtifactId(parent.getArtifactId());
179+
pomInfo.setParentGroupId(parent.getGroupId());
180+
}
183181

184-
pomInfo.setFileName(pomFile.getName());
182+
pomInfo.setFileName(pomFile.getName());
183+
}
184+
returnpomInfo;
185185
}
186-
returnpomInfo;
187186
}
188187

189188
/**

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp