Skip to content

Commit 51d7279

Browse files
slachiewiczslachiewicz
committed
fix
1 parent 6b6425c commit 51d7279

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ under the License.
149149
<dependency>
150150
<groupId>org.apache.maven.plugin-tools</groupId>
151151
<artifactId>maven-plugin-annotations</artifactId>
152+
<version>3.15.1</version>
152153
<scope>provided</scope>
153154
</dependency>
154155

‎src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @author <a href="mailto:[email protected]">Allan Ramirez</a>
4141
*/
4242
public class DeployFileMojoTest extends AbstractMojoTestCase {
43-
private final String LOCAL_REPO = getBasedir() + "/target/local-repo";
43+
private final String localRepoTarget = getBasedir() + "/target/local-repo";
4444

4545
private List<String> expectedFiles;
4646

@@ -94,7 +94,7 @@ public void testBasicDeployFile() throws Exception {
9494
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
9595
repositorySession.setLocalRepositoryManager(
9696
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
97-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
97+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
9898
when(session.getRepositorySession()).thenReturn(repositorySession);
9999

100100
String groupId = (String) getVariableValueFromObject(mojo, "groupId");
@@ -199,7 +199,7 @@ public void testDeployIfClassifierIsSet() throws Exception {
199199
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
200200
repositorySession.setLocalRepositoryManager(
201201
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
202-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
202+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
203203
when(session.getRepositorySession()).thenReturn(repositorySession);
204204

205205
String classifier = (String) getVariableValueFromObject(mojo, "classifier");
@@ -250,7 +250,7 @@ public void testDeployIfArtifactIsNotJar() throws Exception {
250250
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
251251
repositorySession.setLocalRepositoryManager(
252252
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
253-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
253+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
254254
when(session.getRepositorySession()).thenReturn(repositorySession);
255255

256256
String groupId = (String) getVariableValueFromObject(mojo, "groupId");
@@ -287,7 +287,7 @@ public void testDeployFileIfPackagingIsSet() throws Exception {
287287
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
288288
repositorySession.setLocalRepositoryManager(
289289
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
290-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
290+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
291291
when(session.getRepositorySession()).thenReturn(repositorySession);
292292

293293
String packaging = (String) getVariableValueFromObject(mojo, "packaging");

‎src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoUnitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void tearDown() {
5858
static class MockDeployFileMojo extends DeployFileMojo {
5959
private Model model;
6060

61-
public MockDeployFileMojo(Model model) {
61+
MockDeployFileMojo(Model model) {
6262
this.model = model;
6363
}
6464

‎src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public class DeployMojoTest extends AbstractMojoTestCase {
5757

5858
private File localRepo;
5959

60-
private final String LOCAL_REPO = getBasedir() + "/target/local-repo";
60+
private final String localRepoTarget = getBasedir() + "/target/local-repo";
6161

62-
private final String REMOTE_REPO = getBasedir() + "/target/remote-repo";
62+
private final String remoteRepoTarget = getBasedir() + "/target/remote-repo";
6363

6464
DeployArtifactStub artifact;
6565

@@ -81,14 +81,14 @@ public void setUp() throws Exception {
8181
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
8282
repositorySession.setLocalRepositoryManager(
8383
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
84-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
84+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
8585
when(session.getRepositorySession()).thenReturn(repositorySession);
8686

87-
remoteRepo = new File(REMOTE_REPO);
87+
remoteRepo = new File(remoteRepoTarget);
8888

8989
remoteRepo.mkdirs();
9090

91-
localRepo = new File(LOCAL_REPO);
91+
localRepo = new File(localRepoTarget);
9292

9393
if (localRepo.exists()) {
9494
FileUtils.deleteDirectory(localRepo);
@@ -131,7 +131,7 @@ public void testBasicDeploy() throws Exception {
131131
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
132132
repositorySession.setLocalRepositoryManager(
133133
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
134-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
134+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
135135
when(session.getRepositorySession()).thenReturn(repositorySession);
136136

137137
File file = new File(
@@ -188,7 +188,7 @@ public void testBasicDeploy() throws Exception {
188188
expectedFiles.add("resolver-status.properties");
189189
expectedFiles.add("resolver-status.properties");
190190

191-
File localRepo = new File(LOCAL_REPO, "");
191+
File localRepo = new File(localRepoTarget, "");
192192

193193
File[] files = localRepo.listFiles();
194194

@@ -280,7 +280,7 @@ public void testSkippingDeploy() throws Exception {
280280

281281
mojo.execute();
282282

283-
File localRepo = new File(LOCAL_REPO, "");
283+
File localRepo = new File(localRepoTarget, "");
284284

285285
File[] files = localRepo.listFiles();
286286

@@ -305,7 +305,7 @@ public void testBasicDeployWithPackagingAsPom() throws Exception {
305305
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
306306
repositorySession.setLocalRepositoryManager(
307307
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
308-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
308+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
309309
when(session.getRepositorySession()).thenReturn(repositorySession);
310310

311311
File pomFile = new File(
@@ -378,7 +378,7 @@ public void testBasicDeployWithPackagingAsBom() throws Exception {
378378
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
379379
repositorySession.setLocalRepositoryManager(
380380
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
381-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
381+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
382382
when(session.getRepositorySession()).thenReturn(repositorySession);
383383

384384
File pomFile = new File(
@@ -519,7 +519,7 @@ public void testDeployWithAttachedArtifacts() throws Exception {
519519
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
520520
repositorySession.setLocalRepositoryManager(
521521
new SimpleLocalRepositoryManagerFactory(new DefaultLocalPathComposer())
522-
.newInstance(repositorySession, new LocalRepository(LOCAL_REPO)));
522+
.newInstance(repositorySession, new LocalRepository(localRepoTarget)));
523523
when(session.getRepositorySession()).thenReturn(repositorySession);
524524

525525
MavenProject project = (MavenProject) getVariableValueFromObject(mojo, "project");
@@ -628,7 +628,7 @@ public void testNonPomDeployWithAttachedArtifactsOnly() throws Exception {
628628
}
629629

630630
@Ignore("SCP is not part of Maven3 distribution. Aether handles transport extensions.")
631-
public void _testBasicDeployWithScpAsProtocol() throws Exception {
631+
public void testBasicDeployWithScpAsProtocol() throws Exception {
632632
String originalUserHome = System.getProperty("user.home");
633633

634634
// FIX THE DAMN user.home BEFORE YOU DELETE IT!!!

0 commit comments

Comments
 (0)