This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-utils2.
commit 4f839238415f12b62cdc173e48d35f901fd3960b Merge: 2c77444 11ff80d Author: Emmanuel Bourg <[email protected]> Date: Sun Oct 5 23:08:26 2014 +0200 Merge tag 'upstream/3.0.15' Upstream version 3.0.15 .gitignore | 11 + pom.xml | 46 ++- pom.xml => pom.xml.releaseBackup | 46 ++- .../org/codehaus/plexus/util/AbstractScanner.java | 235 +++++------ src/main/java/org/codehaus/plexus/util/Base64.java | 2 +- .../org/codehaus/plexus/util/CollectionUtils.java | 84 ++-- .../org/codehaus/plexus/util/DirectoryScanner.java | 232 ++++++----- .../plexus/util/DirectoryWalkListener.java | 5 +- .../org/codehaus/plexus/util/DirectoryWalker.java | 4 +- .../org/codehaus/plexus/util/ExceptionUtils.java | 2 +- src/main/java/org/codehaus/plexus/util/Expand.java | 2 +- .../java/org/codehaus/plexus/util/FileUtils.java | 424 +++++++++++-------- src/main/java/org/codehaus/plexus/util/IOUtil.java | 25 +- .../plexus/util/InterpolationFilterReader.java | 43 +- .../org/codehaus/plexus/util/Java7Detector.java} | 78 ++-- .../org/codehaus/plexus/util/Java7FileUtil.java} | 62 +-- .../util/LineOrientedInterpolatingReader.java | 95 ++++- .../org/codehaus/plexus/util/MatchPattern.java | 135 ++++++ .../org/codehaus/plexus/util/MatchPatterns.java | 90 ++++ src/main/java/org/codehaus/plexus/util/Os.java | 19 +- .../java/org/codehaus/plexus/util/PathTool.java | 105 ++--- .../org/codehaus/plexus/util/PropertyUtils.java | 4 +- .../org/codehaus/plexus/util/ReaderFactory.java | 4 +- .../org/codehaus/plexus/util/ReflectionUtils.java | 40 +- .../java/org/codehaus/plexus/util/Scanner.java | 3 + .../org/codehaus/plexus/util/SelectorUtils.java | 451 ++++++++++++++------- .../codehaus/plexus/util/StringOutputStream.java | 2 +- .../java/org/codehaus/plexus/util/StringUtils.java | 139 ++++--- .../java/org/codehaus/plexus/util/SweeperPool.java | 2 +- .../org/codehaus/plexus/util/WriterFactory.java | 6 +- ...eamConsumer.java => AbstractStreamHandler.java} | 101 +++-- ...faultConsumer.java => CommandLineCallable.java} | 14 +- .../plexus/util/cli/CommandLineException.java | 2 +- .../util/cli/CommandLineTimeOutException.java | 2 +- .../codehaus/plexus/util/cli/CommandLineUtils.java | 444 +++++++------------- .../codehaus/plexus/util/cli/DefaultConsumer.java | 2 +- .../plexus/util/cli/EnhancedStringTokenizer.java | 2 +- .../plexus/util/cli/ShutdownHookUtils.java | 62 +++ .../codehaus/plexus/util/cli/StreamConsumer.java | 2 +- .../org/codehaus/plexus/util/cli/StreamFeeder.java | 23 +- .../org/codehaus/plexus/util/cli/StreamPumper.java | 15 +- .../plexus/util/cli/WriterStreamConsumer.java | 2 +- .../plexus/util/cli/shell/BourneShell.java | 11 +- .../codehaus/plexus/util/cli/shell/CmdShell.java | 6 +- .../plexus/util/cli/shell/CommandShell.java | 2 +- .../org/codehaus/plexus/util/cli/shell/Shell.java | 38 +- .../plexus/util/dag/CycleDetectedException.java | 11 +- .../codehaus/plexus/util/dag/CycleDetector.java | 66 ++- .../java/org/codehaus/plexus/util/dag/DAG.java | 32 +- .../plexus/util/dag/TopologicalSorter.java | 45 +- .../java/org/codehaus/plexus/util/dag/Vertex.java | 29 +- .../plexus/util/introspection/ClassMap.java | 57 ++- .../plexus/util/introspection/MethodMap.java | 51 ++- .../introspection/ReflectionValueExtractor.java | 24 +- .../plexus/util/io/FileInputStreamFacade.java | 43 -- .../plexus/util/io/RawInputStreamFacade.java | 4 +- .../plexus/util/io/URLInputStreamFacade.java | 3 - .../codehaus/plexus/util/reflection/Reflector.java | 78 ++-- .../plexus/util/reflection/ReflectorException.java | 4 +- .../codehaus/plexus/util/xml/CompactXMLWriter.java | 2 +- .../plexus/util/xml/PrettyPrintXMLWriter.java | 45 +- .../plexus/util/xml/SerializerXMLWriter.java | 2 +- .../org/codehaus/plexus/util/xml/XMLWriter.java | 2 +- .../org/codehaus/plexus/util/xml/XmlReader.java | 2 +- .../codehaus/plexus/util/xml/XmlStreamWriter.java | 2 +- .../java/org/codehaus/plexus/util/xml/XmlUtil.java | 2 +- .../codehaus/plexus/util/xml/XmlWriterUtil.java | 17 +- .../java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 33 +- .../codehaus/plexus/util/xml/Xpp3DomBuilder.java | 23 +- .../codehaus/plexus/util/xml/Xpp3DomWriter.java | 2 +- .../plexus/util/xml/pull/EntityReplacementMap.java | 170 ++++++++ .../codehaus/plexus/util/xml/pull/MXParser.java | 42 +- .../plexus/util/xml/pull/MXSerializer.java | 8 +- .../util/xml/pull/XmlPullParserException.java | 15 +- .../org/codehaus/plexus/util/io/package.html | 26 ++ .../javadoc/org/codehaus/plexus/util/package.html | 4 +- src/site/site.xml | 17 +- .../codehaus/plexus/util/AbstractTestThread.java | 2 +- .../codehaus/plexus/util/DirectoryScannerTest.java | 2 +- .../codehaus/plexus/util/FileBasedTestCase.java | 1 - .../org/codehaus/plexus/util/FileUtilsTest.java | 174 ++++---- .../util/LineOrientedInterpolatingReaderTest.java | 30 +- ...gInputStreamTest.java => MatchPatternTest.java} | 12 +- ...InputStreamTest.java => MatchPatternsTest.java} | 16 +- .../org/codehaus/plexus/util/PathToolTest.java | 2 +- .../java/org/codehaus/plexus/util/PerfTest.java | 58 +++ .../codehaus/plexus/util/SelectorUtilsTest.java | 74 ++++ .../plexus/util/StringInputStreamTest.java | 2 +- .../org/codehaus/plexus/util/StringUtilsTest.java | 19 +- .../org/codehaus/plexus/util/SweeperPoolTest.java | 2 +- .../codehaus/plexus/util/TestThreadManager.java | 4 +- src/test/java/org/codehaus/plexus/util/Tracer.java | 2 +- .../plexus/util/cli/CommandLineUtilsTest.java | 17 +- .../codehaus/plexus/util/cli/CommandlineTest.java | 2 +- .../util/cli/EnhancedStringTokenizerTest.java | 2 +- .../codehaus/plexus/util/cli/StreamPumperTest.java | 35 +- .../plexus/util/cli/shell/BourneShellTest.java | 16 + .../util/dag/CycleDetectedExceptionTest.java | 4 +- .../plexus/util/dag/CycleDetectorTest.java | 8 +- .../java/org/codehaus/plexus/util/dag/DAGTest.java | 8 +- .../plexus/util/dag/TopologicalSorterTest.java | 18 +- .../org/codehaus/plexus/util/dag/VertexTest.java | 2 +- .../ReflectionValueExtractorTest.java | 2 +- .../plexus/util/reflection/ReflectorTest.java | 2 +- .../plexus/util/xml/PrettyPrintXMLWriterTest.java | 4 +- .../org/codehaus/plexus/util/xml/XmlUtilTest.java | 2 +- .../plexus/util/xml/XmlWriterUtilTest.java | 2 +- .../plexus/util/xml/Xpp3DomBuilderTest.java | 25 +- .../org/codehaus/plexus/util/xml/Xpp3DomTest.java | 6 + .../plexus/util/xml/Xpp3DomWriterTest.java | 2 +- .../plexus/util/xml/pull/MXParserTest.java | 22 +- .../resources/dir-layout-copy/dir1/dir2/.gitignore | 1 + .../resources/dir-layout-copy/empty-dir/.gitignore | 1 + src/test/resources/test.xdoc.xhtml | 210 +++++----- 114 files changed, 2887 insertions(+), 1889 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-utils2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
