Skip to content

Commit f6a41b5

Browse files
[MSHARED-1367] Improvement in unit tests
- use Mockito instead of own mock classes
1 parent 5b99cd7 commit f6a41b5

File tree

5 files changed

+160
-430
lines changed

5 files changed

+160
-430
lines changed

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@
114114
<version>3.25.3</version>
115115
<scope>test</scope>
116116
</dependency>
117+
<dependency>
118+
<groupId>org.mockito</groupId>
119+
<artifactId>mockito-core</artifactId>
120+
<version>4.11.0</version>
121+
<scope>test</scope>
122+
</dependency>
117123
<dependency>
118124
<groupId>org.slf4j</groupId>
119125
<artifactId>slf4j-simple</artifactId>

src/main/java/org/apache/maven/archiver/MavenArchiver.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,7 @@ public void createArchive(
565565
File pomPropertiesFile = new File(dir, "pom.properties");
566566

567567
new PomPropertiesUtil()
568-
.createPomProperties(
569-
session, workingProject, archiver, customPomPropertiesFile, pomPropertiesFile, forced);
568+
.createPomProperties(workingProject, archiver, customPomPropertiesFile, pomPropertiesFile, forced);
570569
}
571570

572571
// ----------------------------------------------------------------------

src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ private void createPropertiesFile(Properties properties, File outputFile, boolea
103103
* @param forceCreation force creation true/false
104104
* @throws org.codehaus.plexus.archiver.ArchiverException archiver exception.
105105
* @throws java.io.IOException IO exception.
106+
* @deprecated please use {@link #createPomProperties(MavenProject, Archiver, File, File, boolean)}
106107
*/
108+
@Deprecated
107109
public void createPomProperties(
108110
MavenSession session,
109111
MavenProject project,
@@ -112,6 +114,27 @@ public void createPomProperties(
112114
File pomPropertiesFile,
113115
boolean forceCreation)
114116
throws IOException {
117+
createPomProperties(project, archiver, customPomPropertiesFile, pomPropertiesFile, forceCreation);
118+
}
119+
120+
/**
121+
* Creates the pom.properties file.
122+
*
123+
* @param project {@link org.apache.maven.project.MavenProject}
124+
* @param archiver {@link org.codehaus.plexus.archiver.Archiver}
125+
* @param customPomPropertiesFile optional custom pom properties file
126+
* @param pomPropertiesFile The pom properties file.
127+
* @param forceCreation force creation true/false
128+
* @throws org.codehaus.plexus.archiver.ArchiverException archiver exception.
129+
* @throws java.io.IOException IO exception.
130+
*/
131+
public void createPomProperties(
132+
MavenProject project,
133+
Archiver archiver,
134+
File customPomPropertiesFile,
135+
File pomPropertiesFile,
136+
boolean forceCreation)
137+
throws IOException {
115138
final String groupId = project.getGroupId();
116139
final String artifactId = project.getArtifactId();
117140
final String version = project.getVersion();

0 commit comments

Comments
 (0)