You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/15 20:26:35 UTC
[maven-release] 01/01: [MRELEASE-1023] Minor code cleanups
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1023
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit a94c76f77ef8df1b82e9eef370412ce9b23083a0
Author: Davide Angelocola <da...@gmail.com>
AuthorDate: Sat Aug 18 23:33:23 2018 +0200
[MRELEASE-1023] Minor code cleanups
This closes #22
---
.../shared/release/transform/jdom/JDomPlugin.java | 2 +-
.../release/transform/jdom/JDomReportPlugin.java | 2 +-
.../release/transform/jdom/JDomReporting.java | 2 +-
.../shared/release/DefaultReleaseManagerTest.java | 1 -
.../phase/CheckDependencySnapshotsPhaseTest.java | 1 -
.../phase/GenerateReleasePomsPhaseTest.java | 3 +--
.../release/phase/RemoveReleasePomsPhaseTest.java | 5 ++---
.../maven/shared/release/util/ReleaseUtilTest.java | 25 ----------------------
8 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
index 65c8fdb..2955ddc 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
@@ -180,7 +180,7 @@ public class JDomPlugin extends Plugin implements MavenCoordinate
}
@Override
- public Map getExecutionsAsMap()
+ public Map<String, PluginExecution> getExecutionsAsMap()
{
throw new UnsupportedOperationException();
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
index 696a0f5..40a82b7 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
@@ -134,7 +134,7 @@ public class JDomReportPlugin
}
@Override
- public Map getReportSetsAsMap()
+ public Map<String, ReportSet> getReportSetsAsMap()
{
throw new UnsupportedOperationException();
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
index c7d723c..8896303 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
@@ -104,7 +104,7 @@ public class JDomReporting extends Reporting
}
@Override
- public Map getReportPluginsAsMap()
+ public Map<String, ReportPlugin> getReportPluginsAsMap()
{
throw new UnsupportedOperationException();
}
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
index 11fe6c6..ed68d2b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -563,7 +563,6 @@ public class DefaultReleaseManagerTest
}
// MRELEASE-758: release:perform no longer removes release.properties
- @SuppressWarnings( "unchecked" )
public void testPerformWithDefaultClean()
throws Exception
{
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
index 2b0dff2..3e80107 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.shared.release.phase;
*/
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.anyString;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
index 570f9f4..c150589 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
@@ -35,7 +35,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.Maven;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -198,7 +197,7 @@ public class GenerateReleasePomsPhaseTest
when( scmProviderMock.add( isA( ScmRepository.class ),
argThat( new IsScmFileSetEquals( fileSet ) ) ) ).thenReturn( new AddScmResult( "...",
- Collections.singletonList( new ScmFile( Maven.POMv4, ScmFileStatus.ADDED ) ) ) );
+ Collections.singletonList( new ScmFile( "pom.xml", ScmFileStatus.ADDED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
index 964a5cf..ce83960 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
@@ -35,7 +35,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.Maven;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -86,7 +85,7 @@ public class RemoveReleasePomsPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
when( scmProviderMock.remove( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
isA( String.class ) ) ).thenReturn( new RemoveScmResult( "...",
- Collections.singletonList( new ScmFile( Maven.POMv4,
+ Collections.singletonList( new ScmFile( "pom.xml",
ScmFileStatus.DELETED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
@@ -123,7 +122,7 @@ public class RemoveReleasePomsPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
when( scmProviderMock.remove( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
isA( String.class ) ) ).thenReturn( new RemoveScmResult( "...",
- Collections.singletonList( new ScmFile( Maven.POMv4,
+ Collections.singletonList( new ScmFile( "pom.xml",
ScmFileStatus.DELETED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
index d3377ae..7388987 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
@@ -24,11 +24,9 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
-import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.Os;
import org.junit.Test;
@@ -224,27 +222,4 @@ public class ReleaseUtilTest
}
- private static MavenProject createProject( String basedir )
- {
- return createProject( basedir, basedir );
- }
-
- private static MavenProject createProject( final String basedirPath, final String basedirCanonicalPath )
- {
- return new MavenProject()
- {
- @Override
- public File getBasedir()
- {
- return new File( basedirPath )
- {
- @Override
- public String getCanonicalPath()
- {
- return basedirCanonicalPath;
- }
- };
- }
- };
- }
}