Skip to content

[MSHARED-925] remove guava dependency #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elharo merged 1 commit into from
Jun 11, 2020
Merged

[MSHARED-925] remove guava dependency #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>r07</version>
<scope>test</scope>
</dependency>


<dependency>
<groupId>org.apache.maven.doxia</groupId>
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* under the License.
*/

import com.google.common.collect.Lists;
import org.apache.maven.DefaultMaven;
import org.apache.maven.Maven;
import org.apache.maven.RepositoryUtils;
Expand Down Expand Up @@ -55,6 +54,7 @@
import org.sonatype.aether.repository.WorkspaceRepository;

import java.io.File;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

Expand Down Expand Up @@ -156,7 +156,7 @@ private List<MavenReportExecution> buildReports( MavenProject mavenProject, Repo

MavenSession mavenSession = getMavenSession( getLocalArtifactRepository(), mavenProject );
mavenSession.setCurrentProject( mavenProject );
mavenSession.setProjects( Lists.<MavenProject>newArrayList( mavenProject ) );
mavenSession.setProjects( Arrays.asList( mavenProject ) );
mavenReportExecutorRequest.setMavenSession( mavenSession );

ReportPlugin reportPlugin = new ReportPlugin();
Expand All @@ -169,7 +169,7 @@ private List<MavenReportExecution> buildReports( MavenProject mavenProject, Repo
reportPlugin.getReportSets().add( reportSet );
}

List<ReportPlugin> reportPlugins = Lists.newArrayList( reportPlugin );
List<ReportPlugin> reportPlugins = Arrays.asList( reportPlugin );

mavenReportExecutorRequest.setReportPlugins( reportPlugins.toArray( new ReportPlugin[1] ) );

Expand Down Expand Up @@ -251,7 +251,7 @@ public Settings getSettings()
@Override
public List<MavenProject> getProjects()
{
return Lists.newArrayList( mavenProject );
return Arrays.asList( mavenProject );
}

@Override
Expand Down Expand Up @@ -342,13 +342,13 @@ public boolean isExecutionRoot()
@Override
public List<String> getCompileSourceRoots()
{
return Lists.newArrayList( "src/main/java" );
return Arrays.asList( "src/main/java" );
}

@Override
public List<String> getTestCompileSourceRoots()
{
return Lists.newArrayList( "src/test/java" );
return Arrays.asList( "src/test/java" );
}
};

Expand Down