1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
Description: Fixes the compatibility with the version of Aether used by Maven
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
@@ -40,8 +40,7 @@
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
import org.apache.maven.shared.repository.RepositoryManager;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
/**
* @author brianf
@@ -85,7 +84,8 @@
buildingRequest = session.getProjectBuildingRequest();
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
}
--- a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
@@ -27,8 +27,7 @@
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
public class TestGetMojo
extends AbstractDependencyMojoTestCase
@@ -51,7 +50,8 @@
legacySupport.setSession( newMavenSession( new MavenProjectStub() ) );
DefaultRepositorySystemSession repoSession =
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( testDir.getAbsolutePath() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
}
@@ -92,8 +92,11 @@
mojo.setGroupId( "org.apache.maven" );
mojo.setArtifactId( "maven-model" );
mojo.setVersion( "2.0.9" );
-
+try {
mojo.execute();
+} catch (Exception e) {
+ e.printStackTrace();
+}
}
/**
--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
@@ -33,8 +33,7 @@
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
public class TestCopyMojo
extends AbstractDependencyMojoTestCase
@@ -66,7 +65,8 @@
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
}
public ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
@@ -30,8 +30,7 @@
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
public class TestIncludeExcludeUnpackMojo
extends AbstractDependencyMojoTestCase
@@ -79,7 +78,8 @@
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
}
protected void tearDown()
--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
@@ -36,8 +36,7 @@
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
public class TestUnpackMojo
extends AbstractDependencyMojoTestCase
@@ -79,7 +78,8 @@
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
}
public ArtifactItem getSingleArtifactItem( boolean removeVersion )
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestBuildClasspathMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestBuildClasspathMojo.java
@@ -27,8 +27,7 @@
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
public class TestBuildClasspathMojo
extends AbstractDependencyMojoTestCase
@@ -125,7 +124,8 @@
setVariableValueToObject( mojo, "session", session );
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
Artifact artifact = stubFactory.getReleaseArtifact();
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
@@ -35,8 +35,7 @@
import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
public class TestCopyDependenciesMojo
extends AbstractDependencyMojoTestCase
@@ -64,7 +63,8 @@
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
@@ -45,8 +45,7 @@
import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
public class TestCopyDependenciesMojo2
extends AbstractDependencyMojoTestCase
@@ -84,7 +83,8 @@
legacySupport.setSession( session );
DefaultRepositorySystemSession repoSession =
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
}
public void assertNoMarkerFile( Artifact artifact )
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
@@ -38,8 +38,7 @@
import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
public class TestUnpackDependenciesMojo
extends AbstractDependencyMojoTestCase
@@ -77,7 +76,8 @@
setVariableValueToObject( mojo, "session", session );
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ org.eclipse.aether.repository.LocalRepository localRepository = new org.eclipse.aether.repository.LocalRepository( stubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepository ) );
Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
|
