svn commit: r220250 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: brett Date: Thu Jul 21 23:32:06 2005 New Revision: 220250 URL: http://svn.apache.org/viewcvs?rev=220250&view=rev Log: PR: MNG-461 warn, but don't fail, when a POM is not in the repository Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=220250&r1=220249&r2=220250&view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Jul 21 23:32:06 2005 @@ -255,17 +255,26 @@ try { artifactResolver.resolve( artifact, remoteArtifactRepositories, localRepository ); + +File file = artifact.getFile(); +model = readModel( file ); } catch ( ArtifactResolutionException e ) { // TODO: a not found would be better vs other errors -throw new ProjectBuildingException( "Unable to find the POM in the repository", e ); -} +// only not found should have the below behaviour +//throw new ProjectBuildingException( "Unable to find the POM in the repository", e ); -//String path = localRepository.pathOfMetadata( new ProjectArtifactMetadata( artifact, null ) ); -//File file = new File( localRepository.getBasedir(), path ); -File file = artifact.getFile(); -model = readModel( file ); +getLogger().warn( "\n * Using defaults for missing POM " + artifact.getId() + " *\n" ); + +model = new Model(); +model.setModelVersion( "4.0.0" ); +model.setArtifactId( artifact.getArtifactId() ); +model.setGroupId( artifact.getGroupId() ); +model.setVersion( artifact.getVersion() ); +// TOOD: not correct in some instances +model.setPackaging( artifact.getType() ); +} } // TODO: this is gross. Would like to give it the whole model, but maven-artifact shouldn't depend on that - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MNG-461) warn, but don't fail, on a missing POM in the repository
[ http://jira.codehaus.org/browse/MNG-461?page=all ] Brett Porter closed MNG-461: Assign To: Brett Porter (was: John Casey) Resolution: Fixed done with a warning. confidence levels will be implemented separately > warn, but don't fail, on a missing POM in the repository > > > Key: MNG-461 > URL: http://jira.codehaus.org/browse/MNG-461 > Project: Maven 2 > Type: Improvement > Components: maven-artifact > Reporter: Brett Porter > Assignee: Brett Porter > Priority: Blocker > Fix For: 2.0-beta-1 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - SUCCESS - update] Fri Jul 22 06:15:02 GMT 2005
Distribution: http://maven.zones.apache.org/~maven/builds/m2-20050722.061502.tar.gz Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050722.061502.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Maven Cobertura Plug-in 1.1 released
The maven-plugins team is pleased to announce the Maven Cobertura Plug-in 1.1 release! http://maven-plugins.sourceforge.net/maven-cobertura-plugin Cobertura is a free Java tool that calculates the percentage of code accessed by tests. It can be used to identify which parts of your Java program are lacking test coverage. It is based on jcoverage. Changes in this version include: New Features: o Added cobertura check reports with classes that don't meet test coverage requirements. o Added cobertura:check goal. To automatically install the plugin, type the following on a single line: maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-cobertura-plugin -Dversion=1.1 For a manual installation, you can download the plugin here: http://maven-plugins.sourceforge.net/repository/maven-plugins/plugins/maven-cobertura-plugin-1.1.jar Have fun! -The maven-plugins team - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220249 - /maven/components/trunk/maven-artifact-ant/sample.build.xml
Author: brett Date: Thu Jul 21 23:28:20 2005 New Revision: 220249 URL: http://svn.apache.org/viewcvs?rev=220249&view=rev Log: test dud dep Modified: maven/components/trunk/maven-artifact-ant/sample.build.xml Modified: maven/components/trunk/maven-artifact-ant/sample.build.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/sample.build.xml?rev=220249&r1=220248&r2=220249&view=diff == --- maven/components/trunk/maven-artifact-ant/sample.build.xml (original) +++ maven/components/trunk/maven-artifact-ant/sample.build.xml Thu Jul 21 23:28:20 2005 @@ -28,6 +28,12 @@ + + + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220244 - in /maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact: manager/DefaultWagonManager.java manager/WagonManager.java resolver/DefaultArtifactResolver.java
Author: brett Date: Thu Jul 21 22:58:50 2005 New Revision: 220244 URL: http://svn.apache.org/viewcvs?rev=220244&view=rev Log: various straightening up Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=220244&r1=220243&r2=220244&view=diff == --- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original) +++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Thu Jul 21 22:58:50 2005 @@ -26,7 +26,6 @@ import org.apache.maven.wagon.TransferFailedException; import org.apache.maven.wagon.UnsupportedProtocolException; import org.apache.maven.wagon.Wagon; -import org.apache.maven.wagon.WagonException; import org.apache.maven.wagon.authentication.AuthenticationException; import org.apache.maven.wagon.authentication.AuthenticationInfo; import org.apache.maven.wagon.authorization.AuthorizationException; @@ -100,10 +99,10 @@ } public void putRepositoryMetadata( File source, RepositoryMetadata metadata, ArtifactRepository repository ) -throws TransferFailedException +throws TransferFailedException { getLogger().info( "Uploading " + metadata ); - + putRemoteFile( repository, source, repository.formatAsFile( metadata.getRepositoryPath() ), null ); } @@ -113,7 +112,7 @@ { String protocol = repository.getProtocol(); -Wagon wagon = null; +Wagon wagon; try { wagon = getWagon( protocol ); @@ -251,13 +250,14 @@ getRemoteFile( remoteRepository, destination, remotePath, null ); } -public void getRepositoryMetadata( RepositoryMetadata metadata, ArtifactRepository remoteRepository, File destination ) -throws TransferFailedException, ResourceDoesNotExistException +public void getRepositoryMetadata( RepositoryMetadata metadata, ArtifactRepository remoteRepository, + File destination ) +throws TransferFailedException, ResourceDoesNotExistException { String remotePath = remoteRepository.formatAsFile( metadata.getRepositoryPath() ); - + getLogger().info( "Retrieving " + metadata ); - + getRemoteFile( remoteRepository, destination, remotePath, null ); } @@ -315,7 +315,7 @@ getAuthenticationInfo( repository.getId() ), getProxy( protocol ) ); boolean firstRun = true; -boolean retry = false; +boolean retry = true; // this will run at most twice. The first time, the firstRun flag is turned off, and if the retry flag // is set on the first run, it will be turned off and not re-set on the second try. This is because the @@ -339,70 +339,60 @@ { verifyChecksum( sha1ChecksumObserver, temp, remotePath, ".sha1", wagon ); } -catch ( WagonException sha1TryException ) +catch ( ChecksumFailedException e ) { // if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the checksum // doesn't match. This could be a problem with the server (ibiblio HTTP-200 error page), so we'll // try this up to two times. On the second try, we'll handle it as a bona-fide error, based on the // repository's checksum checking policy. -if ( sha1TryException instanceof ChecksumFailedException ) +if ( firstRun ) { -// if this is the second try, handle the problem...otherwise, let it try again. -if ( firstRun ) -{ -retry = true; -} -else -{ -handleChecksumFailure( repository, sha1TryException.getMessage(), - sha1TryException.getCause() ); -} +retry = true; +} +else +{ +
[jira] Closed: (MNG-479) unable to override the default central repository
[ http://jira.codehaus.org/browse/MNG-479?page=all ] Brett Porter closed MNG-479: Assign To: Brett Porter (was: John Casey) Resolution: Fixed applied, thanks! > unable to override the default central repository > - > > Key: MNG-479 > URL: http://jira.codehaus.org/browse/MNG-479 > Project: Maven 2 > Type: Bug > Components: maven-core > Versions: 2.0-alpha-2 > Environment: WinXP > Reporter: Edwin Punzalan > Assignee: Brett Porter > Priority: Blocker > Fix For: 2.0-beta-1 > Attachments: DefaultModelInheritanceAssembler-with-updated-JUnitTest.diff, > DefaultModelInheritanceAssembler.diff > > > Adding to my pom.xml: > > > > central > custom repository > http://maven.company.com/maven2 > > > > did not override the central repository but instead uses the above configured > repository as backup/mirror. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220240 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Author: brett Date: Thu Jul 21 22:24:19 2005 New Revision: 220240 URL: http://svn.apache.org/viewcvs?rev=220240&view=rev Log: PR: MNG-479 Submitted by: Rahul Thakur Reviewed by: Brett Porter if you define a repository it should override anything in the parent with the same ID Also, cleaned up logic in assembler based on intentions Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=220240&r1=220239&r2=220240&view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Thu Jul 21 22:24:19 2005 @@ -66,7 +66,6 @@ } // version -// TODO: I think according to the latest design docs, we don't want to inherit version at all if ( child.getVersion() == null ) { // The parent version may have resolved to something different, so we take what we asked for... @@ -183,10 +182,13 @@ { Repository repository = (Repository) iterator.next(); -if ( !childRepositories.contains( repository ) ) +// parent will always override child repositories +// if there are duplicates +if ( childRepositories.contains( repository ) ) { -child.addRepository( repository ); +childRepositories.remove( repository ); } +child.addRepository( repository ); } // Mojo Repositories :: aggregate @@ -395,12 +397,6 @@ private void assembleBuildInheritance( Model child, Build parentBuild ) { -// cannot inherit from null parent... -if ( parentBuild == null ) -{ -return; -} - Build childBuild = child.getBuild(); if ( parentBuild != null ) @@ -451,49 +447,45 @@ private void assembleBuildBaseInheritance( BuildBase childBuild, BuildBase parentBuild ) { // if the parent build is null, obviously we cannot inherit from it... -if ( parentBuild == null ) -{ -return; -} - -if ( childBuild.getDefaultGoal() == null ) +if ( parentBuild != null ) { -childBuild.setDefaultGoal( parentBuild.getDefaultGoal() ); -} +if ( childBuild.getDefaultGoal() == null ) +{ +childBuild.setDefaultGoal( parentBuild.getDefaultGoal() ); +} -if ( childBuild.getFinalName() == null ) -{ -childBuild.setFinalName( parentBuild.getFinalName() ); -} +if ( childBuild.getFinalName() == null ) +{ +childBuild.setFinalName( parentBuild.getFinalName() ); +} -List resources = childBuild.getResources(); -if ( resources == null || resources.isEmpty() ) -{ -childBuild.setResources( parentBuild.getResources() ); -} +List resources = childBuild.getResources(); +if ( resources == null || resources.isEmpty() ) +{ +childBuild.setResources( parentBuild.getResources() ); +} -resources = childBuild.getTestResources(); -if ( resources == null || resources.isEmpty() ) -{ -childBuild.setTestResources( parentBuild.getTestResources() ); -} +resources = childBuild.getTestResources(); +if ( resources == null || resources.isEmpty() ) +{ +childBuild.setTestResources( parentBuild.getTestResources() ); +} -// Plugins are aggregated if Plugin.inherit != false -ModelUtils.mergePluginLists( childBuild, parentBuild, true ); +// Plugins are aggregated if Plugin.inherit != false +ModelUtils.mergePluginLists( childBuild, parentBuild, true ); -// Plugin management :: aggregate -if ( childBuild != null && parentBuild != null ) -{ +// Plugin management :: aggregate PluginManagement childPM = childBuild.getPluginManagement(); PluginManagement parentPM = parentBuild.getPluginManagement(); - -if( childPM == null && parentPM !=null ) + +if
[maven2 build - SUCCESS - update] Fri Jul 22 05:15:00 GMT 2005
Distribution: http://maven.zones.apache.org/~maven/builds/m2-20050722.051500.tar.gz Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050722.051500.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Releasing test and jxr plugins
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Carlos Sanchez wrote: >Hi, > >I'd like to release the test plugin 1.7 and jxr plugin 1.4.3. > >Changes are here: >http://maven.apache.org/reference/plugins/test/changes-report.html +0. I would like to see MPTEST-30 implemented (if it can be done in a way that it remains backwards compat with 1.0.2). There are 30 or so issues in there too, it may be worth reviewing to see if there are any bugs that can be fixed first. A lot seem like features that can be postponed until it is based on surefire. >http://maven.apache.org/reference/plugins/jxr/changes-report.html +1, though MPJXR-20 would be worth looking at first. - - Brett -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (Cygwin) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFC4ICCOb5RoQhMkRMRAlLSAJ9q/tjkZ+oSCKXCyCkS88pn6wIs2QCgjy8G 1lKf9vdqYyc37E+AjMpd+bQ= =5AZu -END PGP SIGNATURE- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MPTEST-52) Timeout for Maven Tests
[ http://jira.codehaus.org/browse/MPTEST-52?page=all ] Brett Porter closed MPTEST-52: -- Resolution: Duplicate > Timeout for Maven Tests > --- > > Key: MPTEST-52 > URL: http://jira.codehaus.org/browse/MPTEST-52 > Project: maven-test-plugin > Type: Improvement > Reporter: Rudert > > > We need a way to somehow set a timeout for junit tests within the > maven-test-plugin. Something like "maven.junit.timout" would be very nice. It > doesn't yet exist. Is there another way to tell him how long he should wait > for test to complete? I know that in the junit.properties-file you can set > "junit.timout", but the file automatically created in this case, i think... > ttyl + thank you very much > Jan Rudert -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220239 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/main/java/org/apache/maven/plugin/version...
Author: brett Date: Thu Jul 21 22:07:47 2005 New Revision: 220239 URL: http://svn.apache.org/viewcvs?rev=220239&view=rev Log: PR: MNG-625 allow a plugin to specify the minimum Maven version (will apply for both building and its execution - this should be separated later). If you are running an older version then it will not prompt to update when found, and will fail if it is encountered with a hardcoded version. Added: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java (with props) maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/RuntimeInformation.java (with props) Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=220239&r1=220238&r2=220239&view=diff == --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Thu Jul 21 22:07:47 2005 @@ -19,11 +19,11 @@ import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolutionException; -import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; import org.apache.maven.execution.MavenSession; +import org.apache.maven.execution.RuntimeInformation; import org.apache.maven.lifecycle.LifecycleExecutionException; import org.apache.maven.lifecycle.LifecycleExecutor; import org.apache.maven.model.Profile; @@ -53,19 +53,16 @@ import org.codehaus.plexus.context.ContextException; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.dag.CycleDetectedException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; /** * @author mailto:[EMAIL PROTECTED]">Jason van Zyl @@ -90,7 +87,13 @@ protected MavenProfilesBuilder profilesBuilder; -private ArtifactVersion mavenVersion; +protected RuntimeInformation runtimeInformation; + +private static final long MB = 1024 * 1024; + +private static final int MS_PER_SEC = 1000; + +private static final int SEC_PER_MIN = 60; // -- // Project execution @@ -99,15 +102,6 @@ public MavenExecutionResponse execute( MavenExecutionRequest request ) throws ReactorException { -try -{ -mavenVersion = getMavenVersion(); -} -catch ( IOException e ) -{ -throw new ReactorException( "Unable to determine the executing version of Maven", e ); -} - if ( request.getSettings().isOffline() ) { getLogger().info( "Maven is running in offline mode." ); @@ -222,25 +216,6 @@ } } -private DefaultArtifactVersion getMavenVersion() -throws IOException -{ -InputStream resourceAsStream = null; -try -{ -Properties properties = new Properties(); -resourceAsStream = getClass().getClassLoader().getResourceAsStream( -"META-INF/maven/org.apache.maven/maven-core/pom.properties" ); -properties.load( resourceAsStream ); - -return new DefaultArtifactVersion( properties.getProperty( "version" ) ); -} -finally -{ -IOUtil.close( resourceAsStream ); -} -} - private List collectProjects( List files, ArtifactRepository localRepository, boolean recursive, Settings settings )
[jira] Closed: (MNG-625) plugin runtime maven version requirement
[ http://jira.codehaus.org/browse/MNG-625?page=all ] Brett Porter closed MNG-625: Resolution: Fixed > plugin runtime maven version requirement > > > Key: MNG-625 > URL: http://jira.codehaus.org/browse/MNG-625 > Project: Maven 2 > Type: Improvement > Reporter: Brett Porter > Assignee: Brett Porter > Priority: Critical > Fix For: 2.0-beta-1 > > > projects are able to declare the required Maven version to build, but it > would also be handy for plugins to declare a minimum requirement so that when > Maven attempts to upgrade them, if its minimum requirement is higher it can > stick to the previous versino rather than prompting for an update. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Releasing test and jxr plugins
Hi, I'd like to release the test plugin 1.7 and jxr plugin 1.4.3. Changes are here: http://maven.apache.org/reference/plugins/test/changes-report.html http://maven.apache.org/reference/plugins/jxr/changes-report.html Regards Carlos Sanchez - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220229 - /maven/components/trunk/maven-core-it/it0035/
Author: brett Date: Thu Jul 21 19:47:51 2005 New Revision: 220229 URL: http://svn.apache.org/viewcvs?rev=220229&view=rev Log: ignore Modified: maven/components/trunk/maven-core-it/it0035/ (props changed) Propchange: maven/components/trunk/maven-core-it/it0035/ -- --- svn:ignore (added) +++ svn:ignore Thu Jul 21 19:47:51 2005 @@ -0,0 +1,2 @@ +log.txt +target - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-186) sort out fat http vs lightweight http
[ http://jira.codehaus.org/browse/MNG-186?page=all ] Brett Porter updated MNG-186: - Description: some tasks, like the use of an NTLM proxy, will require the use of the fat HTTP wag instead of the lightweight one - however, because of an identical hint it will need to be loaded by an alternative means. was: some tasks, like the use of an NTLM proxy, will require the use of the fat HTTP wag instead of the lightweight one - however, because of an identical hint it will need to be loaded by an alternative means. Fix Version: (was: 2.0-beta-1) 2.0-beta-2 Environment: perhaps the lightweight weagon could delegate to the heavy one? > sort out fat http vs lightweight http > - > > Key: MNG-186 > URL: http://jira.codehaus.org/browse/MNG-186 > Project: Maven 2 > Type: Bug > Components: maven-artifact > Reporter: Brett Porter > Priority: Blocker > Fix For: 2.0-beta-2 > > > some tasks, like the use of an NTLM proxy, will require the use of the fat > HTTP wag instead of the lightweight one - however, because of an identical > hint it will need to be loaded by an alternative means. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-186) sort out fat http vs lightweight http
[ http://jira.codehaus.org/browse/MNG-186?page=all ] Brett Porter updated MNG-186: - Priority: Minor (was: Blocker) > sort out fat http vs lightweight http > - > > Key: MNG-186 > URL: http://jira.codehaus.org/browse/MNG-186 > Project: Maven 2 > Type: Bug > Components: maven-artifact > Reporter: Brett Porter > Priority: Minor > Fix For: 2.0-beta-2 > > > some tasks, like the use of an NTLM proxy, will require the use of the fat > HTTP wag instead of the lightweight one - however, because of an identical > hint it will need to be loaded by an alternative means. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - SUCCESS - update] Fri Jul 22 01:15:00 GMT 2005
Distribution: http://maven.zones.apache.org/~maven/builds/m2-20050722.011500.tar.gz Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050722.011500.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220225 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: brett Date: Thu Jul 21 18:02:15 2005 New Revision: 220225 URL: http://svn.apache.org/viewcvs?rev=220225&view=rev Log: add a little more space Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=220225&r1=220224&r2=220225&view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Thu Jul 21 18:02:15 2005 @@ -105,14 +105,14 @@ } String message = "\n This artifact has been relocated to " + artifact.getGroupId() + ":" + -artifact.getArtifactId() + ":" + artifact.getVersion() + ".\n\n"; +artifact.getArtifactId() + ":" + artifact.getVersion() + ".\n"; if ( relocation.getMessage() != null ) { -message += relocation.getMessage(); +message += " " + relocation.getMessage() + "\n"; } -getLogger().warn( message ); +getLogger().warn( message + "\n" ); } else { - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220224 - /maven/components/trunk/maven-artifact-ant/sample.build.xml
Author: brett Date: Thu Jul 21 17:59:52 2005 New Revision: 220224 URL: http://svn.apache.org/viewcvs?rev=220224&view=rev Log: show relocation in ant, update for beta-1 Modified: maven/components/trunk/maven-artifact-ant/sample.build.xml Modified: maven/components/trunk/maven-artifact-ant/sample.build.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/sample.build.xml?rev=220224&r1=220223&r2=220224&view=diff == --- maven/components/trunk/maven-artifact-ant/sample.build.xml (original) +++ maven/components/trunk/maven-artifact-ant/sample.build.xml Thu Jul 21 17:59:52 2005 @@ -1,5 +1,5 @@ - - + @@ -48,6 +48,7 @@ + @@ -63,16 +64,18 @@ - + + + - + - + @@ -128,7 +131,8 @@ - + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220223 - /maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Author: brett Date: Thu Jul 21 17:46:42 2005 New Revision: 220223 URL: http://svn.apache.org/viewcvs?rev=220223&view=rev Log: update component descriptors inline with core changes Modified: maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml Modified: maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml?rev=220223&r1=220222&r2=220223&view=diff == --- maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml Thu Jul 21 17:46:42 2005 @@ -185,6 +185,19 @@ + org.apache.maven.artifact.metadata.ArtifactMetadataSource + org.apache.maven.project.artifact.MavenMetadataSource + + + org.apache.maven.project.MavenProjectBuilder + + + org.apache.maven.artifact.factory.ArtifactFactory + + + + + org.apache.maven.artifact.resolver.ArtifactCollector org.apache.maven.artifact.resolver.DefaultArtifactCollector - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220222 - /maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
Author: brett Date: Thu Jul 21 17:46:15 2005 New Revision: 220222 URL: http://svn.apache.org/viewcvs?rev=220222&view=rev Log: package before assembly Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=220222&r1=220221&r2=220222&view=diff == --- maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java Thu Jul 21 17:46:15 2005 @@ -34,8 +34,8 @@ import org.codehaus.plexus.archiver.jar.JarArchiver; import org.codehaus.plexus.archiver.tar.TarArchiver; import org.codehaus.plexus.archiver.zip.ZipArchiver; -import org.codehaus.plexus.util.introspection.ReflectionValueExtractor; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.introspection.ReflectionValueExtractor; import java.io.File; import java.io.FileOutputStream; @@ -55,11 +55,13 @@ import java.util.regex.Pattern; /** + * Assemble an application bundle or distribution. + * * @author mailto:[EMAIL PROTECTED]">Brett Porter * @version $Id$ * @goal assembly * @requiresDependencyResolution test - * @description assemble an application bundle or distribution + * @execute phase="package" */ public class AssemblyMojo extends AbstractMojo @@ -67,10 +69,10 @@ private static final String[] EMPTY_STRING_ARRAY = {}; /** -* @parameter expression="${basedir}" -* @required -* @readonly -*/ + * @parameter expression="${basedir}" + * @required + * @readonly + */ private String basedir; /** @@ -101,9 +103,9 @@ */ private Set dependencies; -/** +/** * Directory to unpack JARs into if needed - * + * * @parameter expression="${project.build.directory}/assembly/work" * @required */ @@ -116,7 +118,7 @@ * @required */ private ArtifactHandlerManager artifactHandlerManager; - + public void execute() throws MojoExecutionException { @@ -242,44 +244,45 @@ } else { -archiver.addFile( artifact.getFile(), output + evaluateFileNameMapping( dependencySet.getOutputFileNameMapping(), artifact )); -} +archiver.addFile( artifact.getFile(), output + +evaluateFileNameMapping( dependencySet.getOutputFileNameMapping(), artifact ) ); +} } } } } -private String evaluateFileNameMapping( String expression, Artifact artifact ) +private String evaluateFileNameMapping( String expression, Artifact artifact ) throws Exception { // this matches the last ${...} string Pattern pat = Pattern.compile( "^(.*)\\$\\{([^\\}]+)\\}(.*)$" ); -Matcher mat = pat.matcher(expression); +Matcher mat = pat.matcher( expression ); String left,right; Object middle; -if ( mat.matches() ) +if ( mat.matches() ) { -left = evaluateFileNameMapping( mat.group(1), artifact ); -middle = ReflectionValueExtractor.evaluate( "dep." + mat.group(2), artifact ); -right = mat.group(3); +left = evaluateFileNameMapping( mat.group( 1 ), artifact ); +middle = ReflectionValueExtractor.evaluate( "dep." + mat.group( 2 ), artifact ); +right = mat.group( 3 ); if ( middle == null ) { // TODO: There should be a more generic way dealing with that. Having magic words is not good at all. // probe for magic word -if ( mat.group(2).trim().equals( "extension" )) +if ( mat.group( 2 ).trim().equals( "extension" ) ) { -ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler( artifact.getType() ); +ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler( artifact.getType() ); middle = artifactHandler.getExtension(); } else { -middle = "${" + mat.group(2) + "}"; +middle = "${" + mat.group( 2 ) + "}"; } } - + return left + middle + r
svn commit: r220221 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: brett Date: Thu Jul 21 17:37:22 2005 New Revision: 220221 URL: http://svn.apache.org/viewcvs?rev=220221&view=rev Log: actually output the warning message Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=220221&r1=220220&r2=220221&view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Thu Jul 21 17:37:22 2005 @@ -104,14 +104,15 @@ artifact.setVersion( relocation.getVersion() ); } -String message = pomArtifact + " has been relocated to " + artifact + ".\n"; +String message = "\n This artifact has been relocated to " + artifact.getGroupId() + ":" + +artifact.getArtifactId() + ":" + artifact.getVersion() + ".\n\n"; if ( relocation.getMessage() != null ) { message += relocation.getMessage(); } -//getLogger().warn( message ); +getLogger().warn( message ); } else { - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - SUCCESS - checkout] Fri Jul 22 00:15:01 GMT 2005
Distribution: http://maven.zones.apache.org/~maven/builds/m2-20050722.001501.tar.gz Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050722.001501.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220220 - in /maven/components/trunk: maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/ maven-artifact/src/main/java/org/apache/maven/artifact/ maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ maven-core-it-sup...
Author: brett Date: Thu Jul 21 17:31:44 2005 New Revision: 220220 URL: http://svn.apache.org/viewcvs?rev=220220&view=rev Log: PR: MNG-507 implement repository relocation of an artifact Added: maven/components/trunk/maven-core-it/it0035/ maven/components/trunk/maven-core-it/it0035/expected-results.txt (with props) maven/components/trunk/maven-core-it/it0035/goals.txt (with props) maven/components/trunk/maven-core-it/it0035/pom.xml (with props) maven/components/trunk/maven-core-it/it0035/prebuild-hook.txt (with props) Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java maven/components/trunk/maven-core-it-support/1.1/ (props changed) maven/components/trunk/maven-core-it-support/1.1-old-location/ (props changed) maven/components/trunk/maven-core-it/README.txt maven/components/trunk/maven-core-it/integration-tests.txt maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml maven/components/trunk/maven-model/maven.mdo maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=220220&r1=220219&r2=220220&view=diff == --- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original) +++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Thu Jul 21 17:31:44 2005 @@ -17,6 +17,7 @@ */ import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -68,7 +69,7 @@ ArtifactResolver resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE ); MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ); ArtifactFactory artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE ); -MavenMetadataSource metadataSource = new MavenMetadataSource( projectBuilder, artifactFactory ); +MavenMetadataSource metadataSource = (MavenMetadataSource) lookup( ArtifactMetadataSource.ROLE ); List dependencies = this.dependencies; Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java?rev=220220&r1=220219&r2=220220&view=diff == --- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java (original) +++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java Thu Jul 21 17:31:44 2005 @@ -114,4 +114,8 @@ void setVersionRange( VersionRange newRange ); void selectVersion( String version ); + +void setGroupId( String groupId ); + +void setArtifactId( String artifactId ); } Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=220220&r1=220219&r2=220220&view=diff == --- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original) +++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Def
[jira] Updated: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=all ] Nick Faiz updated MAVENUPLOAD-431: -- Attachment: nlog4j-wrapper-1.2.14.jar > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > nlog4j-wrapper-1.2.14.jar, slf4j-wrapper-jdk14-1.0-beta4.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-nop-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=comments#action_43225 ] Nick Faiz commented on MAVENUPLOAD-431: --- Hi Carlos, Ceki has told me where to find jmxtools.jar and jmxri.jar. Neither jar specifies a version. The MANIFEST.MF in each of them nominates version 1.2_8, although I think this version refers to the version of JMX they have been bundled in (see the source download of the Reference Implementation for JMX 1.2 - http://java.sun.com/products/JavaManagement/download.html ). Anyway, the dependencies now look this: javax.management jmxri com.sun jmxtools I'm uploading this jar now. Let me know if you want it altered. Cheers, Nick > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > nlog4j-wrapper-1.2.14.jar, slf4j-wrapper-jdk14-1.0-beta4.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-nop-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MNG-507) Implement POM repository relocation
[ http://jira.codehaus.org/browse/MNG-507?page=all ] Brett Porter closed MNG-507: Resolution: Fixed now, to start moving things in the repository :) this will have to wait until the beta-2 release, then we can remove the jars from jdbc:jdbc, for example. > Implement POM repository relocation > --- > > Key: MNG-507 > URL: http://jira.codehaus.org/browse/MNG-507 > Project: Maven 2 > Type: New Feature > Components: maven-model > Reporter: Carlos Sanchez > Assignee: Brett Porter > Priority: Blocker > Fix For: 2.0-beta-1 > > > Add deprecation information to POM. Probably just a String explaining why the > artifact was deprecated. > If we'd like to suggest the use of a different artifact we can add a > dependency to it and it'll get added through transitive resolution. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220219 - in /maven/components/trunk/maven-core-it/it0034: expected-results.txt pom.xml prebuild-hook.txt src/
Author: brett Date: Thu Jul 21 17:21:57 2005 New Revision: 220219 URL: http://svn.apache.org/viewcvs?rev=220219&view=rev Log: use a more normal IT test style for artifact resolution Added: maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt (with props) Removed: maven/components/trunk/maven-core-it/it0034/src/ Modified: maven/components/trunk/maven-core-it/it0034/expected-results.txt maven/components/trunk/maven-core-it/it0034/pom.xml Modified: maven/components/trunk/maven-core-it/it0034/expected-results.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0034/expected-results.txt?rev=220219&r1=220218&r2=220219&view=diff == --- maven/components/trunk/maven-core-it/it0034/expected-results.txt (original) +++ maven/components/trunk/maven-core-it/it0034/expected-results.txt Thu Jul 21 17:21:57 2005 @@ -1 +1 @@ -target/maven-core-it0034-1.0-SNAPSHOT/WEB-INF/lib/junit-3.8.1.jar +${artifact:org.apache.maven:maven-core-it-support:1.1:jar} Modified: maven/components/trunk/maven-core-it/it0034/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0034/pom.xml?rev=220219&r1=220218&r2=220219&view=diff == --- maven/components/trunk/maven-core-it/it0034/pom.xml (original) +++ maven/components/trunk/maven-core-it/it0034/pom.xml Thu Jul 21 17:21:57 2005 @@ -1,16 +1,20 @@ - + 4.0.0 org.apache.maven maven-core-it0034 - war - 1.0-SNAPSHOT - Maven Quick Start Archetype - http://maven.apache.org + 1.0 junit junit - [3.7,) + 3.8.1 + jar + test + + + org.apache.maven + maven-core-it-support + [1.0,) - + Added: maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt?rev=220219&view=auto == --- maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt (added) +++ maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt Thu Jul 21 17:21:57 2005 @@ -0,0 +1 @@ +rm ${artifact:org.apache.maven:maven-core-it-support:1.1:jar} Propchange: maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt -- svn:eol-style = native Propchange: maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt -- svn:keywords = "Author Date Id Revision" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220218 - /maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
Author: brett Date: Thu Jul 21 17:08:46 2005 New Revision: 220218 URL: http://svn.apache.org/viewcvs?rev=220218&view=rev Log: this is supposed to be preloaded to the remote repository for integration testing purposes Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=220218&r1=220217&r2=220218&view=diff == --- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original) +++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Thu Jul 21 17:08:46 2005 @@ -300,9 +300,6 @@ // Install maven-reporting parent POM installPomFile( localRepository, new File( basedir, "maven-reporting/pom.xml" ) ); -// Install it-support POM -installPomFile( localRepository, new File( basedir, "maven-core-it-support/pom.xml" ) ); - ModelReader reader = new ModelReader( downloader, true ); reader.parse( new File( basedir, "maven-mboot2/pom.xml" ) ); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220211 - in /maven/components/trunk/maven-core-it-support: 1.0/pom.xml 1.1-old-location/ 1.1-old-location/pom.xml 1.1-old-location/src/ 1.1/pom.xml
Author: brett Date: Thu Jul 21 16:39:54 2005 New Revision: 220211 URL: http://svn.apache.org/viewcvs?rev=220211&view=rev Log: test for it0035 Added: maven/components/trunk/maven-core-it-support/1.1-old-location/ - copied from r220207, maven/components/trunk/maven-core-it-support/1.1/ Removed: maven/components/trunk/maven-core-it-support/1.1-old-location/src/ Modified: maven/components/trunk/maven-core-it-support/1.0/pom.xml maven/components/trunk/maven-core-it-support/1.1-old-location/pom.xml maven/components/trunk/maven-core-it-support/1.1/pom.xml Modified: maven/components/trunk/maven-core-it-support/1.0/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-support/1.0/pom.xml?rev=220211&r1=220210&r2=220211&view=diff == --- maven/components/trunk/maven-core-it-support/1.0/pom.xml (original) +++ maven/components/trunk/maven-core-it-support/1.0/pom.xml Thu Jul 21 16:39:54 2005 @@ -9,7 +9,7 @@ repo1 Maven Central Repository - scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2 + scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 Modified: maven/components/trunk/maven-core-it-support/1.1-old-location/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-support/1.1-old-location/pom.xml?rev=220211&r1=220207&r2=220211&view=diff == --- maven/components/trunk/maven-core-it-support/1.1-old-location/pom.xml (original) +++ maven/components/trunk/maven-core-it-support/1.1-old-location/pom.xml Thu Jul 21 16:39:54 2005 @@ -2,14 +2,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.maven - maven-core-it-support + maven-core-it-support-old-location jar 1.1 repo1 Maven Central Repository - scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2 + scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 + + maven-core-it-support + Testing + Modified: maven/components/trunk/maven-core-it-support/1.1/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-support/1.1/pom.xml?rev=220211&r1=220210&r2=220211&view=diff == --- maven/components/trunk/maven-core-it-support/1.1/pom.xml (original) +++ maven/components/trunk/maven-core-it-support/1.1/pom.xml Thu Jul 21 16:39:54 2005 @@ -9,7 +9,7 @@ repo1 Maven Central Repository - scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2 + scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220207 - in /maven/components/trunk/maven-core-it-support/1.1: ./ pom.xml
Author: brett Date: Thu Jul 21 16:35:46 2005 New Revision: 220207 URL: http://svn.apache.org/viewcvs?rev=220207&view=rev Log: add 1.1 test artifact Added: maven/components/trunk/maven-core-it-support/1.1/ - copied from r220206, maven/components/trunk/maven-core-it-support/1.0/ Modified: maven/components/trunk/maven-core-it-support/1.1/pom.xml Modified: maven/components/trunk/maven-core-it-support/1.1/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-support/1.1/pom.xml?rev=220207&r1=220206&r2=220207&view=diff == --- maven/components/trunk/maven-core-it-support/1.1/pom.xml (original) +++ maven/components/trunk/maven-core-it-support/1.1/pom.xml Thu Jul 21 16:35:46 2005 @@ -4,7 +4,7 @@ org.apache.maven maven-core-it-support jar - 1.0 + 1.1 repo1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220206 - in /maven/components/trunk/maven-core-it-support: 1.0/ 1.0/pom.xml 1.0/src/ pom.xml src/
Author: brett Date: Thu Jul 21 16:35:07 2005 New Revision: 220206 URL: http://svn.apache.org/viewcvs?rev=220206&view=rev Log: create other test artifacts Added: maven/components/trunk/maven-core-it-support/1.0/ maven/components/trunk/maven-core-it-support/1.0/pom.xml - copied unchanged from r220079, maven/components/trunk/maven-core-it-support/pom.xml maven/components/trunk/maven-core-it-support/1.0/src/ - copied from r219985, maven/components/trunk/maven-core-it-support/src/ Removed: maven/components/trunk/maven-core-it-support/pom.xml maven/components/trunk/maven-core-it-support/src/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MRM-14) utilise repository relocation information to update dependencies
utilise repository relocation information to update dependencies Key: MRM-14 URL: http://jira.codehaus.org/browse/MRM-14 Project: Maven Repository Manager Type: New Feature Components: repository-converter Reporter: Brett Porter since repoclean loads up all the poms it can know which have been relocated and automatically update the dependency information of some poms as they are converted. I think this is appropriate, but maybe the original should be retained? -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MRM-13) utilise repository relocation information during conversion of an artifact
utilise repository relocation information during conversion of an artifact -- Key: MRM-13 URL: http://jira.codehaus.org/browse/MRM-13 Project: Maven Repository Manager Type: New Feature Components: repository-converter Reporter: Brett Porter we should allow some extra metdata in the m1 pom that can be recognised as relocation information: when encountering this, the converted POM and JAR will go to the new location in the m2 repository, and the marker POM (just the relocation information) should go to the old location (and any artifact there should be removed) This would allow us to move Jakarta commons en mass to the dotted groupId layout for example. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MNG-630) Plugin converted to m2 + more tags to look for
[ http://jira.codehaus.org/browse/MNG-630?page=comments#action_43223 ] Dennis Lundberg commented on MNG-630: - I will take a look at the code this weekend. > Plugin converted to m2 + more tags to look for > -- > > Key: MNG-630 > URL: http://jira.codehaus.org/browse/MNG-630 > Project: Maven 2 > Type: New Feature > Environment: Developed under Win2k, Java 1.4.2_04 and m2a3 > Reporter: Fabrice BELLINGARD > Fix For: 2.0-beta-1 > Attachments: maven-tasklist-plugin_M2.zip > > > - Plugin ported from m1 to m2 using the Mojo and Reporting APIs > - The plugin now looks for more kind of tags : > * Javadoc tags (like it used to be): @todo, @whatever, ... > * but also any kind of tag found in a Java comment ("// TODO" for > instance). This works for any Java comment (//, /* or /**). > By default, the plugin will look for "TODO" and "@todo" tags. > - French i18n added :o) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Moved: (MNG-630) Plugin converted to m2 + more tags to look for
[ http://jira.codehaus.org/browse/MNG-630?page=all ] Brett Porter moved MPTASKLIST-13 to MNG-630: Issue Type: New Feature (was: Improvement) Key: MNG-630 (was: MPTASKLIST-13) Project: Maven 2 (was: maven-tasklist-plugin) > Plugin converted to m2 + more tags to look for > -- > > Key: MNG-630 > URL: http://jira.codehaus.org/browse/MNG-630 > Project: Maven 2 > Type: New Feature > Environment: Developed under Win2k, Java 1.4.2_04 and m2a3 > Reporter: Fabrice BELLINGARD > Fix For: 2.0-beta-1 > Attachments: maven-tasklist-plugin_M2.zip > > > - Plugin ported from m1 to m2 using the Mojo and Reporting APIs > - The plugin now looks for more kind of tags : > * Javadoc tags (like it used to be): @todo, @whatever, ... > * but also any kind of tag found in a Java comment ("// TODO" for > instance). This works for any Java comment (//, /* or /**). > By default, the plugin will look for "TODO" and "@todo" tags. > - French i18n added :o) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-630) Plugin converted to m2 + more tags to look for
[ http://jira.codehaus.org/browse/MNG-630?page=all ] Brett Porter updated MNG-630: - Description: - Plugin ported from m1 to m2 using the Mojo and Reporting APIs - The plugin now looks for more kind of tags : * Javadoc tags (like it used to be): @todo, @whatever, ... * but also any kind of tag found in a Java comment ("// TODO" for instance). This works for any Java comment (//, /* or /**). By default, the plugin will look for "TODO" and "@todo" tags. - French i18n added :o) was: - Plugin ported from m1 to m2 using the Mojo and Reporting APIs - The plugin now looks for more kind of tags : * Javadoc tags (like it used to be): @todo, @whatever, ... * but also any kind of tag found in a Java comment ("// TODO" for instance). This works for any Java comment (//, /* or /**). By default, the plugin will look for "TODO" and "@todo" tags. - French i18n added :o) Fix Version: 2.0-beta-1 > Plugin converted to m2 + more tags to look for > -- > > Key: MNG-630 > URL: http://jira.codehaus.org/browse/MNG-630 > Project: Maven 2 > Type: New Feature > Environment: Developed under Win2k, Java 1.4.2_04 and m2a3 > Reporter: Fabrice BELLINGARD > Fix For: 2.0-beta-1 > Attachments: maven-tasklist-plugin_M2.zip > > > - Plugin ported from m1 to m2 using the Mojo and Reporting APIs > - The plugin now looks for more kind of tags : > * Javadoc tags (like it used to be): @todo, @whatever, ... > * but also any kind of tag found in a Java comment ("// TODO" for > instance). This works for any Java comment (//, /* or /**). > By default, the plugin will look for "TODO" and "@todo" tags. > - French i18n added :o) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MEV-45) Full list of poms that doesn't respect the m2 format
[ http://jira.codehaus.org/browse/MEV-45?page=all ] Emmanuel Venisse updated MEV-45: Description: /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/plugins/maven-release-plugin/1.0/maven-release-plugin-1.0.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050509.005115-1.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050707.131747-8.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050511.200909-2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050511.201004-3.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050512.045836-4.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050620.013354-5.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050620.193731-6.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050622.034600-7.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050707.154038-9.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050707.203305-10.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050708.171022-11.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050708.173116-12.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050708.185324-13.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050708.185435-14.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050710.171837-15.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050711.140224-16.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050711.140305-17.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050711.175050-18.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050711.182114-21.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050711.182522-22.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050711.182822-23.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/springframework/spring-parent/1.2.1/spring-parent-1.2.1.pom was: /home/projects/maven/repository-staging/to-ibiblio/maven2/jpox/jpox-enhancer/1.1.0-beta-4-SNAPSHOT/jpox-enhancer-1.1.0-beta-4-SNAPSHOT.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/poms/marmalade-parent-1.0-alpha2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha-2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha-3-20050504.035023-1.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/plugins/maven-release-plugin/1.0/maven-release-plugin-1.0.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-2/wagon-1.0-alpha-2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050407.202417-1.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050413.021234-4.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050419.043745-5.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050419.044035-6.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050421.162738-7.pom /home/projects/maven/repository-stag
[jira] Created: (MPTASKLIST-13) Plugin converted to m2 + more tags to look for
Plugin converted to m2 + more tags to look for -- Key: MPTASKLIST-13 URL: http://jira.codehaus.org/browse/MPTASKLIST-13 Project: maven-tasklist-plugin Type: Improvement Environment: Developed under Win2k, Java 1.4.2_04 and m2a3 Reporter: Fabrice BELLINGARD Attachments: maven-tasklist-plugin_M2.zip - Plugin ported from m1 to m2 using the Mojo and Reporting APIs - The plugin now looks for more kind of tags : * Javadoc tags (like it used to be): @todo, @whatever, ... * but also any kind of tag found in a Java comment ("// TODO" for instance). This works for any Java comment (//, /* or /**). By default, the plugin will look for "TODO" and "@todo" tags. - French i18n added :o) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - SUCCESS - update] Thu Jul 21 15:15:00 GMT 2005
Distribution: http://maven.zones.apache.org/~maven/builds/m2-20050721.151500.tar.gz Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050721.151500.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MNG-229) plugin repository separation mixup
[ http://jira.codehaus.org/browse/MNG-229?page=all ] Brett Porter closed MNG-229: Resolution: Fixed - always use super POM's repository for parent resolution - use correct repository set for plugin dependency resolution > plugin repository separation mixup > -- > > Key: MNG-229 > URL: http://jira.codehaus.org/browse/MNG-229 > Project: Maven 2 > Type: Bug > Components: maven-core > Reporter: Brett Porter > Assignee: Brett Porter > Fix For: 2.0-beta-1 > > > currently, dependences of plugins are resolved from the list of plugin > repositories. This is most likely incorrect, and only works because it > happens to be the same. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220102 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: brett Date: Thu Jul 21 08:15:54 2005 New Revision: 220102 URL: http://svn.apache.org/viewcvs?rev=220102&view=rev Log: PR: MNG-229 - always use super POM's repository for parent resolution - use correct repository set for plugin dependency resolution Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=220102&r1=220101&r2=220102&view=diff == --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Thu Jul 21 08:15:54 2005 @@ -51,8 +51,8 @@ import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.artifact.MavenMetadataSource; import org.apache.maven.project.path.PathTranslator; -import org.apache.maven.settings.Settings; import org.apache.maven.reporting.MavenReport; +import org.apache.maven.settings.Settings; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.PlexusContainerException; @@ -344,7 +344,8 @@ public List getReports( ReportPlugin reportPlugin, ReportSet reportSet, MavenProject project, MavenSession session, ArtifactRepository localRepository ) -throws PluginManagerException, PluginVersionResolutionException, PluginConfigurationException, ArtifactResolutionException +throws PluginManagerException, PluginVersionResolutionException, PluginConfigurationException, +ArtifactResolutionException { Plugin forLookup = new Plugin(); forLookup.setGroupId( reportPlugin.getGroupId() ); @@ -359,7 +360,6 @@ MojoDescriptor mojoDescriptor = (MojoDescriptor) i.next(); // TODO: check ID is correct for reports -// TODO: this returns mojos that aren't reports // if the POM configured no reports, give all from plugin if ( reportSet == null || reportSet.getReports().contains( mojoDescriptor.getGoal() ) ) { @@ -476,11 +476,6 @@ { MavenMetadataSource metadataSource = new MavenMetadataSource( mavenProjectBuilder, artifactFactory ); -List remoteRepositories = new ArrayList(); - -remoteRepositories.addAll( project.getRemoteArtifactRepositories() ); -remoteRepositories.addAll( project.getPluginArtifactRepositories() ); - ArtifactRepository localRepository = session.getLocalRepository(); ResolutionGroup resolutionGroup = metadataSource.retrieve( pluginArtifact, localRepository, @@ -490,7 +485,7 @@ ArtifactResolutionResult result = artifactResolver.resolveTransitively( dependencies, pluginArtifact, localRepository, - remoteRepositories, + resolutionGroup.getResolutionRepositories(), metadataSource, artifactFilter ); @@ -549,7 +544,8 @@ if ( artifactFile == null ) { -String resource = "/META-INF/maven/" + artifact.getGroupId() + "/" + artifact.getArtifactId() + "/pom.xml"; +String resource = "/META-INF/maven/" + artifact.getGroupId() + "/" + artifact.getArtifactId() + +"/pom.xml"; URL resourceUrl = container.getContainerRealm().getResource( resource ); Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=220102&r1=220101&r2=220102&view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Jul 21 08:15:54 2005 @@ -283,18 +283,16 @@ LinkedList l
Re: [m2] bad poms in repo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 especially since it's really only 42 different versions of about 5 artifacts :D Actually, it's not surprising, as these can only possibly be manually uploaded to the m1 pom. repoclean ensures valid poms get written out for the ones it processes (though it seems that it rarely gets a bad one either now). Time to use the new model code that correctly parses the poms in repoclean and see what happens? :) - - Brett Jason van Zyl wrote: >On Thu, 2005-07-21 at 15:23 +0200, Emmanuel Venisse wrote: > >>Jason van Zyl wrote: >> >>>On Thu, 2005-07-21 at 12:50 +0200, Emmanuel Venisse wrote: >>> -bash-2.05b$ ./checkrepo.sh >>> >>> >>>Nice! >>> >>only 42 bad poms :-) > > >That's actually not bad considering the number of POMs repoclean >operates on. Not bad at all. > >> >>- >>To unsubscribe, e-mail: [EMAIL PROTECTED] >>For additional commands, e-mail: [EMAIL PROTECTED] >> >> -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (Cygwin) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFC37JEOb5RoQhMkRMRAiUzAJ9Gd8gGSHiw8R5ole1knXZAvvWiOACeOpQJ 8YhB56WLsYdl4xBKlX1UgRs= =SPcC -END PGP SIGNATURE- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [m2] bad poms in repo
On Thu, 2005-07-21 at 15:23 +0200, Emmanuel Venisse wrote: > > Jason van Zyl wrote: > > On Thu, 2005-07-21 at 12:50 +0200, Emmanuel Venisse wrote: > > > >>-bash-2.05b$ ./checkrepo.sh > > > > > > Nice! > > > > only 42 bad poms :-) That's actually not bad considering the number of POMs repoclean operates on. Not bad at all. > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- jvz. Jason van Zyl jason at maven.org http://maven.apache.org - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MNG-596) Add xml schema to m2 poms
[ http://jira.codehaus.org/browse/MNG-596?page=comments#action_43191 ] fabrizio giustina commented on MNG-596: --- >> applied, thanks. watch out for exatra changes in your patches - this >> commented out a line the DefaultMavenProjectBuilder (you would have >> commented out due to a bug which is already fixed) oops, sorry for that, I removed it from the first diff but I forgot to do that in the updated one. Glad to know the bug has been fixed, anyway ;) > Add xml schema to m2 poms > - > > Key: MNG-596 > URL: http://jira.codehaus.org/browse/MNG-596 > Project: Maven 2 > Type: Improvement > Versions: 2.0-alpha-3 > Reporter: fabrizio giustina > Priority: Trivial > Fix For: 2.0-beta-1 > Attachments: pom-xsd-rev220022.diff, pom-xsd.diff > > > pom for maven2 don't contain any reference to the xsd at > http://maven.apache.org/maven-v4_0_0.xsd > Adding the xsd reference to poms will enforce validation in IDEs, and add > content assist in xsd-aware xml editors. > The attached patch will add the following declaration to the root > element for all the poms in > https://svn.apache.org/repos/asf/maven/components/trunk : > 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";> > (pom.xml files generated by the archetipe plugin will be affected as well) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - FAILED - update] Thu Jul 21 14:15:00 GMT 2005
Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050721.141500.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MNG-596) Add xml schema to m2 poms
[ http://jira.codehaus.org/browse/MNG-596?page=all ] Brett Porter closed MNG-596: Resolution: Fixed applied, thanks. watch out for exatra changes in your patches - this commented out a line the DefaultMavenProjectBuilder (you would have commented out due to a bug which is already fixed) > Add xml schema to m2 poms > - > > Key: MNG-596 > URL: http://jira.codehaus.org/browse/MNG-596 > Project: Maven 2 > Type: Improvement > Versions: 2.0-alpha-3 > Reporter: fabrizio giustina > Priority: Trivial > Fix For: 2.0-beta-1 > Attachments: pom-xsd-rev220022.diff, pom-xsd.diff > > > pom for maven2 don't contain any reference to the xsd at > http://maven.apache.org/maven-v4_0_0.xsd > Adding the xsd reference to poms will enforce validation in IDEs, and add > content assist in xsd-aware xml editors. > The attached patch will add the following declaration to the root > element for all the poms in > https://svn.apache.org/repos/asf/maven/components/trunk : > 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";> > (pom.xml files generated by the archetipe plugin will be affected as well) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - FAILED - checkout] Thu Jul 21 13:51:00 GMT 2005
Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050721.135100.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - FAILED - update] Thu Jul 21 13:48:00 GMT 2005
Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050721.134800.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MNG-601) InvalidArtifactRTException on using a plugin with @execute phase="package"
[ http://jira.codehaus.org/browse/MNG-601?page=all ] Brett Porter closed MNG-601: Resolution: Cannot Reproduce Fix Version: (was: 2.0-beta-1) > InvalidArtifactRTException on using a plugin with @execute phase="package" > -- > > Key: MNG-601 > URL: http://jira.codehaus.org/browse/MNG-601 > Project: Maven 2 > Type: Bug > Components: maven-plugin-api > Versions: 2.0-alpha-3 > Environment: WinXP > Reporter: Edwin Punzalan > Attachments: JettyRunWar.java > > > The mojo builds successfully. The error is thrown on a project using the > mojo with the annotation declared. > Removing the @execute annotation does not. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220068 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: brett Date: Thu Jul 21 06:40:20 2005 New Revision: 220068 URL: http://svn.apache.org/viewcvs?rev=220068&view=rev Log: copy constructor needs to copy artifact reference Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=220068&r1=220067&r2=220068&view=diff == --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Thu Jul 21 06:40:20 2005 @@ -146,6 +146,9 @@ this.profileProperties = new Properties( project.profileProperties ); this.model = ModelUtils.cloneModel( project.model ); + +// TODO: need to clone this too? +this.artifact = project.artifact; } // -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220067 - /maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java
Author: brett Date: Thu Jul 21 06:39:55 2005 New Revision: 220067 URL: http://svn.apache.org/viewcvs?rev=220067&view=rev Log: have to have the old signature for plugins compiled against it Modified: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java Modified: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java?rev=220067&r1=220066&r2=220067&view=diff == --- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java (original) +++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java Thu Jul 21 06:39:55 2005 @@ -22,7 +22,8 @@ * @author Brett Porter * @version $Id$ */ -public class MojoExecutionException extends Exception +public class MojoExecutionException +extends Exception { private Object source; @@ -33,6 +34,11 @@ super( shortMessage ); this.source = source; this.longMessage = longMessage; +} + +public MojoExecutionException( String message, Exception cause ) +{ +super( message, cause ); } public MojoExecutionException( String message, Throwable cause ) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220066 - /maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/AbstractVersionArtifactMetadata.java
Author: brett Date: Thu Jul 21 06:39:32 2005 New Revision: 220066 URL: http://svn.apache.org/viewcvs?rev=220066&view=rev Log: fix problem on first run when no RELEASE data Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/AbstractVersionArtifactMetadata.java Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/AbstractVersionArtifactMetadata.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/AbstractVersionArtifactMetadata.java?rev=220066&r1=220065&r2=220066&view=diff == --- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/AbstractVersionArtifactMetadata.java (original) +++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/AbstractVersionArtifactMetadata.java Thu Jul 21 06:39:32 2005 @@ -108,18 +108,22 @@ public void storeInLocalRepository( ArtifactRepository localRepository ) throws ArtifactMetadataRetrievalException { -try +String version = constructVersion(); +if ( version != null ) { -String path = getLocalRepositoryLocation( localRepository ).getPath(); -File file = new File( path ); -// TODO: this should be centralised before the resolution of the artifact -file.getParentFile().mkdirs(); -FileUtils.fileWrite( path, constructVersion() ); -lastModified = file.lastModified(); -} -catch ( IOException e ) -{ -throw new ArtifactMetadataRetrievalException( "Unable to retrieve metadata", e ); +try +{ +String path = getLocalRepositoryLocation( localRepository ).getPath(); +File file = new File( path ); +// TODO: this should be centralised before the resolution of the artifact +file.getParentFile().mkdirs(); +FileUtils.fileWrite( path, version ); +lastModified = file.lastModified(); +} +catch ( IOException e ) +{ +throw new ArtifactMetadataRetrievalException( "Unable to retrieve metadata", e ); +} } } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Reopened: (MNG-449) plugin development without release use case
[ http://jira.codehaus.org/browse/MNG-449?page=all ] Brett Porter reopened MNG-449: -- doesn't actually fix it. the plugin resolver tries to resolve RELEASE still (as it should), and doesn't know to try LATEST. IT could possibly try LATEST if RELEASE was not resolvable... but that only helps when starting out. > plugin development without release use case > --- > > Key: MNG-449 > URL: http://jira.codehaus.org/browse/MNG-449 > Project: Maven 2 > Type: Bug > Components: maven-artifact > Versions: 2.0-alpha-2 > Reporter: Brett Porter > Assignee: John Casey > Fix For: 2.0-beta-1 > > > currently, a plugin used from the command line or a POM without a version > uses the latest release. This is inconvenient and confusing when you are > developing a plugin as you need to do the first install with > -DupdateReleaseInfo to get it to use your version. > There needs to be a better way to do this. It may be solved by existing > issues relating to the RELEASE and plugin version management. If not, then > another alternative might need to be considered, like local installation > triggering a RELEASE update. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [m2] bad poms in repo
Jason van Zyl wrote: On Thu, 2005-07-21 at 12:50 +0200, Emmanuel Venisse wrote: -bash-2.05b$ ./checkrepo.sh Nice! only 42 bad poms :-) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MEV-45) Full list of poms that doesn't respect the m2 format
Full list of poms that doesn't respect the m2 format Key: MEV-45 URL: http://jira.codehaus.org/browse/MEV-45 Project: Maven Evangelism Type: Bug Components: Invalid POM Reporter: Emmanuel Venisse /home/projects/maven/repository-staging/to-ibiblio/maven2/jpox/jpox-enhancer/1.1.0-beta-4-SNAPSHOT/jpox-enhancer-1.1.0-beta-4-SNAPSHOT.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/poms/marmalade-parent-1.0-alpha2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha-2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha-3-20050504.035023-1.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/plugins/maven-release-plugin/1.0/maven-release-plugin-1.0.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-2/wagon-1.0-alpha-2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050407.202417-1.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050413.021234-4.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050419.043745-5.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050419.044035-6.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050421.162738-7.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050422.075233-8.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-3-SNAPSHOT/wagon-1.0-alpha-3-20050429.051847-9.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon-1.0-alpha-2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050413.021234-4.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050419.043745-5.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050419.044035-6.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050421.162738-7.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050422.075233-8.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon-1.0-alpha-3-20050429.051847-9.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050509.005115-1.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050707.131747-8.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050511.200909-2.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050511.201004-3.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050512.045836-4.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050620.013354-5.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050620.193731-6.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050622.034600-7.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050707.154038-9.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050707.203305-10.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050708.171022-11.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050708.173116-12.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050708.185324-13.pom /home/projects/maven/repository-staging/to-ibiblio/maven2/org/codehaus/xfire/xfire-parent/1.0-SNAPSHOT/xfire-parent-1.0-20050708.185435-14.pom /home/projects/maven/repository
Re: [m2] bad poms in repo
On Thu, 2005-07-21 at 12:50 +0200, Emmanuel Venisse wrote: > -bash-2.05b$ ./checkrepo.sh Nice! -- jvz. Jason van Zyl jason at maven.org http://maven.apache.org - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - FAILED - update] Thu Jul 21 13:15:00 GMT 2005
Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050721.131500.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220060 - in /maven/components/trunk/sandbox/maven-repository-checker: pom.xml src/assemble/ src/assemble/bin.xml src/bin/ src/bin/checkrepo.sh
Author: evenisse Date: Thu Jul 21 06:11:24 2005 New Revision: 220060 URL: http://svn.apache.org/viewcvs?rev=220060&view=rev Log: (empty) Added: maven/components/trunk/sandbox/maven-repository-checker/src/assemble/ maven/components/trunk/sandbox/maven-repository-checker/src/assemble/bin.xml (with props) maven/components/trunk/sandbox/maven-repository-checker/src/bin/ maven/components/trunk/sandbox/maven-repository-checker/src/bin/checkrepo.sh (with props) Modified: maven/components/trunk/sandbox/maven-repository-checker/pom.xml Modified: maven/components/trunk/sandbox/maven-repository-checker/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-repository-checker/pom.xml?rev=220060&r1=220059&r2=220060&view=diff == --- maven/components/trunk/sandbox/maven-repository-checker/pom.xml (original) +++ maven/components/trunk/sandbox/maven-repository-checker/pom.xml Thu Jul 21 06:11:24 2005 @@ -22,4 +22,14 @@ 1.0.1 + + + +maven-assembly-plugin + + src/assemble/bin.xml + + + + Added: maven/components/trunk/sandbox/maven-repository-checker/src/assemble/bin.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-repository-checker/src/assemble/bin.xml?rev=220060&view=auto == --- maven/components/trunk/sandbox/maven-repository-checker/src/assemble/bin.xml (added) +++ maven/components/trunk/sandbox/maven-repository-checker/src/assemble/bin.xml Thu Jul 21 06:11:24 2005 @@ -0,0 +1,29 @@ + + bin + +tar.gz +tar.bz2 +zip + + + + src/bin + bin + + + target + lib + +maven-repository-checker-*.jar + + +maven-repository-checker-*-sources.jar + + + + + + lib + + + Propchange: maven/components/trunk/sandbox/maven-repository-checker/src/assemble/bin.xml -- svn:eol-style = native Propchange: maven/components/trunk/sandbox/maven-repository-checker/src/assemble/bin.xml -- svn:keywords = "Author Date Id Revision" Added: maven/components/trunk/sandbox/maven-repository-checker/src/bin/checkrepo.sh URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-repository-checker/src/bin/checkrepo.sh?rev=220060&view=auto == --- maven/components/trunk/sandbox/maven-repository-checker/src/bin/checkrepo.sh (added) +++ maven/components/trunk/sandbox/maven-repository-checker/src/bin/checkrepo.sh Thu Jul 21 06:11:24 2005 @@ -0,0 +1,22 @@ +#!/bin/sh + +# -- + +PID=$$ +RUNNING=`ps -ef | grep checkrepo.sh | grep -v 'sh -c' | grep -v grep | grep -v $PID` +if [ ! -z "$RUNNING" ]; then + echo "checkrepo.sh already running... exiting" + exit 1 +fi + +REPO=$HOME/repository-staging/to-ibiblio/maven2 + +PRG="$0" +PRGDIR=`dirname "$PRG"` + +( +cd $PRGDIR/.. +PRGDIR=`pwd` +CLASSPATH=$PRGDIR/lib/maven-repository-checker-1.0-SNAPSHOT.jar:$PRGDIR/lib/maven-model-2.0-beta-1-SNAPSHOT.jar:$PRGDIR/lib/plexus-utils-1.0.1.jar +$JAVA_HOME/bin/java -classpath $CLASSPATH org.apache.maven.repository.checker.CheckRepo $REPO +) Propchange: maven/components/trunk/sandbox/maven-repository-checker/src/bin/checkrepo.sh -- svn:eol-style = native Propchange: maven/components/trunk/sandbox/maven-repository-checker/src/bin/checkrepo.sh -- svn:keywords = "Author Date Id Revision" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[maven2 build - FAILED - update] Thu Jul 21 13:07:00 GMT 2005
Log: http://maven.zones.apache.org/~maven/logs/m2-build-log-20050721.130700.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MNG-567) Possible error in PluginParameterExpressionEvaluator
[ http://jira.codehaus.org/browse/MNG-567?page=all ] Brett Porter closed MNG-567: Resolution: Fixed fixed. luckily the expression evaluator ignores everything up to ".", so project is as valid as pom and as roject. For your other idea - please put together a proposal and use case. I think 2.1 is the time for that though. > Possible error in PluginParameterExpressionEvaluator > > > Key: MNG-567 > URL: http://jira.codehaus.org/browse/MNG-567 > Project: Maven 2 > Type: Bug > Components: maven-core > Reporter: Kenney Westerhof > Fix For: 2.0-beta-1 > > > else if ( expression.startsWith( "project" ) ) > { > try > { > > int pathSeparator = expression.indexOf( "/" ); > if ( pathSeparator > 0 ) > { > String pathExpression = expression.substring( 1, > pathSeparator ); > seems wrong to me: say expression = "project.FOO/BAR"; > then pathExpression will be "roject.FOO". > Also, there is a lot of need for the ExpressionEvaluator functionality in > plugins (to access the > project.* variables at runtime, not at configuration time). Any chance this > evaluator can be made into > a component? (the problem is that the constructor takes arguments that are > also not available > in a a plugin.) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220058 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Author: brett Date: Thu Jul 21 06:05:26 2005 New Revision: 220058 URL: http://svn.apache.org/viewcvs?rev=220058&view=rev Log: PR: MNG-567 fix off by one error Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=220058&r1=220057&r2=220058&view=diff == --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Thu Jul 21 06:05:26 2005 @@ -85,19 +85,19 @@ return expression; } -if ( expression.equals( "localRepository" ) ) +if ( "localRepository".equals( expression ) ) { value = context.getLocalRepository(); } -else if ( expression.equals( "session" ) ) +else if ( "session".equals( expression ) ) { value = context; } -else if ( expression.equals( "project" ) ) +else if ( "project".equals( expression ) ) { value = project; } -else if ( expression.equals( "executedProject" ) ) +else if ( "executedProject".equals( expression ) ) { value = project.getExecutionProject(); } @@ -109,7 +109,7 @@ if ( pathSeparator > 0 ) { -String pathExpression = expression.substring( 1, pathSeparator ); +String pathExpression = expression.substring( 0, pathSeparator ); value = ReflectionValueExtractor.evaluate( pathExpression, project ); value = value + expression.substring( pathSeparator ); } @@ -177,7 +177,7 @@ e ); } } -else if ( expression.equals( "basedir" ) ) +else if ( "basedir".equals( expression ) ) { value = project.getBasedir().getAbsolutePath(); } @@ -250,7 +250,7 @@ public File alignToBaseDirectory( File file ) { -File basedir = null; +File basedir; if ( project != null && project.getFile() != null ) { - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MNG-531) DefaultPluginManager does not take into account parameters defined in a custom lifecycle for report mojos
[ http://jira.codehaus.org/browse/MNG-531?page=all ] Brett Porter closed MNG-531: Resolution: Duplicate Fix Version: (was: 2.0-beta-1) > DefaultPluginManager does not take into account parameters defined in a > custom lifecycle for report mojos > - > > Key: MNG-531 > URL: http://jira.codehaus.org/browse/MNG-531 > Project: Maven 2 > Type: Bug > Components: maven-core > Versions: 2.0-alpha-3 > Reporter: Vincent Massol > Priority: Critical > > > I have a mojo with some required parameters that are provided by a custom > lifecycle. When DefaultPluginManager.getReports() gets exectued it calls > checkRequiredParameters() which reports missing parameters even though they > are provided by the custom liecycle: > [INFO] [site:site] > [INFO] maven-clover-plugin: using locally installed snapshot > [INFO] > > [ERROR] BUILD ERROR > [INFO] > > [INFO] Diagnosis: Error getting reports > [INFO] > > [ERROR] Cause: > org.apache.maven.plugin.MojoExecutionException: Error getting reports > at org.apache.maven.doxia.DoxiaMojo.getReports(DoxiaMojo.java:797) > at org.apache.maven.doxia.DoxiaMojo.execute(DoxiaMojo.java:203) > at > org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:401) > at > org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:169) > at > org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeStandaloneGoal(DefaultLifecycleExecutor.java:150) > at > org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:133) > at > org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:103) > at org.apache.maven.DefaultMaven.processProject(DefaultMaven.java:261) > at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:180) > at org.apache.maven.cli.MavenCli.main(MavenCli.java:269) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:324) > at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:303) > at org.codehaus.classworlds.Launcher.launch(Launcher.java:243) > at > org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:416) > at org.codehaus.classworlds.Launcher.main(Launcher.java:363) > Caused by: org.apache.maven.plugin.PluginParameterException: Invalid or > missing parameters: [Mojo parameter [name: 'cloverDatabase > '; alias: 'null'], Mojo parameter [name: 'cloverOutputDirectory'; alias: > 'null']] for mojo: org.apache.maven.plugins:maven-clover- > plugin:1.0-SNAPSHOT:instrument > at > org.apache.maven.plugin.DefaultPluginManager.checkRequiredParameters(DefaultPluginManager.java:764) > at > org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:527) > at > org.apache.maven.plugin.DefaultPluginManager.getReports(DefaultPluginManager.java:457) > at org.apache.maven.doxia.DoxiaMojo.getReports(DoxiaMojo.java:770) > ... 17 more -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MNG-629) report executor doesn't perform lifecycle
report executor doesn't perform lifecycle - Key: MNG-629 URL: http://jira.codehaus.org/browse/MNG-629 Project: Maven 2 Type: Bug Reporter: Brett Porter Fix For: 2.0-beta-1 eg, for clover - it has @execute phase="test", but the report is run directly ignoring this. This means that the clover database is not created. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MNG-628) clover report in pom links to empty page instead of generated content
clover report in pom links to empty page instead of generated content - Key: MNG-628 URL: http://jira.codehaus.org/browse/MNG-628 Project: Maven 2 Type: Bug Reporter: Brett Porter Fix For: 2.0-beta-1 an empty clover.html is generated and linked to from the navigation, instead of the /clover/index.html file with frames. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220051 - /maven/components/trunk/maven-core/pom.xml
Author: brett Date: Thu Jul 21 05:38:02 2005 New Revision: 220051 URL: http://svn.apache.org/viewcvs?rev=220051&view=rev Log: add project info report Modified: maven/components/trunk/maven-core/pom.xml Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=220051&r1=220050&r2=220051&view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Thu Jul 21 05:38:02 2005 @@ -131,6 +131,10 @@ org.apache.maven.plugins maven-pmd-plugin + +org.apache.maven.plugins +maven-project-info-reports-plugin + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220050 - /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Author: brett Date: Thu Jul 21 05:37:43 2005 New Revision: 220050 URL: http://svn.apache.org/viewcvs?rev=220050&view=rev Log: fix NPE in dependencies report Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=220050&r1=220049&r2=220050&view=diff == --- maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original) +++ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Thu Jul 21 05:37:43 2005 @@ -17,6 +17,7 @@ */ import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.model.Dependency; import org.apache.maven.project.MavenProject; @@ -85,6 +86,13 @@ private MavenProjectBuilder mavenProjectBuilder; /** + * @parameter expression="${localRepository}" + * @required + * @readonly + */ +private ArtifactRepository localRepository; + +/** * @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale) */ public String getName( Locale locale ) @@ -139,7 +147,7 @@ throws MavenReportException { DependenciesRenderer r = new DependenciesRenderer( getSink(), getProject(), locale, mavenProjectBuilder, - artifactFactory ); + artifactFactory, localRepository ); r.render(); } @@ -163,8 +171,11 @@ private MavenProjectBuilder mavenProjectBuilder; +private ArtifactRepository localRepository; + public DependenciesRenderer( Sink sink, MavenProject project, Locale locale, -MavenProjectBuilder mavenProjectBuilder, ArtifactFactory artifactFactory ) +MavenProjectBuilder mavenProjectBuilder, ArtifactFactory artifactFactory, +ArtifactRepository localRepository ) { super( sink ); @@ -175,6 +186,8 @@ this.mavenProjectBuilder = mavenProjectBuilder; this.artifactFactory = artifactFactory; + +this.localRepository = localRepository; } public String getTitle() @@ -187,7 +200,7 @@ // Dependencies report List dependencies = project.getDependencies(); -if ( ( dependencies == null ) || ( dependencies.isEmpty() ) ) +if ( dependencies == null || dependencies.isEmpty() ) { startSection( getTitle() ); @@ -224,7 +237,7 @@ MavenProject artifactProject = null; try { -artifactProject = getMavenProjectFromRepository( artifact ); +artifactProject = getMavenProjectFromRepository( artifact, localRepository ); } catch ( ProjectBuildingException e ) { @@ -269,7 +282,7 @@ MavenProject artifactProject = null; try { -artifactProject = getMavenProjectFromRepository( artifact ); +artifactProject = getMavenProjectFromRepository( artifact, localRepository ); } catch ( ProjectBuildingException e ) { @@ -277,8 +290,6 @@ "Can't find a valid Maven project in the repository for the artifact [" + artifact + "]." ); } -System.out.println( "nklj-" ); -System.out.println( artifactProject.getUrl() ); tableRow( new String[] { artifact.getGroupId(), artifact.getArtifactId(), @@ -308,7 +319,7 @@ List dependencies = project.getDependencies(); Set artifacts = project.getArtifacts(); -if ( ( dependencies == null ) || ( artifacts == null ) ) +if ( dependencies == null || artifacts == null ) { return transitiveDependencies; } @@ -34
svn commit: r220046 - in /maven/components/trunk/maven-plugins: maven-checkstyle-plugin/src/main/resources/META-INF/plexus/ maven-clover-plugin/src/main/resources/META-INF/plexus/ maven-javadoc-plugin/src/main/resources/META-INF/plexus/ maven-pmd-plugi...
Author: brett Date: Thu Jul 21 05:28:58 2005 New Revision: 220046 URL: http://svn.apache.org/viewcvs?rev=220046&view=rev Log: remove unnecessary report components definitions Removed: maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/resources/META-INF/plexus/ maven/components/trunk/maven-plugins/maven-clover-plugin/src/main/resources/META-INF/plexus/ maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/resources/META-INF/plexus/ maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/resources/META-INF/plexus/ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220042 - in /maven/components/trunk: maven-core/ maven-core/src/main/java/org/apache/maven/plugin/ maven-plugins/maven-clover-plugin/ maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ maven-plugins/maven-site-plugin...
Author: brett Date: Thu Jul 21 05:18:35 2005 New Revision: 220042 URL: http://svn.apache.org/viewcvs?rev=220042&view=rev Log: PR: MNG-530 don't attempt to configure non-report mojos during reporting Modified: maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven/components/trunk/maven-plugins/maven-clover-plugin/pom.xml maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java (contents, props changed) maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=220042&r1=220041&r2=220042&view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Thu Jul 21 05:18:35 2005 @@ -19,7 +19,6 @@ org.apache.maven.reporting maven-reporting-api 2.0-beta-1-SNAPSHOT - runtime org.apache.maven @@ -122,7 +121,7 @@ org.apache.maven.plugins -maven-project-info-reports-plugin +maven-clover-plugin org.apache.maven.plugins Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=220042&r1=220041&r2=220042&view=diff == --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Thu Jul 21 05:18:35 2005 @@ -52,6 +52,7 @@ import org.apache.maven.project.artifact.MavenMetadataSource; import org.apache.maven.project.path.PathTranslator; import org.apache.maven.settings.Settings; +import org.apache.maven.reporting.MavenReport; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.PlexusContainerException; @@ -286,7 +287,7 @@ dom = Xpp3Dom.mergeXpp3Dom( dom, mojoExecution.getConfiguration() ); } -plugin = getConfiguredMojo( mojoDescriptor, session, dom, project ); +plugin = getConfiguredMojo( mojoDescriptor, session, dom, project, false ); } catch ( PluginConfigurationException e ) { @@ -375,7 +376,11 @@ Xpp3Dom dom = project.getReportConfiguration( reportPlugin.getGroupId(), reportPlugin.getArtifactId(), executionId ); -reports.add( getConfiguredMojo( mojoDescriptor, session, dom, project ) ); +Mojo reportMojo = getConfiguredMojo( mojoDescriptor, session, dom, project, true ); +if ( reportMojo != null ) +{ +reports.add( reportMojo ); +} } catch ( ComponentLookupException e ) { @@ -401,19 +406,24 @@ } private Mojo getConfiguredMojo( MojoDescriptor mojoDescriptor, MavenSession session, Xpp3Dom dom, -MavenProject project ) +MavenProject project, boolean report ) throws ComponentLookupException, PluginConfigurationException, PluginManagerException { -PlexusContainer pluginContainer = getPluginContainer( mojoDescriptor.getPluginDescriptor() ); - PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor(); +PlexusContainer pluginContainer = getPluginContainer( pluginDescriptor ); + // if this is the first time this plugin has been used, the plugin's container will only // contain the plugin's artifact in isolation; we need to finish resolving the plugin's // dependencies, and add them to the container. ensurePluginContainerIsComplete( pluginDescriptor, pluginContainer, project, session ); Mojo plugin = (Mojo) pluginContainer.lookup( Mojo.ROLE, mojoDescriptor.getRoleHint() ); +if ( report && !( plugin instanceof MavenReport ) ) +{ +// TODO: the mojoDescriptor should actually capture this information so we don't get this far +return null; +} plugin.setLog( mojoLogger ); Modified: maven/components/trunk/maven-plugins/maven-clover-plugin/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-clover-plugin/pom.xml?rev=220042&r1=220041&r2=220
[jira] Closed: (MNG-530) Non-report mojos are added by DefaultPluginManager.getReports()
[ http://jira.codehaus.org/browse/MNG-530?page=all ] Brett Porter closed MNG-530: Resolution: Fixed > Non-report mojos are added by DefaultPluginManager.getReports() > --- > > Key: MNG-530 > URL: http://jira.codehaus.org/browse/MNG-530 > Project: Maven 2 > Type: Bug > Components: maven-core > Versions: 2.0-alpha-3 > Reporter: Vincent Massol > Assignee: Brett Porter > Priority: Blocker > Fix For: 2.0-beta-1 > > > I have a plugin (clover) that have both "normal" mojos and report mojos. > getReports() adds all of them. There is a todo in the code to fix that too. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (CONTINUUM-250) Continuum should not update SCM url for Maven1 projects.
Continuum should not update SCM url for Maven1 projects. Key: CONTINUUM-250 URL: http://jira.codehaus.org/browse/CONTINUUM-250 Project: Continuum Type: Bug Components: continuum-core Reporter: Tomasz Pik I've some Maven1 projects with parametrized SCM urls, in form of scm:cvs:pserver:${scm1.server}:/root/to/repo:module They are correct for Maven1 - SCM plugin works with them very good. Continuum do not handle them as there's no way to specify value for ${scm1.server} property (and I think it's OK). Continnum loads evaluated project.xml (with ${scm1.server} replaced by correct value) and starts building peoject but after checkout updates in internals (ContinuumProject) value for SCM url with one from project.xml so in next build SCM url is invalid. As a resolution for this I'd like to propose: 1. add an option to import Maven1 project using SCM url only (and read rest of properties from loaded POM) so user may provide evaluated version (this is a good thing to be done in plugin for Maven1) 2. do not update ContiuumProject.scmURL based on POM; -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira
[m2] bad poms in repo
-bash-2.05b$ ./checkrepo.sh /home/projects/maven/repository-staging/to-ibiblio/maven2/jpox/jpox-enhancer/1.1.0-beta-4-SNAPSHOT/jpox-enhancer-1.1.0-b eta-4-SNAPSHOT.pom org.codehaus.plexus.util.xml.pull.XmlPullParserException: Unrecognised tag: 'url' (position: START_TAG seen ... >\n ... @19:12) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseDependency(MavenXpp3Reader.java:696) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseModel(MavenXpp3Reader.java:1324) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.read(MavenXpp3Reader.java:2650) at org.apache.maven.repository.checker.CheckRepo.parseFile(CheckRepo.java:63) at org.apache.maven.repository.checker.CheckRepo.main(CheckRepo.java:51) /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/poms/marmalade-parent-1.0-alpha2.pom org.codehaus.plexus.util.xml.pull.XmlPullParserException: Unrecognised tag: 'repository' (position: START_TAG seen ... distributionManagement>\n ... @15:15) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseModel(MavenXpp3Reader.java:1352) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.read(MavenXpp3Reader.java:2650) at org.apache.maven.repository.checker.CheckRepo.parseFile(CheckRepo.java:63) at org.apache.maven.repository.checker.CheckRepo.main(CheckRepo.java:51) /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha-2.pom org.codehaus.plexus.util.xml.pull.XmlPullParserException: Unrecognised tag: 'repository' (position: START_TAG seen ... distributionManagement>\n ... @16:15) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseModel(MavenXpp3Reader.java:1352) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.read(MavenXpp3Reader.java:2650) at org.apache.maven.repository.checker.CheckRepo.parseFile(CheckRepo.java:63) at org.apache.maven.repository.checker.CheckRepo.main(CheckRepo.java:51) /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha-3-20050504.035023-1.pom org.codehaus.plexus.util.xml.pull.XmlPullParserException: Unrecognised tag: 'repository' (position: START_TAG seen ... distributionManagement>\n ... @16:15) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseModel(MavenXpp3Reader.java:1352) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.read(MavenXpp3Reader.java:2650) at org.apache.maven.repository.checker.CheckRepo.parseFile(CheckRepo.java:63) at org.apache.maven.repository.checker.CheckRepo.main(CheckRepo.java:51) /home/projects/maven/repository-staging/to-ibiblio/maven2/marmalade/marmalade-parent-1.0-alpha2.pom org.codehaus.plexus.util.xml.pull.XmlPullParserException: Unrecognised tag: 'repository' (position: START_TAG seen ... distributionManagement>\n ... @16:15) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseModel(MavenXpp3Reader.java:1352) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.read(MavenXpp3Reader.java:2650) at org.apache.maven.repository.checker.CheckRepo.parseFile(CheckRepo.java:63) at org.apache.maven.repository.checker.CheckRepo.main(CheckRepo.java:51) /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/plugins/maven-release-plugin/1.0/maven-releas e-plugin-1.0.pom org.codehaus.plexus.util.xml.pull.XmlPullParserException: Unrecognised tag: 'pluginManagement' (position: START_TAG seen ...\n\n ... @163:21) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseModel(MavenXpp3Reader.java:1352) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.read(MavenXpp3Reader.java:2650) at org.apache.maven.repository.checker.CheckRepo.parseFile(CheckRepo.java:63) at org.apache.maven.repository.checker.CheckRepo.main(CheckRepo.java:51) /home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/wagon/wagon/1.0-alpha-2/wagon-1.0-alpha-2.pom org.codehaus.plexus.util.xml.pull.XmlPullParserException: Unrecognised tag: 'shortDescription' (position: START_TAG seen ...\n ... @11:21) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.parseModel(MavenXpp3Reader.java:1352) at org.apache.maven.model.io.xpp3.MavenXpp3Reader.read(MavenXpp3Reader.java:2650) at
svn commit: r220029 - /maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java
Author: evenisse Date: Thu Jul 21 03:11:49 2005 New Revision: 220029 URL: http://svn.apache.org/viewcvs?rev=220029&view=rev Log: (empty) Modified: maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java Modified: maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java?rev=220029&r1=220028&r2=220029&view=diff == --- maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java (original) +++ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java Thu Jul 21 03:11:49 2005 @@ -18,6 +18,8 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +import org.codehaus.plexus.util.FileUtils; + import java.io.File; import java.io.FileReader; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220028 - in /maven/components/trunk/sandbox/maven-repository-checker: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/java/org/apache/maven/repository/ src/main/java/or...
Author: evenisse Date: Thu Jul 21 03:10:32 2005 New Revision: 220028 URL: http://svn.apache.org/viewcvs?rev=220028&view=rev Log: Add a little tool for check all poms in repo. Added: maven/components/trunk/sandbox/maven-repository-checker/ (with props) maven/components/trunk/sandbox/maven-repository-checker/pom.xml (with props) maven/components/trunk/sandbox/maven-repository-checker/src/ maven/components/trunk/sandbox/maven-repository-checker/src/main/ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java (with props) Propchange: maven/components/trunk/sandbox/maven-repository-checker/ -- --- svn:ignore (added) +++ svn:ignore Thu Jul 21 03:10:32 2005 @@ -0,0 +1 @@ +target Added: maven/components/trunk/sandbox/maven-repository-checker/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-repository-checker/pom.xml?rev=220028&view=auto == --- maven/components/trunk/sandbox/maven-repository-checker/pom.xml (added) +++ maven/components/trunk/sandbox/maven-repository-checker/pom.xml Thu Jul 21 03:10:32 2005 @@ -0,0 +1,25 @@ + + + + 4.0.0 + +org.apache.maven +maven +2.0-beta-1-SNAPSHOT + + maven-repository-checker + Maven Repository Checker + 1.0-SNAPSHOT + + + org.apache.maven + maven-model + 2.0-beta-1-SNAPSHOT + + + plexus + plexus-utils + 1.0.1 + + + Propchange: maven/components/trunk/sandbox/maven-repository-checker/pom.xml -- svn:eol-style = native Propchange: maven/components/trunk/sandbox/maven-repository-checker/pom.xml -- svn:keywords = "Author Date Id Revision" Added: maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java?rev=220028&view=auto == --- maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java (added) +++ maven/components/trunk/sandbox/maven-repository-checker/src/main/java/org/apache/maven/repository/checker/CheckRepo.java Thu Jul 21 03:10:32 2005 @@ -0,0 +1,74 @@ +package org.apache.maven.repository.checker; + +/* + * Copyright 2004-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.apache.maven.model.io.xpp3.MavenXpp3Reader; + +import java.io.File; +import java.io.FileReader; + +public class CheckRepo +{ +public static void main( String[] args ) +{ +if ( args.length != 1 ) +{ +System.out.println( "Usage: " + CheckRepo.class.getName() + " " ); +System.exit( 1 ); +} + +File rootDir = new File( args[0] ); +if ( !rootDir.exists() ) +{ +System.out.println( rootDir.getAbsolutePath() + " doesn't exist." ); + +System.exit( 1 ); +} + +String[] extensions = { "pom" }; + +String[] files = FileUtils.getFilesFromExtension( rootDir.getAbsolutePath(), extensions ); + +for ( int i = 0; i < files.length; i++ ) +{ +//System.out.println( files[i] ); +parseFile( new File( files[i] ) ); +} +} + +private static void parseFile( File file ) +{ +try +{ +FileReader fileReader = new FileReader( file ); + +MavenXpp3Reade
[jira] Updated: (MNG-617) Updated maven-hibernate-plugin... old code seem deprecated
[ http://jira.codehaus.org/browse/MNG-617?page=all ] Edwin Punzalan updated MNG-617: --- Attachment: maven-hibernate-plugin.zip Added new goal: aggregate-mappings > Updated maven-hibernate-plugin... old code seem deprecated > -- > > Key: MNG-617 > URL: http://jira.codehaus.org/browse/MNG-617 > Project: Maven 2 > Type: Improvement > Components: maven-plugins > Versions: 2.0-alpha-3 > Reporter: Edwin Punzalan > Attachments: maven-hibernate-plugin.zip, maven-hibernate-plugin.zip, > maven-hibernate-plugin.zip > > > Updated the maven-hibernate-plugin schema-export mojo. > Original code seem to be deprecated. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-596) Add xml schema to m2 poms
[ http://jira.codehaus.org/browse/MNG-596?page=all ] fabrizio giustina updated MNG-596: -- Attachment: pom-xsd-rev220022.diff diff updated with revision 220022 This patch is really trivial, but since it affects so many files the diff gets easily outdated: if it's ok to commit it can anybody to that asap? Thanks > Add xml schema to m2 poms > - > > Key: MNG-596 > URL: http://jira.codehaus.org/browse/MNG-596 > Project: Maven 2 > Type: Improvement > Versions: 2.0-alpha-3 > Reporter: fabrizio giustina > Priority: Trivial > Fix For: 2.0-beta-1 > Attachments: pom-xsd-rev220022.diff, pom-xsd.diff > > > pom for maven2 don't contain any reference to the xsd at > http://maven.apache.org/maven-v4_0_0.xsd > Adding the xsd reference to poms will enforce validation in IDEs, and add > content assist in xsd-aware xml editors. > The attached patch will add the following declaration to the root > element for all the poms in > https://svn.apache.org/repos/asf/maven/components/trunk : > 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";> > (pom.xml files generated by the archetipe plugin will be affected as well) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MNG-545) M2 / xdoc / attribute of xhtml tags are filtered => so can't use all xhtml features.
[ http://jira.codehaus.org/browse/MNG-545?page=comments#action_43169 ] Antoine commented on MNG-545: - To help diagnostic : finding if it's a bug or just a wrong configuration of parser or so : The span tag keeps it's class attribute. tag doesn't keep the target, the alt, the title attributes ? why the p tag doesn't keep it's class attribute ? what happen to them in the parser ? special treatment ? > M2 / xdoc / attribute of xhtml tags are filtered => so can't use all xhtml > features. > > > Key: MNG-545 > URL: http://jira.codehaus.org/browse/MNG-545 > Project: Maven 2 > Type: Bug > Components: maven-reports > Environment: w2k > Reporter: Antoine > Fix For: 2.0-beta-2 > > > in xdocs > in a tag : the class and the id attributes are filtered. So can't use > special css styles. > in a tag : target and title attributes are filtered (but not the href > ). so can't use full features of (I did not try the img attribute, > etc) > => xhtml in xdocs should be rendered as much as it is written in the xdoc > file. > (other problem related : tag is transformed in "", so put a > double line in most browser... (a jira issue is yet open for M1). -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MNG-545) M2 / xdoc / attribute of xhtml tags are filtered => so can't use all xhtml features.
[ http://jira.codehaus.org/browse/MNG-545?page=comments#action_43168 ] Antoine commented on MNG-545: - In maven 1, I had used a bla bla to avoid the " problem". In M2, this work around can't do it any more as the class atribute is not kept in the XHTML produced. > M2 / xdoc / attribute of xhtml tags are filtered => so can't use all xhtml > features. > > > Key: MNG-545 > URL: http://jira.codehaus.org/browse/MNG-545 > Project: Maven 2 > Type: Bug > Components: maven-reports > Environment: w2k > Reporter: Antoine > Fix For: 2.0-beta-2 > > > in xdocs > in a tag : the class and the id attributes are filtered. So can't use > special css styles. > in a tag : target and title attributes are filtered (but not the href > ). so can't use full features of (I did not try the img attribute, > etc) > => xhtml in xdocs should be rendered as much as it is written in the xdoc > file. > (other problem related : tag is transformed in "", so put a > double line in most browser... (a jira issue is yet open for M1). -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-617) Updated maven-hibernate-plugin... old code seem deprecated
[ http://jira.codehaus.org/browse/MNG-617?page=all ] Edwin Punzalan updated MNG-617: --- Attachment: maven-hibernate-plugin.zip Changed @phase from "package" to "process-classes" New finished goal: schema-update Refactored several classes, too. > Updated maven-hibernate-plugin... old code seem deprecated > -- > > Key: MNG-617 > URL: http://jira.codehaus.org/browse/MNG-617 > Project: Maven 2 > Type: Improvement > Components: maven-plugins > Versions: 2.0-alpha-3 > Reporter: Edwin Punzalan > Attachments: maven-hibernate-plugin.zip, maven-hibernate-plugin.zip > > > Updated the maven-hibernate-plugin schema-export mojo. > Original code seem to be deprecated. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r220011 - in /maven/components/trunk/maven-reporting: ./ maven-reporting-api/src/main/java/org/apache/maven/reporting/ maven-reporting-impl/src/main/java/org/apache/maven/reporting/ maven-reporting-impl/src/main/java/org/apache/maven/report...
Author: brett Date: Thu Jul 21 00:05:34 2005 New Revision: 220011 URL: http://svn.apache.org/viewcvs?rev=220011&view=rev Log: set eol style Modified: maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java (contents, props changed) maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java (contents, props changed) maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java (contents, props changed) maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java (contents, props changed) maven/components/trunk/maven-reporting/pom.xml (contents, props changed) Modified: maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java?rev=220011&r1=220010&r2=220011&view=diff == --- maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java (original) +++ maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java Thu Jul 21 00:05:34 2005 @@ -1,54 +1,54 @@ -package org.apache.maven.reporting; - -/* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.doxia.sink.Sink; - -import java.io.File; -import java.util.Locale; - -/** - * The basis for a Maven report. - * - * @author Brett Porter - * @author Emmanuel Venisse - * @version $Id: MavenReport.java 163376 2005-02-23 00:06:06Z brett $ - */ -public interface MavenReport -{ -String ROLE = MavenReport.class.getName(); - -String CATEGORY_PROJECT_INFORMATION = "Project Info"; - -String CATEGORY_PROJECT_REPORTS = "Project Reports"; - -void generate( Sink sink, Locale locale ) -throws MavenReportException; - -String getOutputName(); - -String getName( Locale locale ); - -String getCategoryName(); - -String getDescription( Locale locale ); - -// TODO: remove? -void setReportOutputDirectory( File outputDirectory ); - -File getReportOutputDirectory(); -} +package org.apache.maven.reporting; + +/* + * Copyright 2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.codehaus.doxia.sink.Sink; + +import java.io.File; +import java.util.Locale; + +/** + * The basis for a Maven report. + * + * @author Brett Porter + * @author Emmanuel Venisse + * @version $Id: MavenReport.java 163376 2005-02-23 00:06:06Z brett $ + */ +public interface MavenReport +{ +String ROLE = MavenReport.class.getName(); + +String CATEGORY_PROJECT_INFORMATION = "Project Info"; + +String CATEGORY_PROJECT_REPORTS = "Project Reports"; + +void generate( Sink sink, Locale locale ) +throws MavenReportException; + +String getOutputName(); + +String getName( Locale locale ); + +String getCategoryName(); + +String getDescription( Locale locale ); + +// TODO: remove? +void setReportOutputDirectory( File outputDirectory ); + +File getReportOutputDirectory(); +} Propchange: maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java -- svn:eol-style = native Modified: maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java URL:
[jira] Commented: (MNG-530) Non-report mojos are added by DefaultPluginManager.getReports()
[ http://jira.codehaus.org/browse/MNG-530?page=comments#action_43165 ] Brett Porter commented on MNG-530: -- this is easily fixed now > Non-report mojos are added by DefaultPluginManager.getReports() > --- > > Key: MNG-530 > URL: http://jira.codehaus.org/browse/MNG-530 > Project: Maven 2 > Type: Bug > Components: maven-core > Versions: 2.0-alpha-3 > Reporter: Vincent Massol > Assignee: Brett Porter > Priority: Blocker > Fix For: 2.0-beta-1 > > > I have a plugin (clover) that have both "normal" mojos and report mojos. > getReports() adds all of them. There is a todo in the code to fix that too. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]