You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/07/14 00:38:21 UTC
svn commit: r963891 - in /maven/plugins/trunk/maven-repository-plugin/src:
it/bundle-create-alt-pom/ main/java/org/apache/maven/plugins/repository/
test/java/org/apache/maven/plugins/repository/it/
test/java/org/apache/maven/plugins/repository/stubs/
Author: bentmann
Date: Tue Jul 13 22:38:21 2010
New Revision: 963891
URL: http://svn.apache.org/viewvc?rev=963891&view=rev
Log:
[MREPOSITORY-22] repository:bundle-create ignores -f directive (different pom.xml file)
Added:
maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/
- copied from r960838, maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/
maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml
- copied, changed from r960838, maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml
Removed:
maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/pom.xml
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/BundleCreateIT.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/DefaultConfigurationMavenProjectStub.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocJarMavenProjectStub.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocSourcesMavenProjectStub.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoLicenseFileMavenProjectStub.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoProjectNameMavenProjectStub.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoScmMavenProjectStub.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoSourcesJarMavenProjectStub.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java
Copied: maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml (from r960838, maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml?p2=maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml&p1=maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml&r1=960838&r2=963891&rev=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create/pom.xml (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/it/bundle-create-alt-pom/alternative-pom.xml Tue Jul 13 22:38:21 2010
@@ -35,7 +35,7 @@ under the License.
<name>Test</name>
<description>
- Tests the creation of a simple bundle.
+ Tests the creation of a simple bundle from an alternative POM.
</description>
<url>http://maven.apache.org/</url>
Modified: maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java Tue Jul 13 22:38:21 2010
@@ -163,7 +163,7 @@ public class BundleCreateMojo
// Create the bundle archive
// ----------------------------------------------------------------------
- File pom = new File( basedir, POM );
+ File pom = project.getFile();
final String finalName = project.getBuild().getFinalName();
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/BundleCreateIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/BundleCreateIT.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/BundleCreateIT.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/it/BundleCreateIT.java Tue Jul 13 22:38:21 2010
@@ -96,5 +96,32 @@ public class BundleCreateIT
verifier.resetStreams();
}
}
+
+ @SuppressWarnings( "unchecked" )
+ @Test
+ public void createFromAlternativePom()
+ throws Exception
+ {
+ File dir = getTestDir( "bundle-create-alt-pom" );
+
+ Verifier verifier = new Verifier( dir.getAbsolutePath() );
+
+ verifier.getCliOptions().add( "-f alternative-pom.xml --settings ../settings.xml" );
+
+ String prefix = IntegrationTestUtils.getCliPluginPrefix();
+
+ verifier.executeGoal( prefix + "bundle-create" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ File bundleSource = new File( dir, "target/test-1.0-bundle.jar" );
+
+ Set<String> requiredEntries = new HashSet<String>();
+ requiredEntries.add( "pom.xml" );
+ requiredEntries.add( "test-1.0.jar" );
+ requiredEntries.add( "test-1.0-sources.jar" );
+
+ assertZipContents( requiredEntries, Assertions.EMPTY_ENTRY_NAMES, bundleSource );
+ }
}
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/DefaultConfigurationMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/DefaultConfigurationMavenProjectStub.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/DefaultConfigurationMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/DefaultConfigurationMavenProjectStub.java Tue Jul 13 22:38:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.repository.stubs;
+import java.io.File;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Scm;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -55,6 +57,11 @@ public class DefaultConfigurationMavenPr
}
+ public File getFile()
+ {
+ return new File( getBasedir(), "src/test/resources/unit/default-configuration/pom.xml" );
+ }
+
public Scm getScm()
{
return scm;
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocJarMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocJarMavenProjectStub.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocJarMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocJarMavenProjectStub.java Tue Jul 13 22:38:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.repository.stubs;
+import java.io.File;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Scm;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -55,6 +57,11 @@ public class NoJavadocJarMavenProjectStu
}
+ public File getFile()
+ {
+ return new File( getBasedir(), "src/test/resources/unit/no-javadocjar/pom.xml" );
+ }
+
public Scm getScm()
{
return scm;
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocSourcesMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocSourcesMavenProjectStub.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocSourcesMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoJavadocSourcesMavenProjectStub.java Tue Jul 13 22:38:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.repository.stubs;
+import java.io.File;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Scm;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -55,6 +57,11 @@ public class NoJavadocSourcesMavenProjec
}
+ public File getFile()
+ {
+ return new File( getBasedir(), "src/test/resources/unit/no-javadoc-sources/pom.xml" );
+ }
+
public Scm getScm()
{
return scm;
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoLicenseFileMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoLicenseFileMavenProjectStub.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoLicenseFileMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoLicenseFileMavenProjectStub.java Tue Jul 13 22:38:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.repository.stubs;
+import java.io.File;
+
import java.util.ArrayList;
import java.util.List;
@@ -58,6 +60,11 @@ public class NoLicenseFileMavenProjectSt
}
+ public File getFile()
+ {
+ return new File( getBasedir(), "src/test/resources/unit/no-license-file/pom.xml" );
+ }
+
public Scm getScm()
{
return scm;
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoProjectNameMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoProjectNameMavenProjectStub.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoProjectNameMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoProjectNameMavenProjectStub.java Tue Jul 13 22:38:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.repository.stubs;
+import java.io.File;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Scm;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -53,6 +55,11 @@ public class NoProjectNameMavenProjectSt
}
+ public File getFile()
+ {
+ return new File( getBasedir(), "src/test/resources/unit/no-project-name/pom.xml" );
+ }
+
public Scm getScm()
{
return scm;
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoScmMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoScmMavenProjectStub.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoScmMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoScmMavenProjectStub.java Tue Jul 13 22:38:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.repository.stubs;
+import java.io.File;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Scm;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -50,6 +52,11 @@ public class NoScmMavenProjectStub
}
+ public File getFile()
+ {
+ return new File( getBasedir(), "src/test/resources/unit/no-scm/pom.xml" );
+ }
+
public Scm getScm()
{
return scm;
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoSourcesJarMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoSourcesJarMavenProjectStub.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoSourcesJarMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/NoSourcesJarMavenProjectStub.java Tue Jul 13 22:38:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.repository.stubs;
+import java.io.File;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Scm;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -55,6 +57,11 @@ public class NoSourcesJarMavenProjectStu
}
+ public File getFile()
+ {
+ return new File( getBasedir(), "src/test/resources/unit/no-sourcesjar/pom.xml" );
+ }
+
public Scm getScm()
{
return scm;
Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java?rev=963891&r1=963890&r2=963891&view=diff
==============================================================================
--- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java Tue Jul 13 22:38:21 2010
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.repository.stubs;
+import java.io.File;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Scm;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -55,6 +57,11 @@ public class PomOnlyMavenProjectStub
}
+ public File getFile()
+ {
+ return new File( getBasedir(), "src/test/resources/unit/pom-only/pom.xml" );
+ }
+
public Scm getScm()
{
return scm;