Skip to content

Commit

Permalink
Update dependencies (#184)
Browse files Browse the repository at this point in the history
Co-authored-by: Angelo Buono <angelo.buono@sonarsource.com>
  • Loading branch information
henryju and ADarko22 authored Sep 14, 2023
1 parent 35e9fac commit 672a13c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 54 deletions.
35 changes: 12 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

<properties>
<mojo.java.target>1.7</mojo.java.target>
<mavenVersion>3.5.2</mavenVersion>
<mavenVersion>3.9.4</mavenVersion>
<maven.compiler.release>8</maven.compiler.release>
<sonar.exclusions>src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java,target/generated-sources/**/*</sonar.exclusions>
<gitRepositoryName>sonar-scanner-maven</gitRepositoryName>
Expand Down Expand Up @@ -110,16 +110,10 @@
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
<version>1.4</version>
</dependency>
<!-- MSONAR-141 and MSONAR-171 -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.2.1</version>
<artifactId>plexus-sec-dispatcher</artifactId>
<version>2.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -156,32 +150,27 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<artifactId>mockito-core</artifactId>
<version>5.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.2.3</version>
<version>3.24.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.3.0</version>
<version>4.0.0-alpha-1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.25</version>
<!-- Needed for the maven-plugin-testing-harness -->
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -285,7 +274,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.4</version>
<version>0.8.10</version>
<executions>
<execution>
<id>pre-unit-test</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class SonarQubeMojo extends AbstractMojo {
@Component
private LifecycleExecutor lifecycleExecutor;

@Component(hint = "mng-4384")
@Component(role = SecDispatcher.class, hint = "default")
private SecDispatcher securityDispatcher;

@Component
Expand Down
24 changes: 0 additions & 24 deletions src/main/resources/META-INF/plexus/components.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyListOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
Expand Down Expand Up @@ -76,7 +75,7 @@ public void setUp()
when(session.getProjects()).thenReturn(Collections.singletonList(rootProject));

projectProperties = new HashMap<>();
when(mavenProjectConverter.configure(anyListOf(MavenProject.class), any(MavenProject.class), any(Properties.class))).thenReturn(projectProperties);
when(mavenProjectConverter.configure(anyList(), any(MavenProject.class), any(Properties.class))).thenReturn(projectProperties);

when(scanner.mask(anyString())).thenReturn(scanner);
when(scanner.unmask(anyString())).thenReturn(scanner);
Expand Down

0 comments on commit 672a13c

Please sign in to comment.