Emmanuel Bourg pushed to branch master at Debian Java Maintainers / plexus-utils2
Commits: 43fa4a3e by Emmanuel Bourg at 2020-01-27T17:08:15+01:00 Standards-Version updated to 4.5.0 - - - - - fbc5b972 by Emmanuel Bourg at 2020-01-27T17:13:21+01:00 New upstream version 3.3.0 - - - - - 4323818f by Emmanuel Bourg at 2020-01-27T17:13:22+01:00 Update upstream source from tag 'upstream/3.3.0' Update to upstream version '3.3.0' with Debian dir 7a5ab6722dbebadfe699250eec1954ce42cbc837 - - - - - 66d708f0 by Emmanuel Bourg at 2020-01-27T17:17:10+01:00 New upstream release (3.3.0) - - - - - 8 changed files: - .travis.yml - debian/changelog - debian/control - pom.xml - src/main/java/org/codehaus/plexus/util/AbstractScanner.java - src/main/java/org/codehaus/plexus/util/DirectoryScanner.java - src/main/java/org/codehaus/plexus/util/Scanner.java - src/main/java/org/codehaus/plexus/util/cli/Commandline.java Changes: ===================================== .travis.yml ===================================== @@ -5,6 +5,8 @@ jdk: - openjdk11 # - openjdk12 add once code is requires Java 7 +dist: trusty + # No need for preliminary install step. install: true # ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +plexus-utils2 (3.3.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release + * Standards-Version updated to 4.5.0 + + -- Emmanuel Bourg <[email protected]> Mon, 27 Jan 2020 17:17:00 +0100 + plexus-utils2 (3.2.1-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -11,7 +11,7 @@ Build-Depends: libmaven-javadoc-plugin-java, libmaven-plugin-testing-java, maven-debian-helper -Standards-Version: 4.4.0 +Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/java-team/plexus-utils2.git Vcs-Browser: https://salsa.debian.org/java-team/plexus-utils2 Homepage: http://codehaus-plexus.github.io/plexus-utils/ ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ limitations under the License. </parent> <artifactId>plexus-utils</artifactId> - <version>3.2.1</version> + <version>3.3.0</version> <name>Plexus Common Utilities</name> <description>A collection of various utility classes to ease working with strings, files, command lines, XML and @@ -37,7 +37,7 @@ limitations under the License. <connection>scm:git:[email protected]:codehaus-plexus/plexus-utils.git</connection> <developerConnection>scm:git:[email protected]:codehaus-plexus/plexus-utils.git</developerConnection> <url>http://github.com/codehaus-plexus/plexus-utils</url> - <tag>plexus-utils-3.2.1</tag> + <tag>plexus-utils-3.3.0</tag> </scm> <issueManagement> <system>github</system> ===================================== src/main/java/org/codehaus/plexus/util/AbstractScanner.java ===================================== @@ -18,6 +18,7 @@ import java.io.File; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; /** @@ -119,6 +120,11 @@ */ protected boolean isCaseSensitive = true; + /** + * @since 3.3.0 + */ + protected Comparator<String> filenameComparator; + /** * Sets whether or not the file system should be regarded as case sensitive. * @@ -390,4 +396,10 @@ protected void setupMatchPatterns() includesPatterns = MatchPatterns.from( includes ); excludesPatterns = MatchPatterns.from( excludes ); } + + @Override + public void setFilenameComparator( Comparator<String> filenameComparator ) + { + this.filenameComparator = filenameComparator; + } } ===================================== src/main/java/org/codehaus/plexus/util/DirectoryScanner.java ===================================== @@ -57,6 +57,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Vector; /** @@ -436,6 +437,11 @@ protected void scandir( File dir, String vpath, boolean fast ) newfiles = noLinks.toArray( new String[noLinks.size()] ); } + if ( filenameComparator != null ) + { + Arrays.sort( newfiles, filenameComparator ); + } + for ( String newfile : newfiles ) { String name = vpath + newfile; ===================================== src/main/java/org/codehaus/plexus/util/Scanner.java ===================================== @@ -17,6 +17,7 @@ */ import java.io.File; +import java.util.Comparator; /** * Scan a directory tree for files, with specified inclusions and exclusions. @@ -83,4 +84,12 @@ * @return the base directory to be scanned */ File getBasedir(); + + /** + * Use a filename comparator in each directory when scanning. + * + * @param filenameComparator + * @since 3.3.0 + */ + void setFilenameComparator( Comparator<String> filenameComparator ); } ===================================== src/main/java/org/codehaus/plexus/util/cli/Commandline.java ===================================== @@ -488,6 +488,15 @@ public void addSystemEnvironment() return getShellCommandline(); } + return getRawCommandline(); + } + + /** + * Returns the executable and all defined arguments.<br> + * + */ + public String[] getRawCommandline() + { final String[] args = getArguments(); String executable = getLiteralExecutable(); @@ -501,7 +510,7 @@ public void addSystemEnvironment() return result; } - /** + /** * Returns the shell, executable and all defined arguments. Shell usage is only desirable when generating code for * remote execution. */ View it on GitLab: https://salsa.debian.org/java-team/plexus-utils2/compare/ea133d5bc1173d6a86daf8f9a0cd165612034114...66d708f00c39f6dcdf88125baae7354aed033a9a -- View it on GitLab: https://salsa.debian.org/java-team/plexus-utils2/compare/ea133d5bc1173d6a86daf8f9a0cd165612034114...66d708f00c39f6dcdf88125baae7354aed033a9a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
