package org.apache.maven.cli;

/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import java.io.File;

/**
 * Resolve relative file path against the given base directory
 */
public class ResolveFile
{
    public static File resolveFile( File file, String baseDirectory )
    {
        if ( file == null )
        {
            return null;
        }
        else if ( file.isAbsolute() )
        {
            return file;
        }
        else if ( file.getPath().startsWith( File.separator ) )
        {
            // drive-relative Windows path
            return file.getAbsoluteFile();
        }
        else
        {
            return new File( baseDirectory, file.getPath() ).getAbsoluteFile();
        }
    }
}

@@ -852,16 +852,44 @@
 io.File;
+%0Aimport java.nio.file.Paths;
 %0A%0A/**%0A *
@@ -1428,16 +1428,17 @@
 urn 
-new File
+Paths.get
 ( ba
@@ -1467,27 +1467,30 @@
 ath() ).
-getAbsolute
+normalize().to
 File();%0A

Normalize relative paths for working directory