Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 99972 invoked from network); 4 Aug 2009 22:08:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Aug 2009 22:08:22 -0000 Received: (qmail 90706 invoked by uid 500); 4 Aug 2009 22:08:27 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 90612 invoked by uid 500); 4 Aug 2009 22:08:27 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 90603 invoked by uid 99); 4 Aug 2009 22:08:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 22:08:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 22:08:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2A3FF238884C; Tue, 4 Aug 2009 22:07:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r800996 - in /maven/plugins/trunk/maven-repository-plugin: ./ src/main/java/org/apache/maven/plugins/repository/ src/test/java/org/apache/maven/plugins/repository/ src/test/java/org/apache/maven/plugins/repository/stubs/ src/test/resources/... Date: Tue, 04 Aug 2009 22:07:53 -0000 To: commits@maven.apache.org From: jdcasey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090804220754.2A3FF238884C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdcasey Date: Tue Aug 4 22:07:52 2009 New Revision: 800996 URL: http://svn.apache.org/viewvc?rev=800996&view=rev Log: [MREPOSITORY-3] Allow projects with packaging == pom, which allows creating a series of bundle artifacts for a multimodule build, one in each module's target directory. The pom project will include any attached/metadata files such as GPG signatures, in addition to the pom itself. Additionally, batch mode will disable the file-selection prompt, causing Maven to accept all -* files found in the target directory/local repo directory. Added: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java (contents, props changed) - copied, changed from r800978, maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/InvalidPackagingMavenProjectStub.java maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testparent/ maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testparent/1.0/ maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testparent/1.0/testparent-1.0.pom (with props) maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack-parent/ maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack-parent/pom.xml (with props) maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/ maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/LICENSE.txt (contents, props changed) - copied, changed from r800978, maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/LICENSE.txt maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/ maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/configuration/ maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/configuration/App.java (contents, props changed) - copied, changed from r800978, maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/invalid/packaging/App.java maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml (contents, props changed) - copied, changed from r800978, maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/pom.xml Removed: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/InvalidPackagingMavenProjectStub.java maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/LICENSE.txt maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/invalid/packaging/App.java maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/pom.xml Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java Modified: maven/plugins/trunk/maven-repository-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/pom.xml?rev=800996&r1=800995&r2=800996&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/pom.xml Tue Aug 4 22:07:52 2009 @@ -76,6 +76,11 @@ 2.0.6 + org.apache.maven + maven-settings + 2.0.6 + + org.apache.maven.shared maven-plugin-testing-harness 1.0-beta-1 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=800996&r1=800995&r2=800996&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 Aug 4 22:07:52 2009 @@ -23,6 +23,7 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; +import org.apache.maven.settings.Settings; import org.codehaus.plexus.archiver.jar.JarArchiver; import org.codehaus.plexus.components.interactivity.InputHandler; import org.codehaus.plexus.util.StringUtils; @@ -74,19 +75,15 @@ */ protected InputHandler inputHandler; + /** + * @parameter default-value="${settings}" + */ + protected Settings settings; + public void execute() throws MojoExecutionException { // ---------------------------------------------------------------------- - // Make sure we have a packaging != pom - // ---------------------------------------------------------------------- - - if ( project.getPackaging().equals( "pom" ) ) - { - throw new MojoExecutionException( "Packaging cannot be 'pom' when creating an upload bundle." ); - } - - // ---------------------------------------------------------------------- // Check the mandatory elements of the POM // // modelVersion @@ -125,7 +122,8 @@ String outputDirectory = project.getBuild().getDirectory(); - List files = BundleUtils.selectProjectFiles( new File( outputDirectory ), inputHandler, finalName, pom, getLog() ); + boolean batchMode = settings == null ? false : !settings.isInteractiveMode(); + List files = BundleUtils.selectProjectFiles( new File( outputDirectory ), inputHandler, finalName, pom, getLog(), batchMode ); String extension = artifactHandlerManager.getArtifactHandler( project.getPackaging() ).getExtension(); @@ -135,17 +133,18 @@ { jarArchiver.addFile( pom, POM ); + boolean artifactChecks = !"pom".equals( project.getPackaging() ); boolean sourcesFound = false; boolean javadocsFound = false; for ( Iterator it = files.iterator(); it.hasNext(); ) { File f = (File) it.next(); - if ( f.getName().endsWith( finalName + "-sources." + extension ) ) + if ( artifactChecks && f.getName().endsWith( finalName + "-sources." + extension ) ) { sourcesFound = true; } - else if ( f.getName().equals( finalName + "-javadoc." + extension ) ) + else if ( artifactChecks && f.getName().equals( finalName + "-javadoc." + extension ) ) { javadocsFound = true; } @@ -153,13 +152,13 @@ jarArchiver.addFile( f, f.getName() ); } - if ( !sourcesFound ) + if ( artifactChecks && !sourcesFound ) { getLog().warn( "Sources not included in upload bundle. In order to add sources please run" + " \"mvn source:jar javadoc:jar repository:bundle-create\"" ); } - if ( !javadocsFound ) + if ( artifactChecks && !javadocsFound ) { getLog().warn( "Javadoc not included in upload bundle. In order to add javadocs please run" + " \"mvn source:jar javadoc:jar repository:bundle-create\"" ); Modified: maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java?rev=800996&r1=800995&r2=800996&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java (original) +++ maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java Tue Aug 4 22:07:52 2009 @@ -31,6 +31,7 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.settings.Settings; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.jar.JarArchiver; import org.codehaus.plexus.components.interactivity.InputHandler; @@ -123,6 +124,11 @@ * @parameter expression="${version}" */ protected String version; + + /** + * @parameter default-value="${settings}" + */ + protected Settings settings; public void execute() throws MojoExecutionException @@ -218,23 +224,25 @@ finalName = model.getArtifactId() + "-" + model.getVersion(); } - List files = BundleUtils.selectProjectFiles( dir, inputHandler, finalName, pom, getLog() ); + boolean batchMode = settings == null ? false : !settings.isInteractiveMode(); + List files = BundleUtils.selectProjectFiles( dir, inputHandler, finalName, pom, getLog(), batchMode ); File bundle = new File( basedir, finalName + "-bundle.jar" ); jarArchiver.addFile( pom, POM ); + boolean artifactChecks = !"pom".equals( model.getPackaging() ); boolean sourcesFound = false; boolean javadocsFound = false; for ( Iterator it = files.iterator(); it.hasNext(); ) { File f = (File) it.next(); - if ( f.getName().endsWith( finalName + "-sources.jar" ) ) + if ( artifactChecks && f.getName().endsWith( finalName + "-sources.jar" ) ) { sourcesFound = true; } - else if ( f.getName().equals( finalName + "-javadoc.jar" ) ) + else if ( artifactChecks && f.getName().equals( finalName + "-javadoc.jar" ) ) { javadocsFound = true; } @@ -242,12 +250,12 @@ jarArchiver.addFile( f, f.getName() ); } - if ( !sourcesFound ) + if ( artifactChecks && !sourcesFound ) { getLog().warn( "Sources not included in upload bundle." ); } - if ( !javadocsFound ) + if ( artifactChecks && !javadocsFound ) { getLog().warn( "Javadoc not included in upload bundle." ); } Modified: maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java?rev=800996&r1=800995&r2=800996&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java (original) +++ maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleUtils.java Tue Aug 4 22:07:52 2009 @@ -41,7 +41,7 @@ } public static List selectProjectFiles( final File dir, final InputHandler inputHandler, final String finalName, - final File pom, final Log log ) + final File pom, final Log log, final boolean batchMode ) throws MojoExecutionException { File[] projectFiles = dir.listFiles( new FilenameFilter() @@ -54,12 +54,20 @@ List result = new ArrayList(); + if ( projectFiles == null ) + { + return result; + } + for ( int i = 0; i < projectFiles.length; i++ ) { if ( projectFiles[i].getName().endsWith( ".pom" ) ) { - log.info( "Detected POM file will be excluded:\n" + projectFiles[i] - + "\n\nInstead, the bundle will include the POM from:\n" + pom ); + if ( !projectFiles[i].equals( pom ) ) + { + log.info( "Detected POM file will be excluded:\n" + projectFiles[i] + + "\n\nInstead, the bundle will include the POM from:\n" + pom ); + } } else if ( projectFiles[i].getName().endsWith( "-bundle.jar" ) ) { @@ -71,6 +79,11 @@ } } + if ( result.isEmpty() ) + { + return result; + } + Collections.sort( result, new Comparator() { public int compare( Object first, Object second ) @@ -87,16 +100,21 @@ } } ); - result = reviseFileList( result, inputHandler, log ); + result = reviseFileList( result, inputHandler, log, batchMode ); return result; } - public static List reviseFileList( List input, InputHandler inputHandler, Log log ) + public static List reviseFileList( List input, InputHandler inputHandler, Log log, boolean batchMode ) throws MojoExecutionException { List result = new ArrayList( input ); + if ( batchMode ) + { + return result; + } + while( true ) { StringBuffer message = new StringBuffer(); Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java?rev=800996&r1=800995&r2=800996&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java (original) +++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundleCreateMojoTest.java Tue Aug 4 22:07:52 2009 @@ -47,6 +47,38 @@ } /** + * Test for repository plugin with project.packaging == pom + * + * @throws Exception + */ + public void testDefaults_PomPackaging() + throws Exception + { + File testPom = new File( getBasedir(), "src/test/resources/unit/pom-only/pom.xml" ); + + try + { + BundleCreateMojo mojo = (BundleCreateMojo) lookupMojo( "bundle-create", testPom ); + mojo.execute(); + } + catch ( Exception e ) + { + e.printStackTrace(); + } + + File bundleSource = + new File( getBasedir(), "target/test/unit/pom-only/target/pom-only-bundle.jar" ); + assertTrue( FileUtils.fileExists( bundleSource.getAbsolutePath() ) ); + + Set entryNames = new HashSet(); + entryNames.add( "pom.xml" ); + entryNames.add( "META-INF/MANIFEST.MF" ); + entryNames.add( "META-INF/" ); + + assertZipContents( entryNames, Collections.EMPTY_SET, bundleSource ); + } + + /** * Test for repository plugin default configuration * * @throws Exception @@ -491,40 +523,6 @@ } /** - * Test repository plugin when the packaging specified in the pom is invalid - * - * @throws Exception - */ - public void testInvalidPackaging() - throws Exception - { - - try - { - createTestJars( "invalid-packaging", false, false, getBasedir() - + "/target/test/unit/invalid-packaging/target" ); - } - catch ( IOException ie ) - { - ie.printStackTrace(); - } - - File testPom = new File( getBasedir(), "src/test/resources/unit/invalid-packaging/pom.xml" ); - - try - { - BundleCreateMojo mojo = (BundleCreateMojo) lookupMojo( "bundle-create", testPom ); - mojo.execute(); - fail( "Must throw an exception on an invalid packaging" ); - } - catch ( Exception e ) - { - assertTrue( true ); - } - - } - - /** * Test repository plugin when the scm element is null * * @throws Exception Modified: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java?rev=800996&r1=800995&r2=800996&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java (original) +++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/BundlePackMojoTest.java Tue Aug 4 22:07:52 2009 @@ -41,11 +41,32 @@ public class BundlePackMojoTest extends AbstractMojoTestCase { + public void testPack_PomPackaging() + throws Exception + { + File testPom = new File( getBasedir(), "src/test/resources/unit/bundle-pack-parent/pom.xml" ); + + BundlePackMojo mojo = (BundlePackMojo) lookupMojo( "bundle-pack", testPom ); + URL repoURL = new File( getBasedir(), "src/test/resources/repo" ).toURL(); + mojo.localRepository = + new DefaultArtifactRepository( "test", repoURL.toString(), new DefaultRepositoryLayout() ); + + File generatedFilesDir = new File( getBasedir(), "target/bundle-pack-parent-tests" ); + mojo.basedir = generatedFilesDir.getAbsolutePath(); + mojo.execute(); + + File bundleSource = new File( generatedFilesDir, "testparent-1.0-bundle.jar" ); + Set entryNames = new HashSet(); + entryNames.add( "pom.xml" ); + entryNames.add( "META-INF/MANIFEST.MF" ); + entryNames.add( "META-INF/" ); + + assertZipContents( entryNames, Collections.EMPTY_SET, bundleSource ); + } public void testPack() throws Exception { - File testPom = new File( getBasedir(), "src/test/resources/unit/bundle-pack/pom.xml" ); BundlePackMojo mojo = (BundlePackMojo) lookupMojo( "bundle-pack", testPom ); Copied: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java (from r800978, maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/InvalidPackagingMavenProjectStub.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java?p2=maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java&p1=maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/InvalidPackagingMavenProjectStub.java&r1=800978&r2=800996&rev=800996&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/InvalidPackagingMavenProjectStub.java (original) +++ maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java Tue Aug 4 22:07:52 2009 @@ -25,7 +25,7 @@ /** * @author Maria Odea Ching */ -public class InvalidPackagingMavenProjectStub +public class PomOnlyMavenProjectStub extends MavenProjectStub { @@ -33,23 +33,23 @@ private Build build; - public InvalidPackagingMavenProjectStub() + public PomOnlyMavenProjectStub() { - setGroupId( "invalid.packaging" ); - setArtifactId( "invalid-packaging" ); + setGroupId( "def.configuration" ); + setArtifactId( "pom-only" ); setVersion( "1.0-SNAPSHOT" ); - setName( "Invalid Packaging Maven Project" ); + setName( "POM Project" ); setUrl( "http://maven.apache.org" ); setPackaging( "pom" ); - setDescription( "Sample Maven Project that has invalid packaging." ); + setDescription( "Sample Maven Project that has default repository plugin configuration." ); Scm scm = new Scm(); scm.setConnection( "scm:svn:http://svn.apache.org/maven/sample/trunk" ); setScm( scm ); Build build = new Build(); - build.setFinalName( "invalid-packaging" ); - build.setDirectory( getBasedir() + "/target/test/unit/invalid-packaging/target" ); + build.setFinalName( "pom-only" ); + build.setDirectory( getBasedir() + "/target/test/unit/pom-only/target" ); setBuild( build ); } @@ -73,4 +73,5 @@ { this.build = build; } + } Propchange: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/stubs/PomOnlyMavenProjectStub.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testparent/1.0/testparent-1.0.pom URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testparent/1.0/testparent-1.0.pom?rev=800996&view=auto ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testparent/1.0/testparent-1.0.pom (added) +++ maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testparent/1.0/testparent-1.0.pom Tue Aug 4 22:07:52 2009 @@ -0,0 +1,18 @@ + + + 4.0.0 + testgroup + testparent + 1.0 + pom + Test Artifact + http://dummy/project + just a dummy project for tests + + + dummy license name + dummy license url + + + Propchange: maven/plugins/trunk/maven-repository-plugin/src/test/resources/repo/testgroup/testparent/1.0/testparent-1.0.pom ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack-parent/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack-parent/pom.xml?rev=800996&view=auto ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack-parent/pom.xml (added) +++ maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack-parent/pom.xml Tue Aug 4 22:07:52 2009 @@ -0,0 +1,21 @@ + + + 4.0.0 + def.configuration + default-configuration + 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-repository-plugin + + testgroup + testparent + 1.0 + + + + + Propchange: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/bundle-pack-parent/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Copied: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/LICENSE.txt (from r800978, maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/LICENSE.txt) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/LICENSE.txt?p2=maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/LICENSE.txt&p1=maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/LICENSE.txt&r1=800978&r2=800996&rev=800996&view=diff ============================================================================== (empty) Propchange: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Copied: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/configuration/App.java (from r800978, maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/invalid/packaging/App.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/configuration/App.java?p2=maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/configuration/App.java&p1=maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/invalid/packaging/App.java&r1=800978&r2=800996&rev=800996&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/invalid/packaging/App.java (original) +++ maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/configuration/App.java Tue Aug 4 22:07:52 2009 @@ -1,4 +1,4 @@ -package invalid.packaging; +package def.configuration; public class App { Propchange: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/configuration/App.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/def/configuration/App.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Copied: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml (from r800978, maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/pom.xml) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml?p2=maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml&p1=maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/pom.xml&r1=800978&r2=800996&rev=800996&view=diff ============================================================================== --- maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/invalid-packaging/pom.xml (original) +++ maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml Tue Aug 4 22:07:52 2009 @@ -1,7 +1,7 @@ 4.0.0 - invalid.packaging - invalid-packaging + def.configuration + pom-only 1.0-SNAPSHOT @@ -9,8 +9,8 @@ org.apache.maven.plugins maven-repository-plugin - - ${basedir}/src/test/resources/unit/invalid-packaging + + ${basedir}/src/test/resources/unit/pom-only Propchange: maven/plugins/trunk/maven-repository-plugin/src/test/resources/unit/pom-only/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native