Author: snicoll
Date: Sat Mar 26 10:45:21 2011
New Revision: 1085681
URL: http://svn.apache.org/viewvc?rev=1085681&view=rev
Log:
MACR-1: Applied Benjamin's remark. Added versions for plugins involved in the
default life cycle of the plugin. Now running install and added a check that
the proper extension is used in the repository (i.e. .jar)
Modified:
maven/plugins/trunk/maven-acr-plugin/pom.xml
maven/plugins/trunk/maven-acr-plugin/src/it/it-01/verify.bsh
maven/plugins/trunk/maven-acr-plugin/src/main/resources/META-INF/plexus/components.xml
Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/pom.xml?rev=1085681&r1=1085680&r2=1085681&view=diff
==============================================================================
--- maven/plugins/trunk/maven-acr-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-acr-plugin/pom.xml Sat Mar 26 10:45:21 2011
@@ -138,7 +138,7 @@ under the License.
<settingsFile>src/it/settings.xml</settingsFile>
<goals>
<goal>clean</goal>
- <goal>package</goal>
+ <goal>install</goal>
</goals>
</configuration>
<executions>
Modified: maven/plugins/trunk/maven-acr-plugin/src/it/it-01/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/src/it/it-01/verify.bsh?rev=1085681&r1=1085680&r2=1085681&view=diff
==============================================================================
--- maven/plugins/trunk/maven-acr-plugin/src/it/it-01/verify.bsh (original)
+++ maven/plugins/trunk/maven-acr-plugin/src/it/it-01/verify.bsh Sat Mar 26
10:45:21 2011
@@ -30,6 +30,15 @@ try
}
jar.close();
+
+ // Make sure that the jar has been added with a .jar extension
+ File localRepo = new File( basedir.getParentFile().getParentFile(),
"local-repo" );
+ File repoFile = new File(localRepo,
+
"/org/apache/maven/plugin/maven-acr-plugin-it01/1.0/maven-acr-plugin-it01-1.0.jar");
+ if (!repoFile.exists()) {
+ System.out.println("Jar file for application client not found in repo
[" + repoFile.getAbsolutePath() + "]");
+ return false;
+ }
}
catch( Throwable t )
{
Modified:
maven/plugins/trunk/maven-acr-plugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1085681&r1=1085680&r2=1085681&view=diff
==============================================================================
---
maven/plugins/trunk/maven-acr-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/plugins/trunk/maven-acr-plugin/src/main/resources/META-INF/plexus/components.xml
Sat Mar 26 10:45:21 2011
@@ -27,7 +27,6 @@
<configuration>
<type>app-client</type>
<extension>jar</extension>
- <packaging>jar</packaging>
<language>java</language>
<addedToClasspath>true</addedToClasspath>
</configuration>
@@ -41,15 +40,30 @@
<lifecycle>
<id>default</id>
<phases>
-
<process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-
<compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-
<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources
+ <process-resources>
+ org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources
+ </process-resources>
+ <compile>
+ org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
+ </compile>
+ <process-test-resources>
+
org.apache.maven.plugins:maven-resources-plugin:2.4.3:testResources
</process-test-resources>
-
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
- <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
- <package>org.apache.maven.plugins:maven-acr-plugin:acr</package>
-
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
-
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+ <test-compile>
+
org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
+ </test-compile>
+ <test>
+ org.apache.maven.plugins:maven-surefire-plugin:2.7.2:test
+ </test>
+ <package>
+ org.apache.maven.plugins:maven-acr-plugin:acr
+ </package>
+ <install>
+ org.apache.maven.plugins:maven-install-plugin:2.3.1:install
+ </install>
+ <deploy>
+ org.apache.maven.plugins:maven-deploy-plugin:2.5:deploy
+ </deploy>
</phases>
</lifecycle>
</lifecycles>
