Bump mockito-core from 1.9.0 to 3.11.2 (#27)

* Bump mockito-core from 1.9.0 to 3.11.2 Bumps [mockito-core](https://github.com/mockito/mockito) from 1.9.0 to 3.11.2. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v1.9.0...v3.11.2) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix mockito upgrade Signed-off-by: Olivier Lamy <olamy@apache.org> * force clean Signed-off-by: Olivier Lamy <olamy@apache.org> * force local repo path Signed-off-by: Olivier Lamy <olamy@apache.org> * there is absolutely no need to run invoker plugin for something else than the maven plugin module Signed-off-by: Olivier Lamy <olamy@apache.org> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Olivier Lamy <olamy@apache.org>
mojohaus · Aug 18, 2021 · 36a5a99 · 36a5a99
1 parent fe19cf7
commit 36a5a99
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 73 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -51,4 +51,4 @@ jobs:
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven
-        run: mvn verify -e -B -V -P run-its
+        run: mvn clean verify -e -B -V -P run-its
diff --git a/mrm-maven-plugin/pom.xml b/mrm-maven-plugin/pom.xml
@@ -140,4 +140,36 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <!-- run integration tests
+          to use this profile:
+          or run integration tests: mvn -Prun-its
+      -->
+      <id>run-its</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>install</goal>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <streamLogs>true</streamLogs>
+                  <debug>false</debug>
+                  <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/mrm-maven-plugin/src/it/hostedrepo/pom.xml b/mrm-maven-plugin/src/it/hostedrepo/pom.xml
@@ -23,7 +23,7 @@
           </execution>
         </executions>
         <configuration>
-          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <localRepositoryPath>${project.build.directory}/local-repo-it</localRepositoryPath>
           <projectsDirectory>src/it</projectsDirectory>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <settingsFile>src/it/settings.xml</settingsFile>

diff --git a/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStore.java b/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStore.java
@@ -318,7 +318,7 @@ public InputStream get( Artifact artifact )
         try
         {
             artifactResolver.resolve( mavenArtifact, remoteRepositories, localRepository );
-            final File file = mavenArtifact.getFile();
+            File file = mavenArtifact.getFile();
             if ( file != null && file.isFile() )
             {
                 addResolved( artifact );
@@ -328,8 +328,7 @@ public InputStream get( Artifact artifact )
         }
         catch ( org.apache.maven.artifact.resolver.ArtifactNotFoundException e )
         {
-            ArtifactNotFoundException anfe = new ArtifactNotFoundException( artifact, e );
-            throw anfe;
+            throw new ArtifactNotFoundException( artifact, e );
         }
         catch ( ArtifactResolutionException e )
         {

diff --git a/mrm-maven-plugin/src/test/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStoreTest.java b/mrm-maven-plugin/src/test/java/org/codehaus/mojo/mrm/maven/ProxyArtifactStoreTest.java
@@ -19,13 +19,16 @@
  * under the License.
  */
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.List;
 
 import org.apache.maven.archetype.ArchetypeManager;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -34,59 +37,59 @@
 import org.codehaus.mojo.mrm.api.maven.Artifact;
 import org.codehaus.mojo.mrm.api.maven.ArtifactNotFoundException;
 import org.junit.Test;
+import org.mockito.ArgumentMatchers;
 
 public class ProxyArtifactStoreTest
 {
 
-    // Original code passed the original Exception by calling initCause( e ), which causes an IllegalStateException
-    @Test( expected = ArtifactNotFoundException.class )
+    @Test(expected = ArtifactNotFoundException.class)
     public void verifyArtifactNotFoundExceptionOnGet()
         throws Exception
     {
-        ArtifactFactory artifactFactory = mock( ArtifactFactory.class );
-        ArtifactResolver artifactResolver = mock( ArtifactResolver.class );
+        ArtifactFactory artifactFactory = mock(ArtifactFactory.class);
+        ArtifactResolver artifactResolver = mock(ArtifactResolver.class);
         ProxyArtifactStore store =
-            new ProxyArtifactStore( null, Collections.<ArtifactRepository> emptyList(),
-                                    Collections.<ArtifactRepository> emptyList(), null, artifactFactory,
-                                    artifactResolver, null ,null );
+            new ProxyArtifactStore(null, Collections.emptyList(),
+                                    Collections.emptyList(), null, artifactFactory,
+                                    artifactResolver, null ,null);
 
-        doThrow( org.apache.maven.artifact.resolver.ArtifactNotFoundException.class ).when( artifactResolver ).resolve( any( org.apache.maven.artifact.Artifact.class ),
-                                                                                                                        eq( Collections.<ArtifactRepository> emptyList() ),
-                                                                                                                        any( ArtifactRepository.class ) );
+        doThrow(org.apache.maven.artifact.resolver.ArtifactNotFoundException.class)
+                .when(artifactResolver)
+                .resolve(isNull(), eq(Collections.emptyList()), any());
 
         Artifact artifact = new Artifact( "localhost", "test", "1.0-SNAPSHOT", "pom" );
-        store.get( artifact );
+        store.get(artifact);
     }
 
-    @Test( expected = IOException.class )
+    @Test(expected = RuntimeException.class)
     public void verifyArtifactResolutionExceptionOnGet()
         throws Exception
     {
-        ArtifactFactory artifactFactory = mock( ArtifactFactory.class );
-        ArtifactResolver artifactResolver = mock( ArtifactResolver.class );
+        ArtifactFactory artifactFactory = mock(ArtifactFactory.class);
+        ArtifactResolver artifactResolver = mock(ArtifactResolver.class);
         ProxyArtifactStore store =
-            new ProxyArtifactStore( null, Collections.<ArtifactRepository> emptyList(),
-                                    Collections.<ArtifactRepository> emptyList(), null, artifactFactory,
+            new ProxyArtifactStore( null, Collections.emptyList(),
+                                    Collections.emptyList(), null, artifactFactory,
                                     artifactResolver, null, null );
 
-        doThrow( IOException.class ).when( artifactResolver ).resolve( any( org.apache.maven.artifact.Artifact.class ),
-                                                                       eq( Collections.<ArtifactRepository> emptyList() ),
-                                                                       any( ArtifactRepository.class ) );
+        doThrow(RuntimeException.class)
+                .when(artifactResolver)
+                .resolve(isNull(), eq(Collections.emptyList()), any());
 
         Artifact artifact = new Artifact( "localhost", "test", "1.0-SNAPSHOT", "pom" );
-        store.get( artifact );
+        store.get(artifact);
     }
-    
-    @Test( expected = IOException.class )
+
+    @Test(expected = RuntimeException.class)
     public void verifyArchetypeCatalogNotFoundException()
-        throws Exception
+            throws Exception
     {
         ArchetypeManager archetypeManager = mock( ArchetypeManager.class );
         ProxyArtifactStore store =
-            new ProxyArtifactStore( null, Collections.<ArtifactRepository> emptyList(),
-                                    Collections.<ArtifactRepository> emptyList(), null, null, null, archetypeManager,
-                                    null );
-        doThrow( IOException.class ).when( archetypeManager ).getDefaultLocalCatalog();
+                new ProxyArtifactStore( null, Collections.emptyList(),
+                        Collections.emptyList(), null, null, null, archetypeManager,
+                        null );
+        doThrow(RuntimeException.class).when(archetypeManager).getDefaultLocalCatalog();
         store.getArchetypeCatalog();
     }
 

diff --git a/pom.xml b/pom.xml
@@ -173,7 +173,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>1.9.0</version>
+        <version>3.11.2</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
@@ -251,6 +251,7 @@
           <streamLogs>true</streamLogs>
           <settingsFile>src/it/settings.xml</settingsFile>
           <postBuildHookScript>verify</postBuildHookScript>
+          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
         </configuration>
       </plugin>
       <plugin>
@@ -267,42 +268,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <!-- run integration tests
-          to use this profile:
-          or run integration tests: mvn -Prun-its
-          Always run on travis
-      -->
-      <id>run-its</id>
-      <activation>
-        <property>
-          <name>env.CONTINUOUS_INTEGRATION</name>
-        </property>
-      </activation>
-      <build>
-        <defaultGoal>verify</defaultGoal>
-        <plugins>
-          <plugin>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <streamLogs>true</streamLogs>
-                  <debug>false</debug>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>