Skip to content

Commit

Permalink
Merge pull request #2 from alecharp/hotfix/JENKINS-23502
Browse files Browse the repository at this point in the history 
[JENKINS-23502] Remove reference to org.sonatype.aether groupId
  • Loading branch information
@olamy
olamy committed Nov 11, 2014
2 parents a820f88 + 0d994f6 commit c18c4b2
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 25 deletions.
17 changes: 9 additions & 8 deletions pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.424.1</version>
<version>1.554.1</version>
</parent>

<artifactId>maven-dependency-update-trigger</artifactId>
Expand All @@ -14,9 +14,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mavenVersion>3.0.3</mavenVersion>
<mavenVersion>3.1.0</mavenVersion>
<wagonVersion>2.2</wagonVersion>
<aetherVersion>1.13.1</aetherVersion>
<aetherVersion>0.9.0.M2</aetherVersion>
<sisuInjectVersion>2.3.0</sisuInjectVersion>
</properties>

Expand Down Expand Up @@ -109,28 +109,28 @@
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aetherVersion}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${aetherVersion}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-spi</artifactId>
<version>${aetherVersion}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<version>${aetherVersion}</version>
<scope>provided</scope>
Expand All @@ -143,7 +143,7 @@
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${aetherVersion}</version>
<scope>provided</scope>
Expand Down Expand Up @@ -237,6 +237,7 @@
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
<version>2.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/jvnet/hudson/plugins/mavendepsupdate/MavenDependencyUpdateTrigger.java
View file
Expand Up @@ -42,6 +42,7 @@
import hudson.triggers.Trigger;
import hudson.triggers.TriggerDescriptor;
import hudson.util.FormValidation;
import jenkins.model.Jenkins;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.ParseException;
import org.apache.commons.lang.SystemUtils;
Expand Down Expand Up @@ -629,8 +630,9 @@ private Maven.MavenInstallation getMavenInstallation()
return ( (Maven) b ).getMaven();
}
}
Maven.DescriptorImpl descriptorByType = Jenkins.getInstance().getDescriptorByType(Maven.DescriptorImpl.class);
// null so return first found
for ( Maven.MavenInstallation i : MavenModuleSet.DESCRIPTOR.getMavenDescriptor().getInstallations() )
for ( Maven.MavenInstallation i : descriptorByType.getInstallations() )
{
return i;
}
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/org/jvnet/hudson/plugins/mavendepsupdate/MavenUpdateChecker.java
View file
Expand Up @@ -44,7 +44,6 @@
import org.apache.maven.project.ProjectDependenciesResolver;
import org.apache.maven.project.ProjectSorter;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
import org.apache.maven.settings.building.SettingsBuilder;
import org.apache.maven.settings.building.SettingsBuildingException;
Expand All @@ -57,12 +56,14 @@
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystemSession;
import org.jvnet.hudson.plugins.mavendepsupdate.util.Maven3Utils;
import org.jvnet.hudson.plugins.mavendepsupdate.util.ReactorReader;
import org.jvnet.hudson.plugins.mavendepsupdate.util.SnapshotTransfertListener;
import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.repository.RepositoryPolicy;
import org.sonatype.aether.repository.WorkspaceReader;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.RepositoryPolicy;
import org.eclipse.aether.repository.WorkspaceReader;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -197,8 +198,8 @@ public MavenUpdateCheckerResult call()
final Map<String, MavenProject> projectMap = getProjectMap( mavenProjects );
WorkspaceReader reactorRepository = new ReactorReader( projectMap );

MavenRepositorySystemSession mavenRepositorySystemSession =
(MavenRepositorySystemSession) projectBuildingRequest.getRepositorySession();
DefaultRepositorySystemSession mavenRepositorySystemSession =
(DefaultRepositorySystemSession) projectBuildingRequest.getRepositorySession();

mavenRepositorySystemSession.setUpdatePolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );

Expand Down Expand Up @@ -314,8 +315,8 @@ ProjectBuildingRequest getProjectBuildingRequest( Properties userProperties, Ple

RepositorySystem repositorySystem = plexusContainer.lookup( RepositorySystem.class );

org.sonatype.aether.RepositorySystem repoSystem =
plexusContainer.lookup( org.sonatype.aether.RepositorySystem.class );
org.eclipse.aether.RepositorySystem repoSystem =
plexusContainer.lookup( org.eclipse.aether.RepositorySystem.class );

SettingsBuildingRequest settingsRequest = new DefaultSettingsBuildingRequest();

Expand Down Expand Up @@ -356,7 +357,7 @@ ProjectBuildingRequest getProjectBuildingRequest( Properties userProperties, Ple

executionRequestPopulator.populateDefaults( request );

MavenRepositorySystemSession session = new MavenRepositorySystemSession();
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession();

session.setUpdatePolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );

Expand All @@ -373,7 +374,7 @@ ProjectBuildingRequest getProjectBuildingRequest( Properties userProperties, Ple
localRepo = new LocalRepository( localRepoPath );
}

session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( localRepo ) );
session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager(session, localRepo ) );

ArtifactRepository localArtifactRepository = null;
if ( StringUtils.isEmpty( localRepoPath ) )
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jvnet/hudson/plugins/mavendepsupdate/util/ReactorReader.java
View file
Expand Up @@ -20,9 +20,9 @@

import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.project.MavenProject;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.repository.WorkspaceReader;
import org.sonatype.aether.repository.WorkspaceRepository;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.repository.WorkspaceRepository;

import java.io.File;
import java.util.ArrayList;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jvnet/hudson/plugins/mavendepsupdate/util/SnapshotTransfertListener.java
View file
Expand Up @@ -21,9 +21,9 @@

import org.apache.commons.lang.StringUtils;
import org.jvnet.hudson.plugins.mavendepsupdate.MavenDependencyUpdateTrigger;
import org.sonatype.aether.transfer.TransferCancelledException;
import org.sonatype.aether.transfer.TransferEvent;
import org.sonatype.aether.transfer.TransferListener;
import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;
import org.eclipse.aether.transfer.TransferListener;

import java.io.File;
import java.io.Serializable;
Expand Down

0 comments on commit c18c4b2

Please sign in to comment.