Skip to content

Upgrade to Java 7 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Upgrade to Java 7 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c39ff14
Bump version for the upcoming breaking changes
plamentotev May 1, 2017
f49d200
Delete the outdated README file
plamentotev May 3, 2017
2bbfb10
Upgrade the minimum required Java version to Java 7
plamentotev Apr 15, 2017
80a6c3d
Remove the pre-Java 7 code related to the file attributes
plamentotev Apr 15, 2017
3c7cc25
Refactor the code to use diamond operators (<>) and try with resources
plamentotev Apr 15, 2017
c5faa41
Use the system line separator instead of `\n`
plamentotev May 3, 2017
aed65df
Drop the check for Windows 9x
plamentotev May 3, 2017
88cda20
Code cleanup - rename test from `testFolder` to `testDirectory`
plamentotev May 3, 2017
55773f5
Reformat to a common code style
plamentotev May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions README.md
View file
Open in desktop

This file was deleted.

14 changes: 4 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>

<artifactId>plexus-io</artifactId>
<version>2.7.2-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>

<name>Plexus IO Components</name>

Expand Down Expand Up @@ -72,8 +72,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -147,15 +147,9 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java15</artifactId>
<artifactId>java17</artifactId>
<version>1.0</version>
</signature>
<ignores>
<ignore>org.codehaus.plexus.components.io.attributes.Java7FileAttributes</ignore>
<ignore>org.codehaus.plexus.components.io.attributes.Java7AttributeUtils</ignore>
<ignore>java.nio.file.*</ignore>
<ignore>java.io.File</ignore>
</ignores>
</configuration>
</plugin>
</plugins>
Expand Down
233 changes: 0 additions & 233 deletions src/main/java/org/codehaus/plexus/components/io/attributes/AttributeParser.java
View file
Open in desktop

This file was deleted.

17 changes: 9 additions & 8 deletions ...ts/io/attributes/Java7AttributeUtils.java → ...ponents/io/attributes/AttributeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/**
* @author Kristian Rosenvold
*/
public class Java7AttributeUtils
public class AttributeUtils
{
/*
Reads last-modified with proper failure handling if something goes wrong.
Expand Down Expand Up @@ -65,8 +65,8 @@ public static void chmod( @Nonnull File file, int mode )
@Nonnull
public static Set<PosixFilePermission> getPermissions( int mode )
{
Set<PosixFilePermission> perms = new HashSet<PosixFilePermission>();
//add owners permission
Set<PosixFilePermission> perms = new HashSet<>();
// add owners permission
if ( ( mode & 0400 ) > 0 )
{
perms.add( PosixFilePermission.OWNER_READ );
Expand All @@ -79,7 +79,7 @@ public static Set<PosixFilePermission> getPermissions( int mode )
{
perms.add( PosixFilePermission.OWNER_EXECUTE );
}
//add group permissions
// add group permissions
if ( ( mode & 0040 ) > 0 )
{
perms.add( PosixFilePermission.GROUP_READ );
Expand All @@ -92,7 +92,7 @@ public static Set<PosixFilePermission> getPermissions( int mode )
{
perms.add( PosixFilePermission.GROUP_EXECUTE );
}
//add others permissions
// add others permissions
if ( ( mode & 0004 ) > 0 )
{
perms.add( PosixFilePermission.OTHERS_READ );
Expand Down Expand Up @@ -125,7 +125,7 @@ public static BasicFileAttributes getFileAttributes( @Nonnull File file )
public static BasicFileAttributes getFileAttributes( Path path )
throws IOException
{
if (isUnix(path))
if ( isUnix( path ) )
{

try
Expand All @@ -140,8 +140,9 @@ public static BasicFileAttributes getFileAttributes( Path path )
return Files.readAttributes( path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS );
}

public static boolean isUnix(Path path) {
return path.getFileSystem().supportedFileAttributeViews().contains("unix");
public static boolean isUnix( Path path )
{
return path.getFileSystem().supportedFileAttributeViews().contains( "unix" );
}

@Nullable
Expand Down
Loading