diff --git a/maven-artifact-ant/pom.xml b/maven-artifact-ant/pom.xml index ed38175263..46ee0d078e 100755 --- a/maven-artifact-ant/pom.xml +++ b/maven-artifact-ant/pom.xml @@ -1,5 +1,5 @@ + 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 @@ -38,6 +38,12 @@ org.apache.maven maven-project 2.0-beta-1-SNAPSHOT + + + junit + junit + + plexus @@ -61,18 +67,6 @@ 1.0-alpha-4 runtime - - org.apache.maven.wagon - wagon-ssh - 1.0-alpha-4 - runtime - - - org.apache.maven.wagon - wagon-scm - 1.0-alpha-4 - - diff --git a/maven-artifact-ant/sample.build.xml b/maven-artifact-ant/sample.build.xml index 2291adf383..cd80edba67 100644 --- a/maven-artifact-ant/sample.build.xml +++ b/maven-artifact-ant/sample.build.xml @@ -56,6 +56,10 @@ + + + + @@ -77,10 +81,12 @@ - + + + diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java index e1b09d2310..63130b60b8 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java @@ -25,7 +25,6 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.model.Model; -import org.apache.maven.profiles.activation.ProfileActivationUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.settings.Mirror; @@ -138,8 +137,9 @@ public abstract class AbstractArtifactTask return artifactRepository; } - private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( - RepositoryPolicy policy, String defaultUpdatePolicy, String defaultChecksumPolicy ) + private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy, + String defaultUpdatePolicy, + String defaultChecksumPolicy ) { boolean enabled = true; String updatePolicy = defaultUpdatePolicy; @@ -225,11 +225,11 @@ public abstract class AbstractArtifactTask if ( pomRepository.getSnapshots() != null ) { - r.setSnapshots( convertRepositoryPolicy( pomRepository.getSnapshots() ) ); + r.addSnapshots( convertRepositoryPolicy( pomRepository.getSnapshots() ) ); } if ( pomRepository.getReleases() != null ) { - r.setReleases( convertRepositoryPolicy( pomRepository.getReleases() ) ); + r.addReleases( convertRepositoryPolicy( pomRepository.getReleases() ) ); } return r; @@ -289,7 +289,15 @@ public abstract class AbstractArtifactTask } } - private synchronized Embedder getEmbedder() + protected static RemoteRepository getDefaultRemoteRepository() + { + // TODO: could we utilise the super POM for this? + RemoteRepository remoteRepository = new RemoteRepository(); + remoteRepository.setUrl( "http://repo1.maven.org/maven2" ); + return remoteRepository; + } + + protected synchronized Embedder getEmbedder() { if ( embedder == null ) { @@ -394,7 +402,7 @@ public abstract class AbstractArtifactTask if ( profiles != null ) { // TODO: not sure this is the best way to do this... - System.setProperty( ProfileActivationUtils.ACTIVE_PROFILE_IDS, profiles ); +// System.setProperty( ProfileActivationUtils.ACTIVE_PROFILE_IDS, profiles ); } } diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/CustomWagonManager.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/CustomWagonManager.java index f29c87a0e2..a127d1a1ab 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/CustomWagonManager.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/CustomWagonManager.java @@ -17,19 +17,17 @@ package org.apache.maven.artifact.ant; */ import org.apache.maven.artifact.manager.DefaultWagonManager; -import org.apache.maven.wagon.Wagon; import org.apache.maven.wagon.UnsupportedProtocolException; -import org.apache.maven.wagon.providers.scm.ScmWagon; +import org.apache.maven.wagon.Wagon; import java.io.File; /** * Custom wagon manager for the ant tasks - used to set the SCM checkout directory to the local repository. * - * @todo find a better way and share with m2 - * * @author Brett Porter * @version $Id$ + * @todo find a better way and share with m2 */ public class CustomWagonManager extends DefaultWagonManager @@ -43,7 +41,8 @@ public class CustomWagonManager if ( protocol.equals( "scm" ) ) { - ((ScmWagon)wagon).setCheckoutDirectory( localRepository ); + // TODO +// ((ScmWagon)wagon).setCheckoutDirectory( localRepository ); } return wagon; diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java index 3f2c336203..7b502e7844 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java @@ -124,7 +124,12 @@ public class DependenciesTask listeners = Collections.singletonList( new AntResolutionListener( getProject() ) ); } - List remoteArtifactRepositories = createRemoteArtifactRepositories( getRemoteRepositories() ); + List remoteRepositories = getRemoteRepositories(); + + RemoteRepository remoteRepository = getDefaultRemoteRepository(); + remoteRepositories.add( remoteRepository ); + + List remoteArtifactRepositories = createRemoteArtifactRepositories( remoteRepositories ); // TODO: managed dependencies result = resolver.resolveTransitively( artifacts, pomArtifact, remoteArtifactRepositories, localRepo, metadataSource, listeners ); @@ -188,13 +193,6 @@ public class DependenciesTask public List getRemoteRepositories() { - if ( remoteRepositories.isEmpty() ) - { - // TODO: could we utilise the super POM for this? - RemoteRepository remoteRepository = new RemoteRepository(); - remoteRepository.setUrl( "http://repo1.maven.org/maven2" ); - remoteRepositories.add( remoteRepository ); - } return remoteRepositories; } diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java index 8a42ac9ade..f22e11431e 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java @@ -73,17 +73,16 @@ public class DeployTask } } - ArtifactRepository deploymentRepository = createRemoteArtifactRepository( remoteRepository ); - - ArtifactRepository snapshotRepository = null; - if ( remoteSnapshotRepository != null ) - { - snapshotRepository = createRemoteArtifactRepository( remoteSnapshotRepository ); - } - // Deploy the POM Artifact artifact = createArtifact( pom ); + ArtifactRepository deploymentRepository = createRemoteArtifactRepository( remoteRepository ); + + if ( remoteSnapshotRepository != null && artifact.isSnapshot() ) + { + deploymentRepository = createRemoteArtifactRepository( remoteSnapshotRepository ); + } + boolean isPomArtifact = "pom".equals( pom.getPackaging() ); if ( !isPomArtifact ) { @@ -91,7 +90,7 @@ public class DeployTask artifact.addMetadata( metadata ); } - log( "Deploying to " + remoteRepository.getUrl() ); + log( "Deploying to " + deploymentRepository.getUrl() ); ArtifactDeployer deployer = (ArtifactDeployer) lookup( ArtifactDeployer.ROLE ); try { diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java new file mode 100644 index 0000000000..f0166b7877 --- /dev/null +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java @@ -0,0 +1,110 @@ +package org.apache.maven.artifact.ant; + +/* + * Copyright 2001-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.artifact.Artifact; +import org.apache.maven.artifact.factory.ArtifactFactory; +import org.apache.maven.artifact.metadata.ArtifactMetadataSource; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.ArtifactResolutionResult; +import org.apache.maven.artifact.resolver.ArtifactResolver; +import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; +import org.apache.maven.artifact.versioning.VersionRange; +import org.apache.maven.project.artifact.MavenMetadataSource; +import org.apache.tools.ant.BuildException; +import org.codehaus.plexus.PlexusContainerException; + +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +/** + * Ant Wrapper for wagon provider installation. + * + * @author Brett Porter + * @version $Id$ + */ +public class InstallWagonProviderTask + extends AbstractArtifactTask +{ + private String artifactId; + + private String version; + + public String getArtifactId() + { + return artifactId; + } + + public void setArtifactId( String artifactId ) + { + this.artifactId = artifactId; + } + + public String getVersion() + { + return version; + } + + public void setVersion( String version ) + { + this.version = version; + } + + public void execute() + throws BuildException + { + MavenMetadataSource metadataSource = (MavenMetadataSource) lookup( ArtifactMetadataSource.ROLE ); + + ArtifactResolver resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE ); + ArtifactRepository artifactRepository = createRemoteArtifactRepository( getDefaultRemoteRepository() ); + List remoteRepositories = Collections.singletonList( artifactRepository ); + try + { + ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE ); + VersionRange versionRange = VersionRange.createFromVersionSpec( version ); + Artifact providerArtifact = factory.createExtensionArtifact( "org.apache.maven.wagon", artifactId, + versionRange ); + ArtifactResolutionResult result = resolver.resolveTransitively( Collections.singleton( providerArtifact ), + createArtifact( createDummyPom() ), + createLocalArtifactRepository(), + remoteRepositories, metadataSource, null ); + + log( "Installing provider: " + providerArtifact ); + + for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); ) + { + Artifact a = (Artifact) i.next(); + getEmbedder().getContainer().addJarResource( a.getFile() ); + } + } + catch ( ArtifactResolutionException e ) + { + throw new BuildException( "Unable to locate wagon provider in remote repository", e ); + } + catch ( PlexusContainerException e ) + { + throw new BuildException( "Unable to locate wagon provider in remote repository", e ); + } + catch ( InvalidVersionSpecificationException e ) + { + throw new BuildException( "Unable to locate wagon provider in remote repository", e ); + } + + } +} diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java index 793f3a2527..7c43fd2d54 100755 --- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java +++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java @@ -29,12 +29,16 @@ public class RemoteRepository private Authentication authentication; - /** @deprecated use <snapshots/> and <updatePolicy> instead. */ + /** + * @deprecated use <snapshots/> and <updatePolicy> instead. + */ private String snapshotPolicy; - - /** @deprecated use <snapshots/> and <checksumPolicy> instead. */ + + /** + * @deprecated use <snapshots/> and <checksumPolicy> instead. + */ private String checksumPolicy; - + private Proxy proxy; private RepositoryPolicy snapshots; @@ -96,7 +100,7 @@ public class RemoteRepository return snapshots; } - public void setSnapshots( RepositoryPolicy snapshots ) + public void addSnapshots( RepositoryPolicy snapshots ) { this.snapshots = snapshots; } @@ -106,8 +110,9 @@ public class RemoteRepository return releases; } - public void setReleases( RepositoryPolicy releases ) + public void addReleases( RepositoryPolicy releases ) { this.releases = releases; } + } diff --git a/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml b/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml index 6a3b6d5bca..16a693b5c5 100644 --- a/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml +++ b/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml @@ -1,92 +1,5 @@ - - - - - org.apache.maven.artifact.manager.WagonManager - org.apache.maven.artifact.ant.CustomWagonManager - - - - - org.apache.maven.artifact.transform.ArtifactTransformation - org.apache.maven.artifact.transform.SnapshotTransformation - - - org.apache.maven.artifact.manager.WagonManager - - - - - - - org.apache.maven.artifact.resolver.ArtifactResolver - org.apache.maven.artifact.resolver.DefaultArtifactResolver - - - org.apache.maven.artifact.manager.WagonManager - - - org.apache.maven.artifact.transform.ArtifactTransformation - artifactTransformations - - - org.apache.maven.artifact.factory.ArtifactFactory - - - org.apache.maven.artifact.resolver.ArtifactCollector - - - - - - - org.apache.maven.artifact.installer.ArtifactInstaller - org.apache.maven.artifact.installer.DefaultArtifactInstaller - - - org.apache.maven.artifact.transform.ArtifactTransformation - artifactTransformations - - - - - - - org.apache.maven.artifact.deployer.ArtifactDeployer - org.apache.maven.artifact.deployer.DefaultArtifactDeployer - - - org.apache.maven.artifact.manager.WagonManager - - - org.apache.maven.artifact.transform.ArtifactTransformation - artifactTransformations - - - - org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout default @@ -99,7 +12,7 @@ org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout - + + org.apache.maven.artifact.manager.WagonManager + org.apache.maven.artifact.ant.CustomWagonManager + + + + + + org.apache.maven.artifact.transform.ArtifactTransformation + snapshot + org.apache.maven.artifact.transform.SnapshotTransformation + + + org.apache.maven.artifact.manager.WagonManager + + + + + + org.apache.maven.artifact.transform.ArtifactTransformation + release + org.apache.maven.artifact.transform.ReleaseArtifactTransformation + + + org.apache.maven.artifact.manager.WagonManager + + + + + + org.apache.maven.artifact.transform.ArtifactTransformation + latest + org.apache.maven.artifact.transform.LatestArtifactTransformation + + + org.apache.maven.artifact.manager.WagonManager + + + + + + + org.apache.maven.artifact.transform.ArtifactTransformationManager + org.apache.maven.artifact.transform.DefaultArtifactTransformationManager + + + org.apache.maven.artifact.transform.ArtifactTransformation + artifactTransformations + + + org.apache.maven.artifact.transform.ArtifactTransformation + snapshot + snapshotTransformation + + + + + + + org.apache.maven.artifact.resolver.ArtifactResolver + org.apache.maven.artifact.resolver.DefaultArtifactResolver + + + org.apache.maven.artifact.manager.WagonManager + + + org.apache.maven.artifact.transform.ArtifactTransformationManager + + + org.apache.maven.artifact.factory.ArtifactFactory + + + org.apache.maven.artifact.resolver.ArtifactCollector + + + + + + + org.apache.maven.artifact.installer.ArtifactInstaller + org.apache.maven.artifact.installer.DefaultArtifactInstaller + + + org.apache.maven.artifact.transform.ArtifactTransformationManager + + + + + + + org.apache.maven.artifact.deployer.ArtifactDeployer + org.apache.maven.artifact.deployer.DefaultArtifactDeployer + + + org.apache.maven.artifact.manager.WagonManager + + + org.apache.maven.artifact.transform.ArtifactTransformationManager + + + + + + org.apache.maven.artifact.repository.ArtifactRepositoryFactory + org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory + + + + + org.apache.maven.profiles.MavenProfilesBuilder + org.apache.maven.profiles.DefaultMavenProfilesBuilder + + + + + org.apache.maven.project.MavenProjectHelper + org.apache.maven.project.DefaultMavenProjectHelper + + + org.apache.maven.artifact.factory.ArtifactFactory + + + + org.apache.maven.project.interpolation.ModelInterpolator org.apache.maven.project.interpolation.RegexBasedModelInterpolator - + org.apache.maven.project.injection.ModelDefaultsInjector org.apache.maven.project.injection.DefaultModelDefaultsInjector - + + + org.apache.maven.project.injection.ProfileInjector + org.apache.maven.project.injection.DefaultProfileInjector + + org.apache.maven.project.MavenProjectBuilder org.apache.maven.project.DefaultMavenProjectBuilder + + org.apache.maven.artifact.transform.ArtifactTransformationManager + + + org.apache.maven.profiles.MavenProfilesBuilder + + + org.apache.maven.project.injection.ProfileInjector + org.apache.maven.project.injection.ModelDefaultsInjector @@ -249,108 +355,98 @@ org.apache.maven.artifact.repository.ArtifactRepositoryFactory - - org.apache.maven.profiles.activation.ProfileActivationCalculator - - - - org.apache.maven.profiles.activation.ProfileActivationCalculator - org.apache.maven.profiles.activation.ProfileActivationCalculator - - + org.apache.maven.profiles.activation.ProfileActivator always-on org.apache.maven.profiles.activation.AlwaysOnProfileActivator - + org.apache.maven.profiles.activation.ProfileActivator jdk-prefix org.apache.maven.profiles.activation.JdkPrefixProfileActivator - + org.apache.maven.profiles.activation.ProfileActivator system-property org.apache.maven.profiles.activation.SystemPropertyProfileActivator - - - org.apache.maven.profiles.activation.ProfileActivator - explicit-listing - org.apache.maven.profiles.activation.ExplicitListingProfileActivator - - + org.apache.maven.project.inheritance.ModelInheritanceAssembler org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler - + + org.apache.maven.project.validation.ModelValidator org.apache.maven.project.validation.DefaultModelValidator - - - org.apache.maven.artifact.factory.ArtifactFactory - org.apache.maven.artifact.factory.DefaultArtifactFactory - - - org.apache.maven.artifact.handler.manager.ArtifactHandlerManager - - - + org.apache.maven.project.path.PathTranslator org.apache.maven.project.path.DefaultPathTranslator - org.apache.maven.artifact.repository.ArtifactRepositoryFactory - org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory + org.apache.maven.project.ModelResolver + default + org.apache.maven.project.ModelResolver + + + org.apache.maven.artifact.resolver.ArtifactResolver + + - org.apache.maven.wagon.Wagon - http - org.apache.maven.wagon.providers.http.LightweightHttpWagon - per-lookup + org.apache.maven.artifact.metadata.ArtifactMetadataSource + maven + org.apache.maven.project.artifact.MavenMetadataSource + + + org.apache.maven.project.MavenProjectBuilder + + + org.apache.maven.artifact.factory.ArtifactFactory + + + + + + org.apache.maven.settings.MavenSettingsBuilder + org.apache.maven.settings.DefaultMavenSettingsBuilder + + ${maven.home}/conf/settings.xml + ${user.home}/.m2/settings.xml + @@ -362,156 +458,9 @@ org.apache.maven.wagon.Wagon - scm - org.apache.maven.wagon.providers.scm.ScmWagon + http + org.apache.maven.wagon.providers.http.LightweightHttpWagon per-lookup - - - org.apache.maven.scm.manager.ScmManager - - - - - org.apache.maven.wagon.Wagon - scp - org.apache.maven.wagon.providers.ssh.ScpWagon - per-lookup - - - org.apache.maven.wagon.Wagon - sftp - org.apache.maven.wagon.providers.ssh.SftpWagon - per-lookup - - - org.apache.maven.wagon.providers.ssh.SshCommandExecutor - org.apache.maven.wagon.providers.ssh.ScpWagon - per-lookup - - - - org.apache.maven.scm.manager.ScmManager - org.apache.maven.scm.manager.DefaultScmManager - - - org.apache.maven.scm.provider.ScmProvider - scmProviders - - - - - - org.apache.maven.scm.provider.ScmProvider - cvs - org.apache.maven.scm.provider.cvslib.CvsScmProvider - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - commands - - - - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - add - org.apache.maven.scm.provider.cvslib.command.add.CvsAddCommand - - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - change-log - org.apache.maven.scm.provider.cvslib.command.changelog.CvsChangeLogCommand - - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - check-in - org.apache.maven.scm.provider.cvslib.command.checkin.CvsCheckInCommand - - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - check-out - org.apache.maven.scm.provider.cvslib.command.checkout.CvsCheckOutCommand - - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - diff - org.apache.maven.scm.provider.cvslib.command.diff.CvsDiffCommand - - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - status - org.apache.maven.scm.provider.cvslib.command.status.CvsStatusCommand - - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - tag - org.apache.maven.scm.provider.cvslib.command.tag.CvsTagCommand - - - - org.apache.maven.scm.provider.cvslib.command.CvsCommand - update - org.apache.maven.scm.provider.cvslib.command.update.CvsUpdateCommand - - - - org.apache.maven.scm.provider.ScmProvider - svn - org.apache.maven.scm.provider.svn.SvnScmProvider - - - org.apache.maven.scm.provider.svn.command.SvnCommand - commands - - - - - - org.apache.maven.scm.provider.svn.command.SvnCommand - add - org.apache.maven.scm.provider.svn.command.add.SvnAddCommand - - - - org.apache.maven.scm.provider.svn.command.SvnCommand - check-in - org.apache.maven.scm.provider.svn.command.checkin.SvnCheckInCommand - - - - org.apache.maven.scm.provider.svn.command.SvnCommand - check-out - org.apache.maven.scm.provider.svn.command.checkout.SvnCheckOutCommand - - - - org.apache.maven.scm.provider.svn.command.SvnCommand - diff - org.apache.maven.scm.provider.svn.command.diff.SvnDiffCommand - - - - org.apache.maven.scm.provider.svn.command.SvnCommand - status - org.apache.maven.scm.provider.svn.command.status.SvnStatusCommand - - - - org.apache.maven.scm.provider.svn.command.SvnCommand - tag - org.apache.maven.scm.provider.svn.command.tag.SvnTagCommand - - - - org.apache.maven.scm.provider.svn.command.SvnCommand - update - org.apache.maven.scm.provider.svn.command.update.SvnUpdateCommand diff --git a/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml b/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml index 98fdf1990e..50b31d3cd7 100755 --- a/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml +++ b/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml @@ -4,6 +4,7 @@ +