[Git][java-team/plexus-io][master] 3 commits: New upstream version 3.1.1

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / plexus-io


Commits:
58556bf1 by Emmanuel Bourg at 2018-12-10T23:02:32Z
New upstream version 3.1.1
- - - - -
4403da68 by Emmanuel Bourg at 2018-12-10T23:02:32Z
Update upstream source from tag 'upstream/3.1.1'

Update to upstream version '3.1.1'
with Debian dir 611ac6fa0f6e384fc2a1c6996d65d23f27861196
- - - - -
4463fb9b by Emmanuel Bourg at 2018-12-10T23:04:57Z
New upstream release (3.1.1)

- - - - -


5 changed files:

- README.md
- ReleaseNotes.md
- debian/changelog
- pom.xml
- src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java


Changes:

=====================================
README.md
=====================================
@@ -17,5 +17,6 @@ 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.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,16 @@
 Plexus-IO Release Notes
 ========================================================================
 
+Plexus IO 3.1.0
+---------------
+
+Plexus IO 3.1.0 requires Java 7.
+
+### New Features
+
+ * [Pull Request #14][pr-14] - Add new FileMapper for giving a suffix to filename:
+   `SuffixFileMapper`. Thanks to Thomas Collignon.
+
 Plexus IO 3.0.1
 ---------------
 
@@ -207,3 +217,4 @@ Plexus IO 2.0.12
 [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


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+plexus-io (3.1.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 11 Dec 2018 00:03:31 +0100
+
 plexus-io (3.1.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
pom.xml
=====================================
@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>plexus-io</artifactId>
-  <version>3.1.0</version>
+  <version>3.1.1</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.0</tag>
+    <tag>plexus-io-3.1.1</tag>
   </scm>
   <issueManagement>
     <system>jira</system>


=====================================
src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java
=====================================
@@ -64,7 +64,7 @@ public FileAttributes( @Nonnull File file, @Nonnull Map<Integer, String> userCac
         Path path = file.toPath();
         if ( AttributeUtils.isUnix( path ) )
         {
-            Map<String, Object> attrs = Files.readAttributes( path, "unix:*", LinkOption.NOFOLLOW_LINKS );
+            Map<String, Object> attrs = Files.readAttributes( path, "unix:permissions,gid,uid,isSymbolicLink,mode", LinkOption.NOFOLLOW_LINKS );
             this.permissions = (Set<PosixFilePermission>) attrs.get( "permissions" );
 
             groupId = (Integer) attrs.get( "gid" );
@@ -76,7 +76,8 @@ public FileAttributes( @Nonnull File file, @Nonnull Map<Integer, String> userCac
             }
             else
             {
-                this.groupName = ( (Principal) attrs.get( "group" ) ).getName();
+                Object group = Files.getAttribute( path, "unix:group", LinkOption.NOFOLLOW_LINKS );
+                this.groupName = ( (Principal) group ).getName();
                 groupCache.put( groupId, this.groupName );
             }
             userId = (Integer) attrs.get( "uid" );
@@ -87,7 +88,8 @@ public FileAttributes( @Nonnull File file, @Nonnull Map<Integer, String> userCac
             }
             else
             {
-                this.userName = ( (Principal) attrs.get( "owner" ) ).getName();
+                Object owner = Files.getAttribute( path, "unix:owner", LinkOption.NOFOLLOW_LINKS );
+                this.userName = ( (Principal) owner ).getName();
                 userCache.put( userId, this.userName );
             }
             octalMode = (Integer) attrs.get( "mode" ) & 0xfff; // Mask off top bits for compatibilty. Maybe check if we



View it on GitLab: https://salsa.debian.org/java-team/plexus-io/compare/d0f8964063a4b5d00b8afcb70e7495a56ee59b1b...4463fb9bf7b917fa9ada62d633aed6bc18d00cc1

-- 
View it on GitLab: https://salsa.debian.org/java-team/plexus-io/compare/d0f8964063a4b5d00b8afcb70e7495a56ee59b1b...4463fb9bf7b917fa9ada62d633aed6bc18d00cc1
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/20181210/ef374cb0/attachment.html>