Author: struberg
Date: Mon Sep 7 15:46:16 2009
New Revision: 812205
URL: http://svn.apache.org/viewvc?rev=812205&view=rev
Log:
MSHADE-54 check local IT-repository for the properly deployed artifacts
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/setup.bsh
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/setup.bsh
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/setup.bsh
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/setup.bsh
Removed:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/invoker.properties
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/invoker.properties
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/invoker.properties
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/invoker.properties
Modified:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/verify.bsh
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/verify.bsh
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/verify.bsh
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/verify.bsh
Modified:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/pom.xml?rev=812205&r1=812204&r2=812205&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/pom.xml
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/pom.xml
Mon Sep 7 15:46:16 2009
@@ -22,7 +22,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.shade.aat</groupId>
+ <groupId>org.apache.maven.its.shade.fnba</groupId>
<artifactId>finalNameBuildAttached</artifactId>
<version>1.0</version>
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/setup.bsh?rev=812205&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/setup.bsh
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/setup.bsh
Mon Sep 7 15:46:16 2009
@@ -0,0 +1,11 @@
+import java.io.*;
+import java.util.*;
+
+import org.codehaus.plexus.util.*;
+
+File file = new File( localRepositoryPath, "org/apache/maven/its/shade/fnba" );
+System.out.println( "Deleting " + file );
+FileUtils.deleteDirectory( file );
+
+return true;
+
Modified:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/verify.bsh?rev=812205&r1=812204&r2=812205&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/verify.bsh
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild-attached/verify.bsh
Mon Sep 7 15:46:16 2009
@@ -21,6 +21,24 @@
System.out.println( "shaded file does not exist: " + shaded );
return false;
}
+
+ // check for the artifact in the repo (unshaded)
+ File rfile = new File( localRepositoryPath
+ ,
"org/apache/maven/its/shade/fnba/finalNameBuildAttached/1.0/finalNameBuildAttached-1.0.jar"
);
+ System.out.println( "Checking for existence in repo: " + rfile );
+ if ( !rfile.isFile() )
+ {
+ throw new FileNotFoundException( "Missing: " + rfile.getAbsolutePath()
);
+ }
+
+ // check for the shaded artifact in the repo (shaded as attached artifact)
+ File afile = new File( localRepositoryPath
+ ,
"org/apache/maven/its/shade/fnba/finalNameBuildAttached/1.0/finalNameBuildAttached-1.0-shaded.jar"
);
+ System.out.println( "Checking for existence in repo: " + afile );
+ if ( !afile.isFile() )
+ {
+ throw new FileNotFoundException( "Missing: " + afile.getAbsolutePath()
);
+ }
}
catch( Throwable t )
{
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/pom.xml?rev=812205&r1=812204&r2=812205&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/pom.xml
(original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/pom.xml Mon
Sep 7 15:46:16 2009
@@ -22,7 +22,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.shade.aat</groupId>
+ <groupId>org.apache.maven.its.shade.fnb</groupId>
<artifactId>finalNameBuild</artifactId>
<version>1.0</version>
Added: maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/setup.bsh?rev=812205&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/setup.bsh
(added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/setup.bsh Mon
Sep 7 15:46:16 2009
@@ -0,0 +1,11 @@
+import java.io.*;
+import java.util.*;
+
+import org.codehaus.plexus.util.*;
+
+File file = new File( localRepositoryPath, "org/apache/maven/its/shade/fnb" );
+System.out.println( "Deleting " + file );
+FileUtils.deleteDirectory( file );
+
+return true;
+
Modified:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/verify.bsh?rev=812205&r1=812204&r2=812205&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/verify.bsh
(original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/finalNameBuild/verify.bsh Mon
Sep 7 15:46:16 2009
@@ -22,16 +22,14 @@
return false;
}
-/* TODO: enable after we switched form package to install target for the ITS!
- // check for the artifact in the repo
- File rfile = new File( new File( basedir, "target/local-repo" ),
-
"org/apache/maven/its/shade/aat/finalNameBuild/1.0/finalNameBuild-1.0.jar" );
+ // check for the artifact in the repo. This is the shaded one!
+ File rfile = new File( localRepositoryPath
+ ,
"org/apache/maven/its/shade/fnb/finalNameBuild/1.0/finalNameBuild-1.0.jar" );
System.out.println( "Checking for existence in repo: " + rfile );
if ( !rfile.isFile() )
{
throw new FileNotFoundException( "Missing: " + rfile.getAbsolutePath()
);
}
-*/
}
catch( Throwable t )
{
Modified:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/pom.xml?rev=812205&r1=812204&r2=812205&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/pom.xml
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/pom.xml
Mon Sep 7 15:46:16 2009
@@ -22,7 +22,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.shade.aat</groupId>
+ <groupId>org.apache.maven.its.shade.fnsa</groupId>
<artifactId>finalNameShadeAttached</artifactId>
<version>1.0</version>
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/setup.bsh?rev=812205&view=auto
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/setup.bsh
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/setup.bsh
Mon Sep 7 15:46:16 2009
@@ -0,0 +1,11 @@
+import java.io.*;
+import java.util.*;
+
+import org.codehaus.plexus.util.*;
+
+File file = new File( localRepositoryPath, "org/apache/maven/its/shade/fnsa" );
+System.out.println( "Deleting " + file );
+FileUtils.deleteDirectory( file );
+
+return true;
+
Modified:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/verify.bsh?rev=812205&r1=812204&r2=812205&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/verify.bsh
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade-attached/verify.bsh
Mon Sep 7 15:46:16 2009
@@ -21,6 +21,25 @@
System.out.println( "shaded file does not exist: " + shaded );
return false;
}
+
+ // check for the artifact in the repo
+ File rfile = new File( localRepositoryPath
+ ,
"org/apache/maven/its/shade/fnsa/finalNameShadeAttached/1.0/finalNameShadeAttached-1.0.jar"
);
+ System.out.println( "Checking for existence in repo: " + rfile );
+ if ( !rfile.isFile() )
+ {
+ throw new FileNotFoundException( "Missing: " + rfile.getAbsolutePath()
);
+ }
+
+ // check for the shaded artifact in the repo
+ File afile = new File( localRepositoryPath
+ ,
"org/apache/maven/its/shade/fnsa/finalNameShadeAttached/1.0/finalNameShadeAttached-1.0-shaded.jar"
);
+ System.out.println( "Checking for existence in repo: " + afile );
+ if ( !afile.isFile() )
+ {
+ throw new FileNotFoundException( "Missing: " + afile.getAbsolutePath()
);
+ }
+
}
catch( Throwable t )
{
Modified: maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/pom.xml?rev=812205&r1=812204&r2=812205&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/pom.xml
(original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/pom.xml Mon
Sep 7 15:46:16 2009
@@ -22,7 +22,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.shade.aat</groupId>
+ <groupId>org.apache.maven.its.shade.fns</groupId>
<artifactId>finalNameShade</artifactId>
<version>1.0</version>
Added: maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/setup.bsh?rev=812205&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/setup.bsh
(added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/setup.bsh Mon
Sep 7 15:46:16 2009
@@ -0,0 +1,11 @@
+import java.io.*;
+import java.util.*;
+
+import org.codehaus.plexus.util.*;
+
+File file = new File( localRepositoryPath, "org/apache/maven/its/shade/fns" );
+System.out.println( "Deleting " + file );
+FileUtils.deleteDirectory( file );
+
+return true;
+
Modified:
maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/verify.bsh?rev=812205&r1=812204&r2=812205&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/verify.bsh
(original)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/finalNameShade/verify.bsh Mon
Sep 7 15:46:16 2009
@@ -21,6 +21,16 @@
System.out.println( "shaded file does not exist: " + shaded );
return false;
}
+
+ // check for the artifact in the repo
+ File rfile = new File( localRepositoryPath
+ ,
"org/apache/maven/its/shade/fns/finalNameShade/1.0/finalNameShade-1.0.jar" );
+ System.out.println( "Checking for existence in repo: " + rfile );
+ if ( !rfile.isFile() )
+ {
+ throw new FileNotFoundException( "Missing: " + rfile.getAbsolutePath()
);
+ }
+
}
catch( Throwable t )
{
