svn commit: r1791607 - in /maven/plugins/trunk/maven-deploy-plugin/src/test: java/org/apache/maven/plugins/deploy/ resources/unit/deploy-file-artifact-not-jar/ resources/unit/deploy-file-classifier/ resources/unit/deploy-file-legacy-repository-layout/ ...

[kh...@apache.org]

Author: khmarbaise
Date: Sun Apr 16 13:17:52 2017
New Revision: 1791607

URL: http://svn.apache.org/viewvc?rev=1791607&view=rev
Log:
[MDEPLOY-207] Remove @Deprecated marked code
 o followup fixed the UT which are referencing
   plugin-config.xml files.

Removed:
    maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-legacy-repository-layout/
Modified:
    maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
    maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml
    maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml
    maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml
    maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java?rev=1791607&r1=1791606&r2=1791607&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java Sun Apr 16 13:17:52 2017
@@ -28,7 +28,6 @@ import java.util.List;
 
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Model;
-import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.repository.internal.MavenRepositorySystemSession;
@@ -267,31 +266,6 @@ public class DeployFileMojoTest
         assertTrue( file.exists() );
     }
 
-//    public void testDeployIfRepositoryLayoutIsLegacy()
-//        throws Exception
-//    {
-//        File testPom = new File( getBasedir(), "target/test-classes/unit/deploy-file-legacy-repository-layout/plugin-config.xml" );
-//
-//        AbstractDeployMojo mojo = (AbstractDeployMojo) lookupMojo( "deploy-file", testPom );
-//
-//        assertNotNull( mojo );
-//
-//        String repositoryLayout = (String) getVariableValueFromObject(  mojo, "repositoryLayout" );
-//
-//        assertEquals( "legacy", repositoryLayout );
-//
-//        try
-//        {
-//            mojo.execute();
-//            fail( "legacy is not supported anymore" );
-//        }
-//        catch ( MojoExecutionException e )
-//        {
-//            assertEquals( "Invalid repository layout: legacy", e.getMessage() );
-//        }
-//
-//    }
-//
     private void addFileToList( File file, List<String> fileList )
     {
         if ( !file.isDirectory() )

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml?rev=1791607&r1=1791606&r2=1791607&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml Sun Apr 16 13:17:52 2017
@@ -29,7 +29,6 @@ under the License.
           <file>${basedir}/src/test/resources/unit/deploy-file-artifact-not-jar/target/deploy-test-file.zip</file>
           <repositoryId>deploy-test</repositoryId>
           <url>file://${basedir}/target/remote-repo/deploy-file-artifact-not-jar</url>
-          <repositoryLayout>default</repositoryLayout>
           <generatePom>true</generatePom>
         </configuration>
       </plugin>

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml?rev=1791607&r1=1791606&r2=1791607&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml Sun Apr 16 13:17:52 2017
@@ -31,7 +31,6 @@ under the License.
           <repositoryId>deploy-test</repositoryId>
           <url>file://${basedir}/target/remote-repo/deploy-file-classifier</url>
           <classifier>bin</classifier>
-          <repositoryLayout>default</repositoryLayout>
           <generatePom>true</generatePom>
         </configuration>
       </plugin>

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml?rev=1791607&r1=1791606&r2=1791607&view=diff
==============================================================================
Binary files maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml (original) and maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml Sun Apr 16 13:17:52 2017 differ

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml?rev=1791607&r1=1791606&r2=1791607&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml Sun Apr 16 13:17:52 2017
@@ -31,7 +31,6 @@ under the License.
           <repositoryId>deploy-test</repositoryId>
           <url>file://${basedir}/target/remote-repo/deploy-file-test</url>
           <description>POM was created from deploy:deploy-file</description>
-          <repositoryLayout>default</repositoryLayout>
           <generatePom>true</generatePom>
         </configuration>
       </plugin>