[Git][java-team/plexus-io][master] 8 commits: New upstream version 3.2.0
Tony Mancill
gitlab at salsa.debian.org
Thu Apr 2 05:49:14 BST 2020
Tony Mancill pushed to branch master at Debian Java Maintainers / plexus-io
Commits:
3e932c09 by tony mancill at 2020-04-01T21:13:58-07:00
New upstream version 3.2.0
- - - - -
5287601d by tony mancill at 2020-04-01T21:13:58-07:00
Update upstream source from tag 'upstream/3.2.0'
Update to upstream version '3.2.0'
with Debian dir 56be11daa2a977f00b9290e8e5013c9cac688d84
- - - - -
55fc22fb by tony mancill at 2020-04-01T21:15:50-07:00
Refresh patches against new upstream version
- - - - -
4ac9d2f2 by tony mancill at 2020-04-01T21:17:13-07:00
Specify debhelper compat 12 via debhelper-compat dependency
- - - - -
abafc6ff by tony mancill at 2020-04-01T21:17:45-07:00
Set "Rules-Requires-Root: no" in debian/control
- - - - -
69184043 by tony mancill at 2020-04-01T21:18:56-07:00
Bump Standards-Version to 4.5.0
- - - - -
282a5310 by tony mancill at 2020-04-01T21:29:11-07:00
Ship NOTICE.txt with binary package
- - - - -
08449ab8 by tony mancill at 2020-04-01T21:30:39-07:00
prepare changelog for upload to unstable
- - - - -
18 changed files:
- .travis.yml
- README.md
- ReleaseNotes.md
- debian/changelog
- − debian/compat
- debian/control
- + debian/libplexus-io-java.docs
- debian/patches/01-backward-compatibility.patch
- pom.xml
- src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java
- src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributes.java
- src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java
- src/main/java/org/codehaus/plexus/components/io/filemappers/SuffixFileMapper.java
- src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoArchiveResourceCollection.java
- src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoArchivedResourceCollection.java
- src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java
- src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java
- src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java
Changes:
=====================================
.travis.yml
=====================================
@@ -3,6 +3,8 @@ jdk:
- openjdk7
- oraclejdk8
+dist: trusty
+
# No need for preliminary install step.
install: true
#
=====================================
README.md
=====================================
@@ -9,7 +9,7 @@ The current master is now at https://github.com/codehaus-plexus/plexus-io
For publishing [the site](https://codehaus-plexus.github.io/plexus-io/) do the following:
```
-mvn -Preporting verify site site:stage scm-publish:publish-scm
+mvn -Preporting verify site-deploy
```
## Release Notes
@@ -17,6 +17,8 @@ mvn -Preporting verify site site:stage scm-publish:publish-scm
You can find details about the different releases in the
[Release Notes](https://github.com/codehaus-plexus/plexus-io/blob/master/ReleaseNotes.md).
+ * [Release 3.2.0](https://github.com/codehaus-plexus/plexus-io/blob/master/ReleaseNotes.md#plexus-io-320).
+ * [Release 3.1.1](https://github.com/codehaus-plexus/plexus-io/blob/master/ReleaseNotes.md#plexus-io-311).
* [Release 3.1.0](https://github.com/codehaus-plexus/plexus-io/blob/master/ReleaseNotes.md#plexus-io-310).
* [Release 3.0.1](https://github.com/codehaus-plexus/plexus-io/blob/master/ReleaseNotes.md#plexus-io-301).
* [Release 3.0.0](https://github.com/codehaus-plexus/plexus-io/blob/master/ReleaseNotes.md#plexus-io-300).
=====================================
ReleaseNotes.md
=====================================
@@ -1,6 +1,26 @@
Plexus-IO Release Notes
========================================================================
+Plexus IO 3.2.0
+---------------
+
+Plexus IO 3.2.0 requires Java 7.
+
+### New Features
+
+ * [Issue #18][issue-18] - Add an option to sort the entries of PlexusIoFileResourceCollection
+
+Plexus IO 3.1.1
+---------------
+
+Plexus IO 3.1.1 requires Java 7.
+
+### Improvements
+
+ * [Issue #16][issue-16], [Pull Request #17][pr-17] - Improve performance
+ on systems which have high time penalty when fetching owner and group name.
+ Thanks to Classe.
+
Plexus IO 3.1.0
---------------
@@ -214,7 +234,10 @@ Plexus IO 2.0.12
[issue-8]: https://github.com/codehaus-plexus/plexus-io/issues/8
[issue-9]: https://github.com/codehaus-plexus/plexus-io/issues/9
[issue-10]: https://github.com/codehaus-plexus/plexus-io/issues/10
+[issue-16]: https://github.com/codehaus-plexus/plexus-io/issues/16
+[issue-18]: https://github.com/codehaus-plexus/plexus-io/issues/18
[pr-1]: https://github.com/codehaus-plexus/plexus-io/pull/1
[pr-3]: https://github.com/codehaus-plexus/plexus-io/pull/3
[pr-5]: https://github.com/codehaus-plexus/plexus-io/pull/5
[pr-14]: https://github.com/codehaus-plexus/plexus-io/pull/14
+[pr-17]: https://github.com/codehaus-plexus/plexus-io/pull/17
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+plexus-io (3.2.0-1) unstable; urgency=medium
+
+ * New upstream version 3.2.0
+ * Refresh patches against new upstream version
+ * Specify debhelper compat 12 via debhelper-compat dependency
+ * Set "Rules-Requires-Root: no" in debian/control
+ * Bump Standards-Version to 4.5.0
+ * Ship NOTICE.txt with binary package
+
+ -- tony mancill <tmancill at debian.org> Wed, 01 Apr 2020 21:21:20 -0700
+
plexus-io (3.1.1-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Uploaders:
Ludovic Claude <ludovic.claude at laposte.net>,
tony mancill <tmancill at debian.org>
Build-Depends:
- debhelper (>= 11~),
+ debhelper-compat (= 12),
default-jdk,
junit4,
libcommons-io-java,
@@ -16,10 +16,11 @@ Build-Depends:
libplexus-container-default1.5-java,
libplexus-utils2-java,
maven-debian-helper (>= 2.2)
-Standards-Version: 4.2.1
+Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/java-team/plexus-io.git
Vcs-Browser: https://salsa.debian.org/java-team/plexus-io
Homepage: https://github.com/codehaus-plexus/plexus-io
+Rules-Requires-Root: no
Package: libplexus-io-java
Architecture: all
=====================================
debian/libplexus-io-java.docs
=====================================
@@ -0,0 +1 @@
+NOTICE.txt
=====================================
debian/patches/01-backward-compatibility.patch
=====================================
@@ -11,7 +11,7 @@ Forwarded: not-needed
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
-@@ -54,6 +55,11 @@
+@@ -60,6 +61,11 @@
{
}
=====================================
pom.xml
=====================================
@@ -8,7 +8,7 @@
</parent>
<artifactId>plexus-io</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<name>Plexus IO Components</name>
@@ -16,7 +16,7 @@
<connection>scm:git:git at github.com:codehaus-plexus/plexus-io.git</connection>
<developerConnection>scm:git:git at github.com:codehaus-plexus/plexus-io.git</developerConnection>
<url>http://github.com/codehaus-plexus/plexus-io</url>
- <tag>plexus-io-3.1.1</tag>
+ <tag>plexus-io-3.2.0</tag>
</scm>
<issueManagement>
<system>jira</system>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.1.0</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
=====================================
src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java
=====================================
@@ -134,7 +134,7 @@ public static BasicFileAttributes getFileAttributes( Path path )
}
catch ( UnsupportedOperationException ignore )
{
- // Maybe ignoring is dramatic. Maybe not. But we do get the basic attrs anyqway
+ // Maybe ignoring is dramatic. Maybe not. But we do get the basic attrs anyway
}
}
return Files.readAttributes( path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS );
=====================================
src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributes.java
=====================================
@@ -78,7 +78,7 @@
//String getOctalModeString();
/**
- * Indicates if this is a symnbolic link element.
+ * Indicates if this is a symbolic link element.
* For file-based resource attributes this value may be always "false" for versions prior to java7.
* @return True if the file is a symlink or false if not.
*/
=====================================
src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java
=====================================
@@ -70,7 +70,7 @@ public String getReplacement()
}
/**
- * Returns, whether to replace the first occurrency of the pattern
+ * Returns, whether to replace the first occurrence of the pattern
* (default), or all.
*/
public boolean getReplaceAll()
@@ -79,7 +79,7 @@ public boolean getReplaceAll()
}
/**
- * Sets, whether to replace the first occurrency of the pattern
+ * Sets, whether to replace the first occurrence of the pattern
* (default), or all.
*/
public void setReplaceAll( boolean pReplaceAll )
=====================================
src/main/java/org/codehaus/plexus/components/io/filemappers/SuffixFileMapper.java
=====================================
@@ -19,7 +19,7 @@
/**
* A file mapper, which maps by adding a suffix to the filename.
* If the filename contains dot, the suffix will be added before.
- * Example : {@code directory/archive.tar.gz => directory/archivesuffix.tar.gz}
+ * Example: {@code directory/archive.tar.gz => directory/archivesuffix.tar.gz}
*/
public class SuffixFileMapper extends AbstractFileMapper
{
=====================================
src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoArchiveResourceCollection.java
=====================================
@@ -152,7 +152,8 @@ public void forEach( PlexusIoResourceConsumer resourceConsumer )
};
}
- public long getLastModified() throws IOException
+ public long getLastModified()
+ throws IOException
{
File f = getFile();
return f == null ? PlexusIoResource.UNKNOWN_MODIFICATION_DATE : f.lastModified();
=====================================
src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoArchivedResourceCollection.java
=====================================
@@ -20,13 +20,13 @@
/**
* Extension of {@link PlexusIoResourceCollection} for archive
- * files: Zip, tar, gzip, bzip2, etc. files.
+ * files: zip, tar, gzip, bzip2, etc. files.
*/
public interface PlexusIoArchivedResourceCollection
extends PlexusIoResourceCollection
{
/**
- * Sets the arcihve file
+ * Sets the archive file
*/
void setFile( File file );
=====================================
src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java
=====================================
@@ -110,7 +110,7 @@ public static String getName( File file )
}
/**
- * Returns the resources file.
+ * Returns the resource file.
*/
@Nonnull
public File getFile()
=====================================
src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java
=====================================
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -50,6 +51,11 @@
private boolean isFollowingSymLinks = true;
+ /**
+ * @since 3.2.0
+ */
+ private Comparator<String> filenameComparator;
+
public PlexusIoFileResourceCollection()
{
}
@@ -241,6 +247,7 @@ public Object call()
}
ds.setCaseSensitive( isCaseSensitive() );
ds.setFollowSymlinks( isFollowingSymLinks() );
+ ds.setFilenameComparator( filenameComparator );
ds.scan();
final List<PlexusIoResource> result = new ArrayList<>();
@@ -259,4 +266,12 @@ public boolean isConcurrentAccessSupported()
{
return true;
}
+
+ /**
+ * @since 3.2.0
+ */
+ public void setFilenameComparator( Comparator<String> filenameComparator )
+ {
+ this.filenameComparator = filenameComparator;
+ }
}
=====================================
src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java
=====================================
@@ -80,7 +80,7 @@
InputStream getInputStream( PlexusIoResource resource ) throws IOException;
/**
- * Resolves the supplide resource into a "real" resource. Resolving
+ * Resolves the supplied resource into a "real" resource. Resolving
* means applying input transformations
* Returns an input stream for the provided resource, with stream transformers applied
* @param resource The resources
View it on GitLab: https://salsa.debian.org/java-team/plexus-io/-/compare/4463fb9bf7b917fa9ada62d633aed6bc18d00cc1...08449ab8796068cd2f3b6e01400bd512596d61bd
--
View it on GitLab: https://salsa.debian.org/java-team/plexus-io/-/compare/4463fb9bf7b917fa9ada62d633aed6bc18d00cc1...08449ab8796068cd2f3b6e01400bd512596d61bd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200402/4dadb49e/attachment.html>
More information about the pkg-java-commits
mailing list