Author: tchemit Date: 2010-06-19 01:52:29 +0200 (Sat, 19 Jun 2010) New Revision: 720 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/720 Log: make goal works with maven 3 Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckCentralSafePlugin.java Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckCentralSafePlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CheckCentralSafePlugin.java 2010-06-18 22:30:12 UTC (rev 719) +++ trunk/src/main/java/org/nuiton/helper/plugin/CheckCentralSafePlugin.java 2010-06-18 23:52:29 UTC (rev 720) @@ -34,7 +34,6 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; -import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.artifact.repository.metadata.Metadata; @@ -69,14 +68,13 @@ * * @author tchemit <chemit@codelutin.com> * @goal check-central-safe - * @phase initialize + * @phase verify * @requiresProject true * @requiresOnline true * @requiresDependencyResolution runtime * @since 1.2.5 */ public class CheckCentralSafePlugin extends AbstractPlugin { -//} implements LogEnabled { /** * Project. @@ -166,7 +164,7 @@ * * @since 1.0.0 */ - protected List<ArtifactRepository> remoteRepositories; + protected List<ArtifactRepository> safeRepositories; /** * Extra Remote Repository urls to authorized separated by comma. @@ -184,7 +182,7 @@ * @readonly * @since 1.1.0 */ - protected Set artifacts; + protected Set<?> artifacts; @Override public boolean checkSkip() { @@ -229,43 +227,36 @@ setVerbose(true); } - remoteRepositories = new ArrayList<ArtifactRepository>(); + safeRepositories = new ArrayList<ArtifactRepository>(); ArtifactRepositoryLayout repositoryLayout = new DefaultRepositoryLayout(); - ArtifactRepositoryPolicy always = new ArtifactRepositoryPolicy( - true, - ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, - ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN); ArtifactRepository remoteRepo; - remoteRepo = artifactRepositoryFactory.createArtifactRepository( + remoteRepo = artifactRepositoryFactory.createDeploymentArtifactRepository( "central", "http://repo1.maven.org/maven2/", - repositoryLayout, - always, - always); + repositoryLayout, false); - log.info("Will use " + remoteRepo); - remoteRepositories.add(remoteRepo); + log.info("Will use Repository " + remoteRepo.getUrl()); + safeRepositories.add(remoteRepo); if (!StringUtils.isEmpty(extraRepositories)) { for (String url : extraRepositories.split(",")) { url = url.trim(); - remoteRepo = artifactRepositoryFactory.createArtifactRepository( + + remoteRepo = artifactRepositoryFactory.createDeploymentArtifactRepository( url, url, - repositoryLayout, - always, - always); + repositoryLayout, false); - log.info("Will use " + remoteRepo); - remoteRepositories.add(remoteRepo); + log.info("Will use Repository " + remoteRepo.getUrl()); + safeRepositories.add(remoteRepo); } } - for (Iterator<Artifact> iterator = artifacts.iterator(); iterator.hasNext();) { - Artifact artifact = iterator.next(); + for (Iterator<?> iterator = artifacts.iterator(); iterator.hasNext();) { + Artifact artifact = (Artifact) iterator.next(); if (project.getArtifactId().equals(artifact.getArtifactId()) && project.getGroupId().equals(artifact.getGroupId()) && @@ -318,16 +309,16 @@ Log log = getLog(); - for (ArtifactRepository repository : remoteRepositories) { + for (ArtifactRepository repository : safeRepositories) { Wagon wagon = getWagon(repository); try { if (verbose) { - log.info("Will use repository " + repository); + log.info("Will use repository " + repository.getUrl()); } - for (Iterator<Artifact> itr = artifacts.iterator(); itr.hasNext();) { - Artifact artifact = itr.next(); + for (Iterator<?> itr = artifacts.iterator(); itr.hasNext();) { + Artifact artifact = (Artifact) itr.next(); if (verbose) { log.info("check artifact : " + artifact); @@ -340,10 +331,10 @@ artifact.setResolved(true); itr.remove(); - log.info(artifact + " resolved by " + repository); + log.info(artifact + " resolved by " + repository.getUrl()); } else { if (log.isDebugEnabled()) { - log.debug("artifact was not resolved by " + repository); + log.debug("artifact was not resolved by " + repository.getUrl()); } } } @@ -380,36 +371,10 @@ this.runOnce = runOnce; } - protected Wagon getWagon(ArtifactRepository repo) throws WagonConfigurationException, UnsupportedProtocolException, AuthenticationException, ConnectionException { + protected boolean dependencyExistsInRepo(Wagon wagon, + ArtifactRepository repo, + Artifact artifact) { - Repository repository = new Repository(repo.getId(), repo.getUrl()); - Wagon wagon = wagonManager.getWagon(repository); - - wagon.setTimeout(1000); - - if (getLog().isDebugEnabled()) { - Debug debug = new Debug(); - - wagon.addSessionListener(debug); - wagon.addTransferListener(debug); - } - - // FIXME when upgrading to maven 3.x : this must be changed. - AuthenticationInfo auth = wagonManager.getAuthenticationInfo(repo.getId()); - - ProxyInfo proxyInfo = getProxyInfo(); - if (proxyInfo != null) { - wagon.connect(repository, auth, proxyInfo); - } else { - wagon.connect(repository, auth); - } - - return wagon; - } - - - public boolean dependencyExistsInRepo(Wagon wagon, ArtifactRepository repo, Artifact artifact) { - Log log = getLog(); try { @@ -437,6 +402,34 @@ } } + + protected Wagon getWagon(ArtifactRepository repo) throws WagonConfigurationException, UnsupportedProtocolException, AuthenticationException, ConnectionException { + + Repository repository = new Repository(repo.getId(), repo.getUrl()); + Wagon wagon = wagonManager.getWagon(repository); + + wagon.setTimeout(1000); + + if (getLog().isDebugEnabled()) { + Debug debug = new Debug(); + + wagon.addSessionListener(debug); + wagon.addTransferListener(debug); + } + + // FIXME when upgrading to maven 3.x : this must be changed. + AuthenticationInfo auth = wagonManager.getAuthenticationInfo(repo.getId()); + + ProxyInfo proxyInfo = getProxyInfo(); + if (proxyInfo != null) { + wagon.connect(repository, auth, proxyInfo); + } else { + wagon.connect(repository, auth); + } + + return wagon; + } + protected void disconnect(Wagon wagon) { try { wagon.disconnect(); @@ -473,7 +466,7 @@ // Try to resolve it if not already done if (artifact.getMetadataList() == null || artifact.getMetadataList().isEmpty()) { try { - resolver.resolve(artifact, remoteRepositories, localRepository); + resolver.resolve(artifact, safeRepositories, localRepository); } catch (ArtifactResolutionException e) { log.error("Artifact: " + artifact.getId() + " could not be resolved."); } catch (ArtifactNotFoundException e) {