[19/50] maven git commit: [MNG-6168] Fix unclosed streams
[MNG-6168] Fix unclosed streams Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931bb2c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931bb2c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931bb2c Branch: refs/heads/mvn-3.5.1/MNG-6174 Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee Parents: f0535a4 Author: Christian SchulteAuthored: Fri Mar 24 22:04:37 2017 +0100 Committer: Christian Schulte Committed: Fri Mar 24 22:04:37 2017 +0100 -- .../metadata/io/DefaultMetadataReader.java | 19 ++--- .../toolchain/io/DefaultToolchainsReader.java | 19 ++--- .../maven/model/io/DefaultModelReader.java | 18 +++-- .../maven/model/io/DefaultModelWriter.java | 27 + .../internal/DefaultVersionRangeResolver.java | 18 +++-- .../internal/DefaultVersionResolver.java| 42 .../settings/io/DefaultSettingsReader.java | 19 ++--- .../settings/io/DefaultSettingsWriter.java | 27 + 8 files changed, 58 insertions(+), 131 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java index c769f89..51a2849 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -58,19 +57,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final Reader in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } public Metadata read( InputStream input, Map options ) @@ -78,19 +72,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final InputStream in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } private boolean isStrict( Map options ) http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java index 9b5bdd7..86a1784 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java @@ -31,7 +31,6 @@ import javax.inject.Singleton; import org.apache.commons.lang3.Validate; import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -62,19 +61,14 @@ public class DefaultToolchainsReader { Validate.notNull( input, "input cannot be null" );
[08/27] maven git commit: [MNG-6168] Fix unclosed streams
[MNG-6168] Fix unclosed streams Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931bb2c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931bb2c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931bb2c Branch: refs/heads/MNG-6069 Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee Parents: f0535a4 Author: Christian SchulteAuthored: Fri Mar 24 22:04:37 2017 +0100 Committer: Christian Schulte Committed: Fri Mar 24 22:04:37 2017 +0100 -- .../metadata/io/DefaultMetadataReader.java | 19 ++--- .../toolchain/io/DefaultToolchainsReader.java | 19 ++--- .../maven/model/io/DefaultModelReader.java | 18 +++-- .../maven/model/io/DefaultModelWriter.java | 27 + .../internal/DefaultVersionRangeResolver.java | 18 +++-- .../internal/DefaultVersionResolver.java| 42 .../settings/io/DefaultSettingsReader.java | 19 ++--- .../settings/io/DefaultSettingsWriter.java | 27 + 8 files changed, 58 insertions(+), 131 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java index c769f89..51a2849 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -58,19 +57,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final Reader in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } public Metadata read( InputStream input, Map options ) @@ -78,19 +72,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final InputStream in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } private boolean isStrict( Map options ) http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java index 9b5bdd7..86a1784 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java @@ -31,7 +31,6 @@ import javax.inject.Singleton; import org.apache.commons.lang3.Validate; import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -62,19 +61,14 @@ public class DefaultToolchainsReader { Validate.notNull( input, "input cannot be null" ); -
[22/28] maven git commit: [MNG-6168] Fix unclosed streams
[MNG-6168] Fix unclosed streams Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3a6a901f Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3a6a901f Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3a6a901f Branch: refs/heads/MNG-6169 Commit: 3a6a901fabe48296f932d1563d757a8892fec842 Parents: f4bc3c0 Author: Christian SchulteAuthored: Fri Mar 24 22:04:37 2017 +0100 Committer: Michael Osipov Committed: Sun Apr 2 00:21:12 2017 +0200 -- .../metadata/io/DefaultMetadataReader.java | 19 ++--- .../toolchain/io/DefaultToolchainsReader.java | 19 ++--- .../maven/model/io/DefaultModelReader.java | 18 +++-- .../maven/model/io/DefaultModelWriter.java | 27 + .../internal/DefaultVersionRangeResolver.java | 18 +++-- .../internal/DefaultVersionResolver.java| 42 .../settings/io/DefaultSettingsReader.java | 19 ++--- .../settings/io/DefaultSettingsWriter.java | 27 + 8 files changed, 58 insertions(+), 131 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/3a6a901f/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java index c769f89..51a2849 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -58,19 +57,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final Reader in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } public Metadata read( InputStream input, Map options ) @@ -78,19 +72,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final InputStream in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } private boolean isStrict( Map options ) http://git-wip-us.apache.org/repos/asf/maven/blob/3a6a901f/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java index 9b5bdd7..86a1784 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java @@ -31,7 +31,6 @@ import javax.inject.Singleton; import org.apache.commons.lang3.Validate; import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -62,19 +61,14 @@ public class DefaultToolchainsReader { Validate.notNull( input, "input cannot be null" ); -
maven git commit: [MNG-6168] Fix unclosed streams
Repository: maven Updated Branches: refs/heads/master f0535a40e -> 0931bb2cc [MNG-6168] Fix unclosed streams Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931bb2c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931bb2c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931bb2c Branch: refs/heads/master Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee Parents: f0535a4 Author: Christian SchulteAuthored: Fri Mar 24 22:04:37 2017 +0100 Committer: Christian Schulte Committed: Fri Mar 24 22:04:37 2017 +0100 -- .../metadata/io/DefaultMetadataReader.java | 19 ++--- .../toolchain/io/DefaultToolchainsReader.java | 19 ++--- .../maven/model/io/DefaultModelReader.java | 18 +++-- .../maven/model/io/DefaultModelWriter.java | 27 + .../internal/DefaultVersionRangeResolver.java | 18 +++-- .../internal/DefaultVersionResolver.java| 42 .../settings/io/DefaultSettingsReader.java | 19 ++--- .../settings/io/DefaultSettingsWriter.java | 27 + 8 files changed, 58 insertions(+), 131 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java index c769f89..51a2849 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -58,19 +57,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final Reader in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } public Metadata read( InputStream input, Map options ) @@ -78,19 +72,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final InputStream in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } private boolean isStrict( Map options ) http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java index 9b5bdd7..86a1784 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java @@ -31,7 +31,6 @@ import javax.inject.Singleton; import org.apache.commons.lang3.Validate; import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -62,19 +61,14 @@ public class
maven git commit: [MNG-6168] Fix unclosed streams
Repository: maven Updated Branches: refs/heads/MNG-6168 [created] 0931bb2cc [MNG-6168] Fix unclosed streams Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931bb2c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931bb2c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931bb2c Branch: refs/heads/MNG-6168 Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee Parents: f0535a4 Author: Christian SchulteAuthored: Fri Mar 24 22:04:37 2017 +0100 Committer: Christian Schulte Committed: Fri Mar 24 22:04:37 2017 +0100 -- .../metadata/io/DefaultMetadataReader.java | 19 ++--- .../toolchain/io/DefaultToolchainsReader.java | 19 ++--- .../maven/model/io/DefaultModelReader.java | 18 +++-- .../maven/model/io/DefaultModelWriter.java | 27 + .../internal/DefaultVersionRangeResolver.java | 18 +++-- .../internal/DefaultVersionResolver.java| 42 .../settings/io/DefaultSettingsReader.java | 19 ++--- .../settings/io/DefaultSettingsWriter.java | 27 + 8 files changed, 58 insertions(+), 131 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java index c769f89..51a2849 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -58,19 +57,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final Reader in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } public Metadata read( InputStream input, Map options ) @@ -78,19 +72,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final InputStream in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } private boolean isStrict( Map options ) http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java index 9b5bdd7..86a1784 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java @@ -31,7 +31,6 @@ import javax.inject.Singleton; import org.apache.commons.lang3.Validate; import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -62,19 +61,14 @@ public class